Basic Gradle setup.

478 files changed, 1597 insertions, 45 deletions

diff --git a/src/cz/crcs/ectester/common/cli/Argument.java b/common/src/main/java/cz/crcs/ectester/common/cli/Argument.java
index e9b6688..e9b6688 100644
--- a/src/cz/crcs/ectester/common/cli/Argument.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/Argument.java
diff --git a/src/cz/crcs/ectester/common/cli/CLITools.java b/common/src/main/java/cz/crcs/ectester/common/cli/CLITools.java
index 82ab530..82ab530 100644
--- a/src/cz/crcs/ectester/common/cli/CLITools.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/CLITools.java
diff --git a/src/cz/crcs/ectester/common/cli/Colors.java b/common/src/main/java/cz/crcs/ectester/common/cli/Colors.java
index 7601088..7601088 100644
--- a/src/cz/crcs/ectester/common/cli/Colors.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/Colors.java
diff --git a/src/cz/crcs/ectester/common/cli/ParserOptions.java b/common/src/main/java/cz/crcs/ectester/common/cli/ParserOptions.java
index 7300cbb..7300cbb 100644
--- a/src/cz/crcs/ectester/common/cli/ParserOptions.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/ParserOptions.java
diff --git a/src/cz/crcs/ectester/common/cli/TreeCommandLine.java b/common/src/main/java/cz/crcs/ectester/common/cli/TreeCommandLine.java
index d758b78..d758b78 100644
--- a/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/TreeCommandLine.java
diff --git a/src/cz/crcs/ectester/common/cli/TreeParser.java b/common/src/main/java/cz/crcs/ectester/common/cli/TreeParser.java
index 657318d..657318d 100644
--- a/src/cz/crcs/ectester/common/cli/TreeParser.java
+++ b/common/src/main/java/cz/crcs/ectester/common/cli/TreeParser.java
diff --git a/src/cz/crcs/ectester/common/ec/CustomECFieldF2m.java b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECFieldF2m.java
index 24ea5aa..24ea5aa 100644
--- a/src/cz/crcs/ectester/common/ec/CustomECFieldF2m.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECFieldF2m.java
diff --git a/src/cz/crcs/ectester/common/ec/CustomECFieldFp.java b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECFieldFp.java
index eafcb72..eafcb72 100644
--- a/src/cz/crcs/ectester/common/ec/CustomECFieldFp.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECFieldFp.java
diff --git a/src/cz/crcs/ectester/common/ec/CustomECParameterSpec.java b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECParameterSpec.java
index cbc15e7..cbc15e7 100644
--- a/src/cz/crcs/ectester/common/ec/CustomECParameterSpec.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/CustomECParameterSpec.java
diff --git a/src/cz/crcs/ectester/common/ec/CustomEllipticCurve.java b/common/src/main/java/cz/crcs/ectester/common/ec/CustomEllipticCurve.java
index 489861c..489861c 100644
--- a/src/cz/crcs/ectester/common/ec/CustomEllipticCurve.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/CustomEllipticCurve.java
diff --git a/src/cz/crcs/ectester/common/ec/EC_Category.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Category.java
index 154403e..154403e 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Category.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Category.java
diff --git a/common/src/main/java/cz/crcs/ectester/common/ec/EC_Consts.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Consts.java
new file mode 100644
index 0000000..264c1bd
--- /dev/null
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Consts.java
@@ -0,0 +1,1512 @@
+package cz.crcs.ectester.common.ec;
+
+import javacard.framework.ISO7816;
+import javacard.framework.ISOException;
+import javacard.framework.Util;
+import javacard.security.KeyPair;
+import javacard.security.RandomData;
+
+/**
+ * @author Petr Svenda petr@svenda.com
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class EC_Consts {
+
+    public static final byte KeyAgreement_ALG_EC_SVDP_DH_KDF = 1;
+    public static final byte KeyAgreement_ALG_EC_SVDP_DHC_KDF = 2;
+    private static byte[] EC_FP_P = null;    //p
+    private static byte[] EC_A = null;    //a
+    private static byte[] EC_B = null;    //b
+    private static byte[] EC_G_X = null;  //G[x,y]
+    private static byte[] EC_G_Y = null;  //
+    private static byte[] EC_R = null;    //n
+    private static short EC_K = 1;        //h
+
+    private static byte[] EC_W_X = null;    //Pubkey[x,y]
+    private static byte[] EC_W_Y = null;
+    private static byte[] EC_S = null;    //Private
+
+    private static byte[] EC_F2M_F2M = null; //[short i1, short i2, short i3], f = x^m + x^i1 + x^i2 + x^i3 + 1
+
+    // EC domain parameter identifiers (bit flags)
+    public static final short PARAMETER_FP = 0x0001;
+    public static final short PARAMETER_F2M = 0x0002;
+
+    public static final short PARAMETER_A = 0x0004;
+    public static final short PARAMETER_B = 0x0008;
+    public static final short PARAMETER_G = 0x0010;
+    public static final short PARAMETER_R = 0x0020;
+    public static final short PARAMETER_K = 0x0040;
+    public static final short PARAMETER_W = 0x0080;
+    public static final short PARAMETER_S = 0x0100;
+
+    public static final short PARAMETERS_NONE = 0x0000;
+    /**
+     * FP,A,B,G,R,K
+     */
+    public static final short PARAMETERS_DOMAIN_FP = 0x007d;
+    /**
+     * F2M,A,B,G,R,K
+     */
+    public static final short PARAMETERS_DOMAIN_F2M = 0x007e;
+    /**
+     * W,S
+     */
+    public static final short PARAMETERS_KEYPAIR = 0x0180;
+    public static final short PARAMETERS_ALL = 0x01ff;
+
+
+    // EC key identifiers
+    public static final byte KEY_PUBLIC = 0x01;
+    public static final byte KEY_PRIVATE = 0x02;
+    public static final byte KEY_BOTH = KEY_PUBLIC | KEY_PRIVATE;
+
+    public static RandomData randomData = null;
+
+    // secp112r1
+    public static final byte[] EC112_FP_P = new byte[]{
+            (byte) 0xdb, (byte) 0x7c, (byte) 0x2a, (byte) 0xbf,
+            (byte) 0x62, (byte) 0xe3, (byte) 0x5e, (byte) 0x66,
+            (byte) 0x80, (byte) 0x76, (byte) 0xbe, (byte) 0xad,
+            (byte) 0x20, (byte) 0x8b
+    };
+
+    public static final byte[] EC112_FP_A = new byte[]{
+            (byte) 0xdb, (byte) 0x7c, (byte) 0x2a, (byte) 0xbf,
+            (byte) 0x62, (byte) 0xe3, (byte) 0x5e, (byte) 0x66,
+            (byte) 0x80, (byte) 0x76, (byte) 0xbe, (byte) 0xad,
+            (byte) 0x20, (byte) 0x88
+    };
+
+    public static final byte[] EC112_FP_B = new byte[]{
+            (byte) 0x65, (byte) 0x9e, (byte) 0xf8, (byte) 0xba,
+            (byte) 0x04, (byte) 0x39, (byte) 0x16, (byte) 0xee,
+            (byte) 0xde, (byte) 0x89, (byte) 0x11, (byte) 0x70,
+            (byte) 0x2b, (byte) 0x22
+    };
+
+    public static final byte[] EC112_FP_G_X = new byte[]{
+            (byte) 0x09, (byte) 0x48, (byte) 0x72, (byte) 0x39,
+            (byte) 0x99, (byte) 0x5a, (byte) 0x5e, (byte) 0xe7,
+            (byte) 0x6b, (byte) 0x55, (byte) 0xf9, (byte) 0xc2,
+            (byte) 0xf0, (byte) 0x98
+    };
+
+    public static final byte[] EC112_FP_G_Y = new byte[]{
+            (byte) 0xa8, (byte) 0x9c, (byte) 0xe5, (byte) 0xaf,
+            (byte) 0x87, (byte) 0x24, (byte) 0xc0, (byte) 0xa2,
+            (byte) 0x3e, (byte) 0x0e, (byte) 0x0f, (byte) 0xf7,
+            (byte) 0x75, (byte) 0x00
+    };
+
+    public static final byte[] EC112_FP_R = new byte[]{
+            (byte) 0xdb, (byte) 0x7c, (byte) 0x2a, (byte) 0xbf,
+            (byte) 0x62, (byte) 0xe3, (byte) 0x5e, (byte) 0x76,
+            (byte) 0x28, (byte) 0xdf, (byte) 0xac, (byte) 0x65,
+            (byte) 0x61, (byte) 0xc5
+    };
+
+    public static final short EC112_FP_K = 1;
+
+
+    // secp128r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC128_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFD,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+
+    public static final byte[] EC128_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFD,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+
+    public static final byte[] EC128_FP_B = new byte[]{
+            (byte) 0xE8, (byte) 0x75, (byte) 0x79, (byte) 0xC1,
+            (byte) 0x10, (byte) 0x79, (byte) 0xF4, (byte) 0x3D,
+            (byte) 0xD8, (byte) 0x24, (byte) 0x99, (byte) 0x3C,
+            (byte) 0x2C, (byte) 0xEE, (byte) 0x5E, (byte) 0xD3
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC128_FP_G_X = new byte[]{
+            (byte) 0x16, (byte) 0x1F, (byte) 0xF7, (byte) 0x52,
+            (byte) 0x8B, (byte) 0x89, (byte) 0x9B, (byte) 0x2D,
+            (byte) 0x0C, (byte) 0x28, (byte) 0x60, (byte) 0x7C,
+            (byte) 0xA5, (byte) 0x2C, (byte) 0x5B, (byte) 0x86
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC128_FP_G_Y = new byte[]{
+            (byte) 0xCF, (byte) 0x5A, (byte) 0xC8, (byte) 0x39,
+            (byte) 0x5B, (byte) 0xAF, (byte) 0xEB, (byte) 0x13,
+            (byte) 0xC0, (byte) 0x2D, (byte) 0xA2, (byte) 0x92,
+            (byte) 0xDD, (byte) 0xED, (byte) 0x7A, (byte) 0x83
+    };
+    // Order of G
+    public static final byte[] EC128_FP_R = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x75, (byte) 0xA3, (byte) 0x0D, (byte) 0x1B,
+            (byte) 0x90, (byte) 0x38, (byte) 0xA1, (byte) 0x15
+    };
+    // cofactor of G
+    public static final short EC128_FP_K = 1;
+
+    // secp160r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC160_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x7F, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+
+    public static final byte[] EC160_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x7F, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+
+    public static final byte[] EC160_FP_B = new byte[]{
+            (byte) 0x1C, (byte) 0x97, (byte) 0xBE, (byte) 0xFC,
+            (byte) 0x54, (byte) 0xBD, (byte) 0x7A, (byte) 0x8B,
+            (byte) 0x65, (byte) 0xAC, (byte) 0xF8, (byte) 0x9F,
+            (byte) 0x81, (byte) 0xD4, (byte) 0xD4, (byte) 0xAD,
+            (byte) 0xC5, (byte) 0x65, (byte) 0xFA, (byte) 0x45
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC160_FP_G_X = new byte[]{
+            (byte) 0x4A, (byte) 0x96, (byte) 0xB5, (byte) 0x68,
+            (byte) 0x8E, (byte) 0xF5, (byte) 0x73, (byte) 0x28,
+            (byte) 0x46, (byte) 0x64, (byte) 0x69, (byte) 0x89,
+            (byte) 0x68, (byte) 0xC3, (byte) 0x8B, (byte) 0xB9,
+            (byte) 0x13, (byte) 0xCB, (byte) 0xFC, (byte) 0x82
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC160_FP_G_Y = new byte[]{
+            (byte) 0x23, (byte) 0xA6, (byte) 0x28, (byte) 0x55,
+            (byte) 0x31, (byte) 0x68, (byte) 0x94, (byte) 0x7D,
+            (byte) 0x59, (byte) 0xDC, (byte) 0xC9, (byte) 0x12,
+            (byte) 0x04, (byte) 0x23, (byte) 0x51, (byte) 0x37,
+            (byte) 0x7A, (byte) 0xC5, (byte) 0xFB, (byte) 0x32
+    };
+    // Order of G
+    public static final byte[] EC160_FP_R = new byte[]{
+            (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x01, (byte) 0xF4, (byte) 0xC8,
+            (byte) 0xF9, (byte) 0x27, (byte) 0xAE, (byte) 0xD3,
+            (byte) 0xCA, (byte) 0x75, (byte) 0x22, (byte) 0x57
+    };
+    // cofactor of G
+    public static final short EC160_FP_K = 1;
+
+
+    // secp192r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC192_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+    public static final byte[] EC192_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+    public static final byte[] EC192_FP_B = new byte[]{
+            (byte) 0x64, (byte) 0x21, (byte) 0x05, (byte) 0x19,
+            (byte) 0xE5, (byte) 0x9C, (byte) 0x80, (byte) 0xE7,
+            (byte) 0x0F, (byte) 0xA7, (byte) 0xE9, (byte) 0xAB,
+            (byte) 0x72, (byte) 0x24, (byte) 0x30, (byte) 0x49,
+            (byte) 0xFE, (byte) 0xB8, (byte) 0xDE, (byte) 0xEC,
+            (byte) 0xC1, (byte) 0x46, (byte) 0xB9, (byte) 0xB1
+    };
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC192_FP_G_X = new byte[]{
+            (byte) 0x18, (byte) 0x8D, (byte) 0xA8, (byte) 0x0E,
+            (byte) 0xB0, (byte) 0x30, (byte) 0x90, (byte) 0xF6,
+            (byte) 0x7C, (byte) 0xBF, (byte) 0x20, (byte) 0xEB,
+            (byte) 0x43, (byte) 0xA1, (byte) 0x88, (byte) 0x00,
+            (byte) 0xF4, (byte) 0xFF, (byte) 0x0A, (byte) 0xFD,
+            (byte) 0x82, (byte) 0xFF, (byte) 0x10, (byte) 0x12
+    };
+    // second part of G uncompressed
+    public static final byte[] EC192_FP_G_Y = new byte[]{
+            (byte) 0x07, (byte) 0x19, (byte) 0x2B, (byte) 0x95,
+            (byte) 0xFF, (byte) 0xC8, (byte) 0xDA, (byte) 0x78,
+            (byte) 0x63, (byte) 0x10, (byte) 0x11, (byte) 0xED,
+            (byte) 0x6B, (byte) 0x24, (byte) 0xCD, (byte) 0xD5,
+            (byte) 0x73, (byte) 0xF9, (byte) 0x77, (byte) 0xA1,
+            (byte) 0x1E, (byte) 0x79, (byte) 0x48, (byte) 0x11
+    };
+    // Order of G
+    public static final byte[] EC192_FP_R = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x99, (byte) 0xDE, (byte) 0xF8, (byte) 0x36,
+            (byte) 0x14, (byte) 0x6B, (byte) 0xC9, (byte) 0xB1,
+            (byte) 0xB4, (byte) 0xD2, (byte) 0x28, (byte) 0x31
+    };
+    // cofactor of G
+    public static final short EC192_FP_K = 1;
+
+    // secp224r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC224_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01
+    };
+
+    public static final byte[] EC224_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE
+    };
+
+    public static final byte[] EC224_FP_B = new byte[]{
+            (byte) 0xB4, (byte) 0x05, (byte) 0x0A, (byte) 0x85,
+            (byte) 0x0C, (byte) 0x04, (byte) 0xB3, (byte) 0xAB,
+            (byte) 0xF5, (byte) 0x41, (byte) 0x32, (byte) 0x56,
+            (byte) 0x50, (byte) 0x44, (byte) 0xB0, (byte) 0xB7,
+            (byte) 0xD7, (byte) 0xBF, (byte) 0xD8, (byte) 0xBA,
+            (byte) 0x27, (byte) 0x0B, (byte) 0x39, (byte) 0x43,
+            (byte) 0x23, (byte) 0x55, (byte) 0xFF, (byte) 0xB4
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC224_FP_G_X = new byte[]{
+            (byte) 0xB7, (byte) 0x0E, (byte) 0x0C, (byte) 0xBD,
+            (byte) 0x6B, (byte) 0xB4, (byte) 0xBF, (byte) 0x7F,
+            (byte) 0x32, (byte) 0x13, (byte) 0x90, (byte) 0xB9,
+            (byte) 0x4A, (byte) 0x03, (byte) 0xC1, (byte) 0xD3,
+            (byte) 0x56, (byte) 0xC2, (byte) 0x11, (byte) 0x22,
+            (byte) 0x34, (byte) 0x32, (byte) 0x80, (byte) 0xD6,
+            (byte) 0x11, (byte) 0x5C, (byte) 0x1D, (byte) 0x21
+    };
+    // second part of G uncompressed
+    public static final byte[] EC224_FP_G_Y = new byte[]{
+            (byte) 0xBD, (byte) 0x37, (byte) 0x63, (byte) 0x88,
+            (byte) 0xB5, (byte) 0xF7, (byte) 0x23, (byte) 0xFB,
+            (byte) 0x4C, (byte) 0x22, (byte) 0xDF, (byte) 0xE6,
+            (byte) 0xCD, (byte) 0x43, (byte) 0x75, (byte) 0xA0,
+            (byte) 0x5A, (byte) 0x07, (byte) 0x47, (byte) 0x64,
+            (byte) 0x44, (byte) 0xD5, (byte) 0x81, (byte) 0x99,
+            (byte) 0x85, (byte) 0x00, (byte) 0x7E, (byte) 0x34
+    };
+    // Order of G
+    public static final byte[] EC224_FP_R = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0x16, (byte) 0xA2,
+            (byte) 0xE0, (byte) 0xB8, (byte) 0xF0, (byte) 0x3E,
+            (byte) 0x13, (byte) 0xDD, (byte) 0x29, (byte) 0x45,
+            (byte) 0x5C, (byte) 0x5C, (byte) 0x2A, (byte) 0x3D
+    };
+    // cofactor of G
+    public static final short EC224_FP_K = 1;
+
+    // secp256r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC256_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+    public static final byte[] EC256_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+    public static final byte[] EC256_FP_B = new byte[]{
+            (byte) 0x5A, (byte) 0xC6, (byte) 0x35, (byte) 0xD8,
+            (byte) 0xAA, (byte) 0x3A, (byte) 0x93, (byte) 0xE7,
+            (byte) 0xB3, (byte) 0xEB, (byte) 0xBD, (byte) 0x55,
+            (byte) 0x76, (byte) 0x98, (byte) 0x86, (byte) 0xBC,
+            (byte) 0x65, (byte) 0x1D, (byte) 0x06, (byte) 0xB0,
+            (byte) 0xCC, (byte) 0x53, (byte) 0xB0, (byte) 0xF6,
+            (byte) 0x3B, (byte) 0xCE, (byte) 0x3C, (byte) 0x3E,
+            (byte) 0x27, (byte) 0xD2, (byte) 0x60, (byte) 0x4B
+    };
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC256_FP_G_X = new byte[]{
+            (byte) 0x6B, (byte) 0x17, (byte) 0xD1, (byte) 0xF2,
+            (byte) 0xE1, (byte) 0x2C, (byte) 0x42, (byte) 0x47,
+            (byte) 0xF8, (byte) 0xBC, (byte) 0xE6, (byte) 0xE5,
+            (byte) 0x63, (byte) 0xA4, (byte) 0x40, (byte) 0xF2,
+            (byte) 0x77, (byte) 0x03, (byte) 0x7D, (byte) 0x81,
+            (byte) 0x2D, (byte) 0xEB, (byte) 0x33, (byte) 0xA0,
+            (byte) 0xF4, (byte) 0xA1, (byte) 0x39, (byte) 0x45,
+            (byte) 0xD8, (byte) 0x98, (byte) 0xC2, (byte) 0x96
+    };
+    // second part of G uncompressed
+    public static final byte[] EC256_FP_G_Y = new byte[]{
+            (byte) 0x4F, (byte) 0xE3, (byte) 0x42, (byte) 0xE2,
+            (byte) 0xFE, (byte) 0x1A, (byte) 0x7F, (byte) 0x9B,
+            (byte) 0x8E, (byte) 0xE7, (byte) 0xEB, (byte) 0x4A,
+            (byte) 0x7C, (byte) 0x0F, (byte) 0x9E, (byte) 0x16,
+            (byte) 0x2B, (byte) 0xCE, (byte) 0x33, (byte) 0x57,
+            (byte) 0x6B, (byte) 0x31, (byte) 0x5E, (byte) 0xCE,
+            (byte) 0xCB, (byte) 0xB6, (byte) 0x40, (byte) 0x68,
+            (byte) 0x37, (byte) 0xBF, (byte) 0x51, (byte) 0xF5
+    };
+    // Order of G
+    public static final byte[] EC256_FP_R = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xBC, (byte) 0xE6, (byte) 0xFA, (byte) 0xAD,
+            (byte) 0xA7, (byte) 0x17, (byte) 0x9E, (byte) 0x84,
+            (byte) 0xF3, (byte) 0xB9, (byte) 0xCA, (byte) 0xC2,
+            (byte) 0xFC, (byte) 0x63, (byte) 0x25, (byte) 0x51
+    };
+    // cofactor of G
+    public static final short EC256_FP_K = 1;
+
+    // secp384r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC384_FP_P = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+
+    public static final byte[] EC384_FP_A = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+
+    public static final byte[] EC384_FP_B = new byte[]{
+            (byte) 0xB3, (byte) 0x31, (byte) 0x2F, (byte) 0xA7,
+            (byte) 0xE2, (byte) 0x3E, (byte) 0xE7, (byte) 0xE4,
+            (byte) 0x98, (byte) 0x8E, (byte) 0x05, (byte) 0x6B,
+            (byte) 0xE3, (byte) 0xF8, (byte) 0x2D, (byte) 0x19,
+            (byte) 0x18, (byte) 0x1D, (byte) 0x9C, (byte) 0x6E,
+            (byte) 0xFE, (byte) 0x81, (byte) 0x41, (byte) 0x12,
+            (byte) 0x03, (byte) 0x14, (byte) 0x08, (byte) 0x8F,
+            (byte) 0x50, (byte) 0x13, (byte) 0x87, (byte) 0x5A,
+            (byte) 0xC6, (byte) 0x56, (byte) 0x39, (byte) 0x8D,
+            (byte) 0x8A, (byte) 0x2E, (byte) 0xD1, (byte) 0x9D,
+            (byte) 0x2A, (byte) 0x85, (byte) 0xC8, (byte) 0xED,
+            (byte) 0xD3, (byte) 0xEC, (byte) 0x2A, (byte) 0xEF
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC384_FP_G_X = new byte[]{
+            (byte) 0xAA, (byte) 0x87, (byte) 0xCA, (byte) 0x22,
+            (byte) 0xBE, (byte) 0x8B, (byte) 0x05, (byte) 0x37,
+            (byte) 0x8E, (byte) 0xB1, (byte) 0xC7, (byte) 0x1E,
+            (byte) 0xF3, (byte) 0x20, (byte) 0xAD, (byte) 0x74,
+            (byte) 0x6E, (byte) 0x1D, (byte) 0x3B, (byte) 0x62,
+            (byte) 0x8B, (byte) 0xA7, (byte) 0x9B, (byte) 0x98,
+            (byte) 0x59, (byte) 0xF7, (byte) 0x41, (byte) 0xE0,
+            (byte) 0x82, (byte) 0x54, (byte) 0x2A, (byte) 0x38,
+            (byte) 0x55, (byte) 0x02, (byte) 0xF2, (byte) 0x5D,
+            (byte) 0xBF, (byte) 0x55, (byte) 0x29, (byte) 0x6C,
+            (byte) 0x3A, (byte) 0x54, (byte) 0x5E, (byte) 0x38,
+            (byte) 0x72, (byte) 0x76, (byte) 0x0A, (byte) 0xB7
+    };
+    // second part of G uncompressed
+    public static final byte[] EC384_FP_G_Y = new byte[]{
+            (byte) 0x36, (byte) 0x17, (byte) 0xDE, (byte) 0x4A,
+            (byte) 0x96, (byte) 0x26, (byte) 0x2C, (byte) 0x6F,
+            (byte) 0x5D, (byte) 0x9E, (byte) 0x98, (byte) 0xBF,
+            (byte) 0x92, (byte) 0x92, (byte) 0xDC, (byte) 0x29,
+            (byte) 0xF8, (byte) 0xF4, (byte) 0x1D, (byte) 0xBD,
+            (byte) 0x28, (byte) 0x9A, (byte) 0x14, (byte) 0x7C,
+            (byte) 0xE9, (byte) 0xDA, (byte) 0x31, (byte) 0x13,
+            (byte) 0xB5, (byte) 0xF0, (byte) 0xB8, (byte) 0xC0,
+            (byte) 0x0A, (byte) 0x60, (byte) 0xB1, (byte) 0xCE,
+            (byte) 0x1D, (byte) 0x7E, (byte) 0x81, (byte) 0x9D,
+            (byte) 0x7A, (byte) 0x43, (byte) 0x1D, (byte) 0x7C,
+            (byte) 0x90, (byte) 0xEA, (byte) 0x0E, (byte) 0x5F
+    };
+
+    // Order of G
+    public static final byte[] EC384_FP_R = new byte[]{
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xC7, (byte) 0x63, (byte) 0x4D, (byte) 0x81,
+            (byte) 0xF4, (byte) 0x37, (byte) 0x2D, (byte) 0xDF,
+            (byte) 0x58, (byte) 0x1A, (byte) 0x0D, (byte) 0xB2,
+            (byte) 0x48, (byte) 0xB0, (byte) 0xA7, (byte) 0x7A,
+            (byte) 0xEC, (byte) 0xEC, (byte) 0x19, (byte) 0x6A,
+            (byte) 0xCC, (byte) 0xC5, (byte) 0x29, (byte) 0x73
+    };
+    // cofactor of G
+    public static final short EC384_FP_K = 1;
+
+
+    // secp521r1 from http://www.secg.org/sec2-v2.pdf
+    public static final byte[] EC521_FP_P = new byte[]{
+            (byte) 0x01, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
+    };
+
+    public static final byte[] EC521_FP_A = new byte[]{
+            (byte) 0x01, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFC
+    };
+
+    public static final byte[] EC521_FP_B = new byte[]{
+            (byte) 0x00, (byte) 0x51, (byte) 0x95, (byte) 0x3E,
+            (byte) 0xB9, (byte) 0x61, (byte) 0x8E, (byte) 0x1C,
+            (byte) 0x9A, (byte) 0x1F, (byte) 0x92, (byte) 0x9A,
+            (byte) 0x21, (byte) 0xA0, (byte) 0xB6, (byte) 0x85,
+            (byte) 0x40, (byte) 0xEE, (byte) 0xA2, (byte) 0xDA,
+            (byte) 0x72, (byte) 0x5B, (byte) 0x99, (byte) 0xB3,
+            (byte) 0x15, (byte) 0xF3, (byte) 0xB8, (byte) 0xB4,
+            (byte) 0x89, (byte) 0x91, (byte) 0x8E, (byte) 0xF1,
+            (byte) 0x09, (byte) 0xE1, (byte) 0x56, (byte) 0x19,
+            (byte) 0x39, (byte) 0x51, (byte) 0xEC, (byte) 0x7E,
+            (byte) 0x93, (byte) 0x7B, (byte) 0x16, (byte) 0x52,
+            (byte) 0xC0, (byte) 0xBD, (byte) 0x3B, (byte) 0xB1,
+            (byte) 0xBF, (byte) 0x07, (byte) 0x35, (byte) 0x73,
+            (byte) 0xDF, (byte) 0x88, (byte) 0x3D, (byte) 0x2C,
+            (byte) 0x34, (byte) 0xF1, (byte) 0xEF, (byte) 0x45,
+            (byte) 0x1F, (byte) 0xD4, (byte) 0x6B, (byte) 0x50,
+            (byte) 0x3F, (byte) 0x00
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC521_FP_G_X = new byte[]{
+            (byte) 0x00, (byte) 0xC6, (byte) 0x85, (byte) 0x8E,
+            (byte) 0x06, (byte) 0xB7, (byte) 0x04, (byte) 0x04,
+            (byte) 0xE9, (byte) 0xCD, (byte) 0x9E, (byte) 0x3E,
+            (byte) 0xCB, (byte) 0x66, (byte) 0x23, (byte) 0x95,
+            (byte) 0xB4, (byte) 0x42, (byte) 0x9C, (byte) 0x64,
+            (byte) 0x81, (byte) 0x39, (byte) 0x05, (byte) 0x3F,
+            (byte) 0xB5, (byte) 0x21, (byte) 0xF8, (byte) 0x28,
+            (byte) 0xAF, (byte) 0x60, (byte) 0x6B, (byte) 0x4D,
+            (byte) 0x3D, (byte) 0xBA, (byte) 0xA1, (byte) 0x4B,
+            (byte) 0x5E, (byte) 0x77, (byte) 0xEF, (byte) 0xE7,
+            (byte) 0x59, (byte) 0x28, (byte) 0xFE, (byte) 0x1D,
+            (byte) 0xC1, (byte) 0x27, (byte) 0xA2, (byte) 0xFF,
+            (byte) 0xA8, (byte) 0xDE, (byte) 0x33, (byte) 0x48,
+            (byte) 0xB3, (byte) 0xC1, (byte) 0x85, (byte) 0x6A,
+            (byte) 0x42, (byte) 0x9B, (byte) 0xF9, (byte) 0x7E,
+            (byte) 0x7E, (byte) 0x31, (byte) 0xC2, (byte) 0xE5,
+            (byte) 0xBD, (byte) 0x66
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC521_FP_G_Y = new byte[]{
+            (byte) 0x01, (byte) 0x18, (byte) 0x39, (byte) 0x29,
+            (byte) 0x6A, (byte) 0x78, (byte) 0x9A, (byte) 0x3B,
+            (byte) 0xC0, (byte) 0x04, (byte) 0x5C, (byte) 0x8A,
+            (byte) 0x5F, (byte) 0xB4, (byte) 0x2C, (byte) 0x7D,
+            (byte) 0x1B, (byte) 0xD9, (byte) 0x98, (byte) 0xF5,
+            (byte) 0x44, (byte) 0x49, (byte) 0x57, (byte) 0x9B,
+            (byte) 0x44, (byte) 0x68, (byte) 0x17, (byte) 0xAF,
+            (byte) 0xBD, (byte) 0x17, (byte) 0x27, (byte) 0x3E,
+            (byte) 0x66, (byte) 0x2C, (byte) 0x97, (byte) 0xEE,
+            (byte) 0x72, (byte) 0x99, (byte) 0x5E, (byte) 0xF4,
+            (byte) 0x26, (byte) 0x40, (byte) 0xC5, (byte) 0x50,
+            (byte) 0xB9, (byte) 0x01, (byte) 0x3F, (byte) 0xAD,
+            (byte) 0x07, (byte) 0x61, (byte) 0x35, (byte) 0x3C,
+            (byte) 0x70, (byte) 0x86, (byte) 0xA2, (byte) 0x72,
+            (byte) 0xC2, (byte) 0x40, (byte) 0x88, (byte) 0xBE,
+            (byte) 0x94, (byte) 0x76, (byte) 0x9F, (byte) 0xD1,
+            (byte) 0x66, (byte) 0x50
+    };
+
+    // Order of G
+    public static final byte[] EC521_FP_R = new byte[]{
+            (byte) 0x01, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFA,
+            (byte) 0x51, (byte) 0x86, (byte) 0x87, (byte) 0x83,
+            (byte) 0xBF, (byte) 0x2F, (byte) 0x96, (byte) 0x6B,
+            (byte) 0x7F, (byte) 0xCC, (byte) 0x01, (byte) 0x48,
+            (byte) 0xF7, (byte) 0x09, (byte) 0xA5, (byte) 0xD0,
+            (byte) 0x3B, (byte) 0xB5, (byte) 0xC9, (byte) 0xB8,
+            (byte) 0x89, (byte) 0x9C, (byte) 0x47, (byte) 0xAE,
+            (byte) 0xBB, (byte) 0x6F, (byte) 0xB7, (byte) 0x1E,
+            (byte) 0x91, (byte) 0x38, (byte) 0x64, (byte) 0x09
+    };
+
+    // cofactor of G
+    public static final short EC521_FP_K = 1;
+
+    //sect163r1 from http://www.secg.org/sec2-v2.pdf
+    // [short i1, short i2, short i3] f = x^163 + x^i1 + x^i2 + x^i3 + 1
+    public static final byte[] EC163_F2M_F = new byte[]{
+            (byte) 0x00, (byte) 0x07,
+            (byte) 0x00, (byte) 0x06,
+            (byte) 0x00, (byte) 0x03
+    };
+
+    public static final byte[] EC163_F2M_A = new byte[]{
+            (byte) 0x07, (byte) 0xB6, (byte) 0x88, (byte) 0x2C,
+            (byte) 0xAA, (byte) 0xEF, (byte) 0xA8, (byte) 0x4F,
+            (byte) 0x95, (byte) 0x54, (byte) 0xFF, (byte) 0x84,
+            (byte) 0x28, (byte) 0xBD, (byte) 0x88, (byte) 0xE2,
+            (byte) 0x46, (byte) 0xD2, (byte) 0x78, (byte) 0x2A,
+            (byte) 0xE2
+    };
+
+    public static final byte[] EC163_F2M_B = new byte[]{
+            (byte) 0x07, (byte) 0x13, (byte) 0x61, (byte) 0x2D,
+            (byte) 0xCD, (byte) 0xDC, (byte) 0xB4, (byte) 0x0A,
+            (byte) 0xAB, (byte) 0x94, (byte) 0x6B, (byte) 0xDA,
+            (byte) 0x29, (byte) 0xCA, (byte) 0x91, (byte) 0xF7,
+            (byte) 0x3A, (byte) 0xF9, (byte) 0x58, (byte) 0xAF,
+            (byte) 0xD9
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC163_F2M_G_X = new byte[]{
+            (byte) 0x03, (byte) 0x69, (byte) 0x97, (byte) 0x96,
+            (byte) 0x97, (byte) 0xAB, (byte) 0x43, (byte) 0x89,
+            (byte) 0x77, (byte) 0x89, (byte) 0x56, (byte) 0x67,
+            (byte) 0x89, (byte) 0x56, (byte) 0x7F, (byte) 0x78,
+            (byte) 0x7A, (byte) 0x78, (byte) 0x76, (byte) 0xA6,
+            (byte) 0x54
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC163_F2M_G_Y = new byte[]{
+            (byte) 0x00, (byte) 0x43, (byte) 0x5E, (byte) 0xDB,
+            (byte) 0x42, (byte) 0xEF, (byte) 0xAF, (byte) 0xB2,
+            (byte) 0x98, (byte) 0x9D, (byte) 0x51, (byte) 0xFE,
+            (byte) 0xFC, (byte) 0xE3, (byte) 0xC8, (byte) 0x09,
+            (byte) 0x88, (byte) 0xF4, (byte) 0x1F, (byte) 0xF8,
+            (byte) 0x83
+    };
+
+    // order of G
+    public static final byte[] EC163_F2M_R = new byte[]{
+            (byte) 0x03, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x48,
+            (byte) 0xAA, (byte) 0xB6, (byte) 0x89, (byte) 0xC2,
+            (byte) 0x9C, (byte) 0xA7, (byte) 0x10, (byte) 0x27,
+            (byte) 0x9B
+    };
+
+    // cofactor of G
+    public static final short EC163_F2M_K = 2;
+
+    //sect233r1 from http://www.secg.org/sec2-v2.pdf
+    // [short i1, short i2, short i3] f = x^233 + x^i1 + 1
+    public static final byte[] EC233_F2M_F = new byte[]{
+            (byte) 0x00, (byte) 0x4a
+    };
+
+    public static final byte[] EC233_F2M_A = new byte[]{
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x01
+    };
+
+    public static final byte[] EC233_F2M_B = new byte[]{
+            (byte) 0x00, (byte) 0x66, (byte) 0x64, (byte) 0x7E,
+            (byte) 0xDE, (byte) 0x6C, (byte) 0x33, (byte) 0x2C,
+            (byte) 0x7F, (byte) 0x8C, (byte) 0x09, (byte) 0x23,
+            (byte) 0xBB, (byte) 0x58, (byte) 0x21, (byte) 0x3B,
+            (byte) 0x33, (byte) 0x3B, (byte) 0x20, (byte) 0xE9,
+            (byte) 0xCE, (byte) 0x42, (byte) 0x81, (byte) 0xFE,
+            (byte) 0x11, (byte) 0x5F, (byte) 0x7D, (byte) 0x8F,
+            (byte) 0x90, (byte) 0xAD
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC233_F2M_G_X = new byte[]{
+            (byte) 0x00, (byte) 0xFA, (byte) 0xC9, (byte) 0xDF,
+            (byte) 0xCB, (byte) 0xAC, (byte) 0x83, (byte) 0x13,
+            (byte) 0xBB, (byte) 0x21, (byte) 0x39, (byte) 0xF1,
+            (byte) 0xBB, (byte) 0x75, (byte) 0x5F, (byte) 0xEF,
+            (byte) 0x65, (byte) 0xBC, (byte) 0x39, (byte) 0x1F,
+            (byte) 0x8B, (byte) 0x36, (byte) 0xF8, (byte) 0xF8,
+            (byte) 0xEB, (byte) 0x73, (byte) 0x71, (byte) 0xFD,
+            (byte) 0x55, (byte) 0x8B
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC233_F2M_G_Y = new byte[]{
+            (byte) 0x01, (byte) 0x00, (byte) 0x6A, (byte) 0x08,
+            (byte) 0xA4, (byte) 0x19, (byte) 0x03, (byte) 0x35,
+            (byte) 0x06, (byte) 0x78, (byte) 0xE5, (byte) 0x85,
+            (byte) 0x28, (byte) 0xBE, (byte) 0xBF, (byte) 0x8A,
+            (byte) 0x0B, (byte) 0xEF, (byte) 0xF8, (byte) 0x67,
+            (byte) 0xA7, (byte) 0xCA, (byte) 0x36, (byte) 0x71,
+            (byte) 0x6F, (byte) 0x7E, (byte) 0x01, (byte) 0xF8,
+            (byte) 0x10, (byte) 0x52
+    };
+
+    // order of G
+    public static final byte[] EC233_F2M_R = new byte[]{
+            (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x13,
+            (byte) 0xE9, (byte) 0x74, (byte) 0xE7, (byte) 0x2F,
+            (byte) 0x8A, (byte) 0x69, (byte) 0x22, (byte) 0x03,
+            (byte) 0x1D, (byte) 0x26, (byte) 0x03, (byte) 0xCF,
+            (byte) 0xE0, (byte) 0xD7
+    };
+
+    // cofactor of G
+    public static final short EC233_F2M_K = 2;
+
+    //sect283r1 from http://www.secg.org/sec2-v2.pdf
+    // [short i1, short i2, short i3] f = x^283 + x^i1 + x^i2 + x^i3 + 1
+    public static final byte[] EC283_F2M_F = new byte[]{
+            (byte) 0x00, (byte) 0x0c,
+            (byte) 0x00, (byte) 0x07,
+            (byte) 0x00, (byte) 0x05
+    };
+
+    public static final byte[] EC283_F2M_A = new byte[]{
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01
+    };
+
+    public static final byte[] EC283_F2M_B = new byte[]{
+            (byte) 0x02, (byte) 0x7B, (byte) 0x68, (byte) 0x0A,
+            (byte) 0xC8, (byte) 0xB8, (byte) 0x59, (byte) 0x6D,
+            (byte) 0xA5, (byte) 0xA4, (byte) 0xAF, (byte) 0x8A,
+            (byte) 0x19, (byte) 0xA0, (byte) 0x30, (byte) 0x3F,
+            (byte) 0xCA, (byte) 0x97, (byte) 0xFD, (byte) 0x76,
+            (byte) 0x45, (byte) 0x30, (byte) 0x9F, (byte) 0xA2,
+            (byte) 0xA5, (byte) 0x81, (byte) 0x48, (byte) 0x5A,
+            (byte) 0xF6, (byte) 0x26, (byte) 0x3E, (byte) 0x31,
+            (byte) 0x3B, (byte) 0x79, (byte) 0xA2, (byte) 0xF5
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC283_F2M_G_X = new byte[]{
+            (byte) 0x05, (byte) 0xF9, (byte) 0x39, (byte) 0x25,
+            (byte) 0x8D, (byte) 0xB7, (byte) 0xDD, (byte) 0x90,
+            (byte) 0xE1, (byte) 0x93, (byte) 0x4F, (byte) 0x8C,
+            (byte) 0x70, (byte) 0xB0, (byte) 0xDF, (byte) 0xEC,
+            (byte) 0x2E, (byte) 0xED, (byte) 0x25, (byte) 0xB8,
+            (byte) 0x55, (byte) 0x7E, (byte) 0xAC, (byte) 0x9C,
+            (byte) 0x80, (byte) 0xE2, (byte) 0xE1, (byte) 0x98,
+            (byte) 0xF8, (byte) 0xCD, (byte) 0xBE, (byte) 0xCD,
+            (byte) 0x86, (byte) 0xB1, (byte) 0x20, (byte) 0x53
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC283_F2M_G_Y = new byte[]{
+            (byte) 0x03, (byte) 0x67, (byte) 0x68, (byte) 0x54,
+            (byte) 0xFE, (byte) 0x24, (byte) 0x14, (byte) 0x1C,
+            (byte) 0xB9, (byte) 0x8F, (byte) 0xE6, (byte) 0xD4,
+            (byte) 0xB2, (byte) 0x0D, (byte) 0x02, (byte) 0xB4,
+            (byte) 0x51, (byte) 0x6F, (byte) 0xF7, (byte) 0x02,
+            (byte) 0x35, (byte) 0x0E, (byte) 0xDD, (byte) 0xB0,
+            (byte) 0x82, (byte) 0x67, (byte) 0x79, (byte) 0xC8,
+            (byte) 0x13, (byte) 0xF0, (byte) 0xDF, (byte) 0x45,
+            (byte) 0xBE, (byte) 0x81, (byte) 0x12, (byte) 0xF4
+    };
+
+    // order of G
+    public static final byte[] EC283_F2M_R = new byte[]{
+            (byte) 0x03, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xEF, (byte) 0x90,
+            (byte) 0x39, (byte) 0x96, (byte) 0x60, (byte) 0xFC,
+            (byte) 0x93, (byte) 0x8A, (byte) 0x90, (byte) 0x16,
+            (byte) 0x5B, (byte) 0x04, (byte) 0x2A, (byte) 0x7C,
+            (byte) 0xEF, (byte) 0xAD, (byte) 0xB3, (byte) 0x07
+    };
+
+    // cofactor of G
+    public static final short EC283_F2M_K = 2;
+
+    //sect409r1 from http://www.secg.org/sec2-v2.pdf
+    // [short i1, short i2, short i3] f = x^409 + x^i1 + 1
+    public static final byte[] EC409_F2M_F = new byte[]{
+            (byte) 0x00, (byte) 0x57
+    };
+
+    public static final byte[] EC409_F2M_A = new byte[]{
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01
+    };
+
+    public static final byte[] EC409_F2M_B = new byte[]{
+            (byte) 0x00, (byte) 0x21, (byte) 0xA5, (byte) 0xC2,
+            (byte) 0xC8, (byte) 0xEE, (byte) 0x9F, (byte) 0xEB,
+            (byte) 0x5C, (byte) 0x4B, (byte) 0x9A, (byte) 0x75,
+            (byte) 0x3B, (byte) 0x7B, (byte) 0x47, (byte) 0x6B,
+            (byte) 0x7F, (byte) 0xD6, (byte) 0x42, (byte) 0x2E,
+            (byte) 0xF1, (byte) 0xF3, (byte) 0xDD, (byte) 0x67,
+            (byte) 0x47, (byte) 0x61, (byte) 0xFA, (byte) 0x99,
+            (byte) 0xD6, (byte) 0xAC, (byte) 0x27, (byte) 0xC8,
+            (byte) 0xA9, (byte) 0xA1, (byte) 0x97, (byte) 0xB2,
+            (byte) 0x72, (byte) 0x82, (byte) 0x2F, (byte) 0x6C,
+            (byte) 0xD5, (byte) 0x7A, (byte) 0x55, (byte) 0xAA,
+            (byte) 0x4F, (byte) 0x50, (byte) 0xAE, (byte) 0x31,
+            (byte) 0x7B, (byte) 0x13, (byte) 0x54, (byte) 0x5F
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC409_F2M_G_X = new byte[]{
+            (byte) 0x01, (byte) 0x5D, (byte) 0x48, (byte) 0x60,
+            (byte) 0xD0, (byte) 0x88, (byte) 0xDD, (byte) 0xB3,
+            (byte) 0x49, (byte) 0x6B, (byte) 0x0C, (byte) 0x60,
+            (byte) 0x64, (byte) 0x75, (byte) 0x62, (byte) 0x60,
+            (byte) 0x44, (byte) 0x1C, (byte) 0xDE, (byte) 0x4A,
+            (byte) 0xF1, (byte) 0x77, (byte) 0x1D, (byte) 0x4D,
+            (byte) 0xB0, (byte) 0x1F, (byte) 0xFE, (byte) 0x5B,
+            (byte) 0x34, (byte) 0xE5, (byte) 0x97, (byte) 0x03,
+            (byte) 0xDC, (byte) 0x25, (byte) 0x5A, (byte) 0x86,
+            (byte) 0x8A, (byte) 0x11, (byte) 0x80, (byte) 0x51,
+            (byte) 0x56, (byte) 0x03, (byte) 0xAE, (byte) 0xAB,
+            (byte) 0x60, (byte) 0x79, (byte) 0x4E, (byte) 0x54,
+            (byte) 0xBB, (byte) 0x79, (byte) 0x96, (byte) 0xA7
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC409_F2M_G_Y = new byte[]{
+            (byte) 0x00, (byte) 0x61, (byte) 0xB1, (byte) 0xCF,
+            (byte) 0xAB, (byte) 0x6B, (byte) 0xE5, (byte) 0xF3,
+            (byte) 0x2B, (byte) 0xBF, (byte) 0xA7, (byte) 0x83,
+            (byte) 0x24, (byte) 0xED, (byte) 0x10, (byte) 0x6A,
+            (byte) 0x76, (byte) 0x36, (byte) 0xB9, (byte) 0xC5,
+            (byte) 0xA7, (byte) 0xBD, (byte) 0x19, (byte) 0x8D,
+            (byte) 0x01, (byte) 0x58, (byte) 0xAA, (byte) 0x4F,
+            (byte) 0x54, (byte) 0x88, (byte) 0xD0, (byte) 0x8F,
+            (byte) 0x38, (byte) 0x51, (byte) 0x4F, (byte) 0x1F,
+            (byte) 0xDF, (byte) 0x4B, (byte) 0x4F, (byte) 0x40,
+            (byte) 0xD2, (byte) 0x18, (byte) 0x1B, (byte) 0x36,
+            (byte) 0x81, (byte) 0xC3, (byte) 0x64, (byte) 0xBA,
+            (byte) 0x02, (byte) 0x73, (byte) 0xC7, (byte) 0x06
+    };
+
+    // order of G
+    public static final byte[] EC409_F2M_R = new byte[]{
+            (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0xE2,
+            (byte) 0xAA, (byte) 0xD6, (byte) 0xA6, (byte) 0x12,
+            (byte) 0xF3, (byte) 0x33, (byte) 0x07, (byte) 0xBE,
+            (byte) 0x5F, (byte) 0xA4, (byte) 0x7C, (byte) 0x3C,
+            (byte) 0x9E, (byte) 0x05, (byte) 0x2F, (byte) 0x83,
+            (byte) 0x81, (byte) 0x64, (byte) 0xCD, (byte) 0x37,
+            (byte) 0xD9, (byte) 0xA2, (byte) 0x11, (byte) 0x73
+    };
+
+    // cofactor of G
+    public static final short EC409_F2M_K = 2;
+
+    //sect571r1 from http://www.secg.org/sec2-v2.pdf
+    // [short i1, short i2, short i3] f = x^571 + x^i1 + x^i2 + x^i3 + 1
+    public static final byte[] EC571_F2M_F = new byte[]{
+            (byte) 0x00, (byte) 0x0a,
+            (byte) 0x00, (byte) 0x05,
+            (byte) 0x00, (byte) 0x02,
+    };
+
+    public static final byte[] EC571_F2M_A = new byte[]{
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01
+    };
+
+    public static final byte[] EC571_F2M_B = new byte[]{
+            (byte) 0x02, (byte) 0xF4, (byte) 0x0E, (byte) 0x7E,
+            (byte) 0x22, (byte) 0x21, (byte) 0xF2, (byte) 0x95,
+            (byte) 0xDE, (byte) 0x29, (byte) 0x71, (byte) 0x17,
+            (byte) 0xB7, (byte) 0xF3, (byte) 0xD6, (byte) 0x2F,
+            (byte) 0x5C, (byte) 0x6A, (byte) 0x97, (byte) 0xFF,
+            (byte) 0xCB, (byte) 0x8C, (byte) 0xEF, (byte) 0xF1,
+            (byte) 0xCD, (byte) 0x6B, (byte) 0xA8, (byte) 0xCE,
+            (byte) 0x4A, (byte) 0x9A, (byte) 0x18, (byte) 0xAD,
+            (byte) 0x84, (byte) 0xFF, (byte) 0xAB, (byte) 0xBD,
+            (byte) 0x8E, (byte) 0xFA, (byte) 0x59, (byte) 0x33,
+            (byte) 0x2B, (byte) 0xE7, (byte) 0xAD, (byte) 0x67,
+            (byte) 0x56, (byte) 0xA6, (byte) 0x6E, (byte) 0x29,
+            (byte) 0x4A, (byte) 0xFD, (byte) 0x18, (byte) 0x5A,
+            (byte) 0x78, (byte) 0xFF, (byte) 0x12, (byte) 0xAA,
+            (byte) 0x52, (byte) 0x0E, (byte) 0x4D, (byte) 0xE7,
+            (byte) 0x39, (byte) 0xBA, (byte) 0xCA, (byte) 0x0C,
+            (byte) 0x7F, (byte) 0xFE, (byte) 0xFF, (byte) 0x7F,
+            (byte) 0x29, (byte) 0x55, (byte) 0x72, (byte) 0x7A
+    };
+
+    // G in compressed form / first part of ucompressed
+    public static final byte[] EC571_F2M_G_X = new byte[]{
+            (byte) 0x03, (byte) 0x03, (byte) 0x00, (byte) 0x1D,
+            (byte) 0x34, (byte) 0xB8, (byte) 0x56, (byte) 0x29,
+            (byte) 0x6C, (byte) 0x16, (byte) 0xC0, (byte) 0xD4,
+            (byte) 0x0D, (byte) 0x3C, (byte) 0xD7, (byte) 0x75,
+            (byte) 0x0A, (byte) 0x93, (byte) 0xD1, (byte) 0xD2,
+            (byte) 0x95, (byte) 0x5F, (byte) 0xA8, (byte) 0x0A,
+            (byte) 0xA5, (byte) 0xF4, (byte) 0x0F, (byte) 0xC8,
+            (byte) 0xDB, (byte) 0x7B, (byte) 0x2A, (byte) 0xBD,
+            (byte) 0xBD, (byte) 0xE5, (byte) 0x39, (byte) 0x50,
+            (byte) 0xF4, (byte) 0xC0, (byte) 0xD2, (byte) 0x93,
+            (byte) 0xCD, (byte) 0xD7, (byte) 0x11, (byte) 0xA3,
+            (byte) 0x5B, (byte) 0x67, (byte) 0xFB, (byte) 0x14,
+            (byte) 0x99, (byte) 0xAE, (byte) 0x60, (byte) 0x03,
+            (byte) 0x86, (byte) 0x14, (byte) 0xF1, (byte) 0x39,
+            (byte) 0x4A, (byte) 0xBF, (byte) 0xA3, (byte) 0xB4,
+            (byte) 0xC8, (byte) 0x50, (byte) 0xD9, (byte) 0x27,
+            (byte) 0xE1, (byte) 0xE7, (byte) 0x76, (byte) 0x9C,
+            (byte) 0x8E, (byte) 0xEC, (byte) 0x2D, (byte) 0x19
+    };
+
+    // second part of G uncompressed
+    public static final byte[] EC571_F2M_G_Y = new byte[]{
+            (byte) 0x03, (byte) 0x7B, (byte) 0xF2, (byte) 0x73,
+            (byte) 0x42, (byte) 0xDA, (byte) 0x63, (byte) 0x9B,
+            (byte) 0x6D, (byte) 0xCC, (byte) 0xFF, (byte) 0xFE,
+            (byte) 0xB7, (byte) 0x3D, (byte) 0x69, (byte) 0xD7,
+            (byte) 0x8C, (byte) 0x6C, (byte) 0x27, (byte) 0xA6,
+            (byte) 0x00, (byte) 0x9C, (byte) 0xBB, (byte) 0xCA,
+            (byte) 0x19, (byte) 0x80, (byte) 0xF8, (byte) 0x53,
+            (byte) 0x39, (byte) 0x21, (byte) 0xE8, (byte) 0xA6,
+            (byte) 0x84, (byte) 0x42, (byte) 0x3E, (byte) 0x43,
+            (byte) 0xBA, (byte) 0xB0, (byte) 0x8A, (byte) 0x57,
+            (byte) 0x62, (byte) 0x91, (byte) 0xAF, (byte) 0x8F,
+            (byte) 0x46, (byte) 0x1B, (byte) 0xB2, (byte) 0xA8,
+            (byte) 0xB3, (byte) 0x53, (byte) 0x1D, (byte) 0x2F,
+            (byte) 0x04, (byte) 0x85, (byte) 0xC1, (byte) 0x9B,
+            (byte) 0x16, (byte) 0xE2, (byte) 0xF1, (byte) 0x51,
+            (byte) 0x6E, (byte) 0x23, (byte) 0xDD, (byte) 0x3C,
+            (byte) 0x1A, (byte) 0x48, (byte) 0x27, (byte) 0xAF,
+            (byte) 0x1B, (byte) 0x8A, (byte) 0xC1, (byte) 0x5B
+    };
+
+    // order of G
+    public static final byte[] EC571_F2M_R = new byte[]{
+            (byte) 0x03, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+            (byte) 0xE6, (byte) 0x61, (byte) 0xCE, (byte) 0x18,
+            (byte) 0xFF, (byte) 0x55, (byte) 0x98, (byte) 0x73,
+            (byte) 0x08, (byte) 0x05, (byte) 0x9B, (byte) 0x18,
+            (byte) 0x68, (byte) 0x23, (byte) 0x85, (byte) 0x1E,
+            (byte) 0xC7, (byte) 0xDD, (byte) 0x9C, (byte) 0xA1,
+            (byte) 0x16, (byte) 0x1D, (byte) 0xE9, (byte) 0x3D,
+            (byte) 0x51, (byte) 0x74, (byte) 0xD6, (byte) 0x6E,
+            (byte) 0x83, (byte) 0x82, (byte) 0xE9, (byte) 0xBB,
+            (byte) 0x2F, (byte) 0xE8, (byte) 0x4E, (byte) 0x47
+    };
+
+    // cofactor of G
+    public static final short EC571_F2M_K = 2;
+
+
+    // transformParameter TRANSFORMATION types
+    public static final short TRANSFORMATION_NONE = (short) 0x00;
+    public static final short TRANSFORMATION_FIXED = (short) 0x01;
+    public static final short TRANSFORMATION_FULLRANDOM = (short) 0x02;
+    public static final short TRANSFORMATION_ONEBYTERANDOM = (short) 0x04;
+    public static final short TRANSFORMATION_ZERO = (short) 0x08;
+    public static final short TRANSFORMATION_ONE = (short) 0x10;
+    public static final short TRANSFORMATION_MAX = (short) 0x20;
+    public static final short TRANSFORMATION_INCREMENT = (short) 0x40;
+    public static final short TRANSFORMATION_INFINITY = (short) 0x80;
+    public static final short TRANSFORMATION_COMPRESS = (short) 0x0100;
+    public static final short TRANSFORMATION_COMPRESS_HYBRID = (short) 0x0200;
+    public static final short TRANSFORMATION_04_MASK = (short) 0x0400;
+
+    // toX962 FORM types
+    public static final byte X962_UNCOMPRESSED = (byte) 0x00;
+    public static final byte X962_COMPRESSED = (byte) 0x01;
+    public static final byte X962_HYBRID = (byte) 0x02;
+
+    // Supported embedded curves, getCurveParameter
+    public static final byte CURVE_default = (byte) 0;
+    public static final byte CURVE_external = (byte) 0xff;
+
+    // SECG recommended curves over FP
+    public static final byte CURVE_secp112r1 = (byte) 1;
+    public static final byte CURVE_secp128r1 = (byte) 2;
+    public static final byte CURVE_secp160r1 = (byte) 3;
+    public static final byte CURVE_secp192r1 = (byte) 4;
+    public static final byte CURVE_secp224r1 = (byte) 5;
+    public static final byte CURVE_secp256r1 = (byte) 6;
+    public static final byte CURVE_secp384r1 = (byte) 7;
+    public static final byte CURVE_secp521r1 = (byte) 8;
+
+    public static final byte FP_CURVES = (byte) 8;
+
+    // SECG recommended curves over F2M
+    public static final byte CURVE_sect163r1 = (byte) 9;
+    public static final byte CURVE_sect233r1 = (byte) 10;
+    public static final byte CURVE_sect283r1 = (byte) 11;
+    public static final byte CURVE_sect409r1 = (byte) 12;
+    public static final byte CURVE_sect571r1 = (byte) 13;
+
+    public static final byte F2M_CURVES = (byte) 13;
+
+    public static final short[] FP_SIZES = new short[]{112, 128, 160, 192, 224, 256, 384, 521};
+    public static final short[] F2M_SIZES = new short[]{163, 233, 283, 409, 571};
+
+    // Class javacard.security.KeyAgreement
+    // javacard.security.KeyAgreement Fields:
+    public static final byte KeyAgreement_ALG_EC_SVDP_DH = 1;
+    public static final byte KeyAgreement_ALG_EC_SVDP_DHC = 2;
+    public static final byte KeyAgreement_ALG_EC_SVDP_DH_PLAIN = 3;
+    public static final byte KeyAgreement_ALG_EC_SVDP_DHC_PLAIN = 4;
+    public static final byte KeyAgreement_ALG_EC_PACE_GM = 5;
+    public static final byte KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY = 6;
+
+    public static final byte[] KA_TYPES = new byte[]{
+            KeyAgreement_ALG_EC_SVDP_DH,
+            //KeyAgreement_ALG_EC_SVDP_DH_KDF, //duplicate
+            KeyAgreement_ALG_EC_SVDP_DHC,
+            //KeyAgreement_ALG_EC_SVDP_DHC_KDF, //duplicate
+            KeyAgreement_ALG_EC_SVDP_DH_PLAIN,
+            KeyAgreement_ALG_EC_SVDP_DHC_PLAIN,
+            KeyAgreement_ALG_EC_PACE_GM,
+            KeyAgreement_ALG_EC_SVDP_DH_PLAIN_XY
+    };
+
+    // Class javacard.security.Signature
+    // javacard.security.Signature Fields:
+    public static final byte Signature_ALG_ECDSA_SHA = 17;
+    public static final byte Signature_ALG_ECDSA_SHA_224 = 37;
+    public static final byte Signature_ALG_ECDSA_SHA_256 = 33;
+    public static final byte Signature_ALG_ECDSA_SHA_384 = 34;
+    public static final byte Signature_ALG_ECDSA_SHA_512 = 38;
+
+    public static final byte[] SIG_TYPES = new byte[]{
+            Signature_ALG_ECDSA_SHA,
+            Signature_ALG_ECDSA_SHA_224,
+            Signature_ALG_ECDSA_SHA_256,
+            Signature_ALG_ECDSA_SHA_384,
+            Signature_ALG_ECDSA_SHA_512
+    };
+
+    public static byte getCurve(short keyLength, byte keyClass) {
+        if (keyClass == KeyPair.ALG_EC_FP) {
+            switch (keyLength) {
+                case (short) 112:
+                    return CURVE_secp112r1;
+                case (short) 128:
+                    return CURVE_secp128r1;
+                case (short) 160:
+                    return CURVE_secp160r1;
+                case (short) 192:
+                    return CURVE_secp192r1;
+                case (short) 224:
+                    return CURVE_secp224r1;
+                case (short) 256:
+                    return CURVE_secp256r1;
+                case (short) 384:
+                    return CURVE_secp384r1;
+                case (short) 521:
+                    return CURVE_secp521r1;
+                default:
+                    ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+            }
+        } else if (keyClass == KeyPair.ALG_EC_F2M) {
+            switch (keyLength) {
+                case (short) 163:
+                    return CURVE_sect163r1;
+                case (short) 233:
+                    return CURVE_sect233r1;
+                case (short) 283:
+                    return CURVE_sect283r1;
+                case (short) 409:
+                    return CURVE_sect409r1;
+                case (short) 571:
+                    return CURVE_sect571r1;
+                default:
+                    ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+            }
+        } else {
+            ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        }
+        return 0;
+    }
+
+    public static short getCurveParameter(byte curve, short param, byte[] outputBuffer, short outputOffset) {
+        byte alg = getCurveType(curve);
+        switch (curve) {
+            case CURVE_secp112r1: {
+                EC_FP_P = EC112_FP_P;
+                EC_A = EC112_FP_A;
+                EC_B = EC112_FP_B;
+                EC_G_X = EC112_FP_G_X;
+                EC_G_Y = EC112_FP_G_Y;
+                EC_R = EC112_FP_R;
+                EC_K = EC112_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp128r1: {
+                EC_FP_P = EC128_FP_P;
+                EC_A = EC128_FP_A;
+                EC_B = EC128_FP_B;
+                EC_G_X = EC128_FP_G_X;
+                EC_G_Y = EC128_FP_G_Y;
+                EC_R = EC128_FP_R;
+                EC_K = EC128_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp160r1: {
+                EC_FP_P = EC160_FP_P;
+                EC_A = EC160_FP_A;
+                EC_B = EC160_FP_B;
+                EC_G_X = EC160_FP_G_X;
+                EC_G_Y = EC160_FP_G_Y;
+                EC_R = EC160_FP_R;
+                EC_K = EC160_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp192r1: {
+                EC_FP_P = EC192_FP_P;
+                EC_A = EC192_FP_A;
+                EC_B = EC192_FP_B;
+                EC_G_X = EC192_FP_G_X;
+                EC_G_Y = EC192_FP_G_Y;
+                EC_R = EC192_FP_R;
+                EC_K = EC192_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp224r1: {
+                EC_FP_P = EC224_FP_P;
+                EC_A = EC224_FP_A;
+                EC_B = EC224_FP_B;
+                EC_G_X = EC224_FP_G_X;
+                EC_G_Y = EC224_FP_G_Y;
+                EC_R = EC224_FP_R;
+                EC_K = EC224_FP_K;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp256r1: {
+                EC_FP_P = EC256_FP_P;
+                EC_A = EC256_FP_A;
+                EC_B = EC256_FP_B;
+                EC_G_X = EC256_FP_G_X;
+                EC_G_Y = EC256_FP_G_Y;
+                EC_R = EC256_FP_R;
+                EC_K = EC256_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp384r1: {
+                EC_FP_P = EC384_FP_P;
+                EC_A = EC384_FP_A;
+                EC_B = EC384_FP_B;
+                EC_G_X = EC384_FP_G_X;
+                EC_G_Y = EC384_FP_G_Y;
+                EC_R = EC384_FP_R;
+                EC_K = EC384_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_secp521r1: {
+                EC_FP_P = EC521_FP_P;
+                EC_A = EC521_FP_A;
+                EC_B = EC521_FP_B;
+                EC_G_X = EC521_FP_G_X;
+                EC_G_Y = EC521_FP_G_Y;
+                EC_R = EC521_FP_R;
+                EC_K = EC521_FP_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_sect163r1: {
+                EC_F2M_F2M = EC163_F2M_F;
+                EC_A = EC163_F2M_A;
+                EC_B = EC163_F2M_B;
+                EC_G_X = EC163_F2M_G_X;
+                EC_G_Y = EC163_F2M_G_Y;
+                EC_R = EC163_F2M_R;
+                EC_K = EC163_F2M_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_sect233r1: {
+                EC_F2M_F2M = EC233_F2M_F;
+                EC_A = EC233_F2M_A;
+                EC_B = EC233_F2M_B;
+                EC_G_X = EC233_F2M_G_X;
+                EC_G_Y = EC233_F2M_G_Y;
+                EC_R = EC233_F2M_R;
+                EC_K = EC233_F2M_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_sect283r1: {
+                EC_F2M_F2M = EC283_F2M_F;
+                EC_A = EC283_F2M_A;
+                EC_B = EC283_F2M_B;
+                EC_G_X = EC283_F2M_G_X;
+                EC_G_Y = EC283_F2M_G_Y;
+                EC_R = EC283_F2M_R;
+                EC_K = EC283_F2M_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_sect409r1: {
+                EC_F2M_F2M = EC409_F2M_F;
+                EC_A = EC409_F2M_A;
+                EC_B = EC409_F2M_B;
+                EC_G_X = EC409_F2M_G_X;
+                EC_G_Y = EC409_F2M_G_Y;
+                EC_R = EC409_F2M_R;
+                EC_K = EC409_F2M_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            case CURVE_sect571r1: {
+                EC_F2M_F2M = EC571_F2M_F;
+                EC_A = EC571_F2M_A;
+                EC_B = EC571_F2M_B;
+                EC_G_X = EC571_F2M_G_X;
+                EC_G_Y = EC571_F2M_G_Y;
+                EC_R = EC571_F2M_R;
+                EC_K = EC571_F2M_K;
+                EC_W_X = null;
+                EC_W_Y = null;
+                EC_S = null;
+                break;
+            }
+            default:
+                ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        }
+        short length = 0;
+        switch (param) {
+            case PARAMETER_FP:
+                if (alg == KeyPair.ALG_EC_FP) {
+                    length = Util.arrayCopyNonAtomic(EC_FP_P, (short) 0, outputBuffer, outputOffset, (short) EC_FP_P.length);
+                }
+                break;
+            case PARAMETER_F2M:
+                if (alg == KeyPair.ALG_EC_F2M) {
+                    length = Util.arrayCopyNonAtomic(EC_F2M_F2M, (short) 0, outputBuffer, outputOffset, (short) EC_F2M_F2M.length);
+                }
+                break;
+            case PARAMETER_A:
+                length = Util.arrayCopyNonAtomic(EC_A, (short) 0, outputBuffer, outputOffset, (short) EC_A.length);
+                break;
+            case PARAMETER_B:
+                length = Util.arrayCopyNonAtomic(EC_B, (short) 0, outputBuffer, outputOffset, (short) EC_B.length);
+                break;
+            case PARAMETER_G:
+                length = toX962(X962_UNCOMPRESSED, outputBuffer, outputOffset, EC_G_X, (short) 0, (short) EC_G_X.length, EC_G_Y, (short) 0, (short) EC_G_Y.length);
+                break;
+            case PARAMETER_R:
+                length = Util.arrayCopyNonAtomic(EC_R, (short) 0, outputBuffer, outputOffset, (short) EC_R.length);
+                break;
+            case PARAMETER_K:
+                length = 2;
+                Util.setShort(outputBuffer, outputOffset, EC_K);
+                break;
+            case PARAMETER_W:
+                if (EC_W_X == null || EC_W_Y == null) {
+                    return 0;
+                }
+                length = toX962(X962_UNCOMPRESSED, outputBuffer, outputOffset, EC_W_X, (short) 0, (short) EC_W_X.length, EC_W_Y, (short) 0, (short) EC_W_Y.length);
+                break;
+            case PARAMETER_S:
+                if (EC_S == null) {
+                    return 0;
+                }
+                length = Util.arrayCopyNonAtomic(EC_S, (short) 0, outputBuffer, outputOffset, (short) EC_S.length);
+                break;
+            default:
+                ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        }
+        return length;
+    }
+
+    public static short transformParameter(short transformation, byte[] buffer, short offset, short length) {
+        if (transformation == TRANSFORMATION_NONE) {
+            return length;
+        }
+
+        short transformationMask = TRANSFORMATION_FIXED;
+        while (transformationMask <= TRANSFORMATION_04_MASK) {
+            short transformationPart = (short) (transformationMask & transformation);
+            switch (transformationPart) {
+                case (short) 0:
+                    break;
+                case TRANSFORMATION_FIXED:
+                    if (length >= 1) {
+                        buffer[offset] = (byte) 0xcc;
+                        buffer[(short) (offset + length - 1)] = (byte) 0xcc;
+                    }
+                    break;
+                case TRANSFORMATION_FULLRANDOM:
+                    randomData.generateData(buffer, offset, length);
+                    break;
+                case TRANSFORMATION_ONEBYTERANDOM:
+                    short first = Util.getShort(buffer, (short) 0); // save first two bytes
+
+                    randomData.generateData(buffer, (short) 0, (short) 2); // generate position
+                    short rngPos = Util.getShort(buffer, (short) 0); // save generated position
+
+                    Util.setShort(buffer, (short) 0, first); // restore first two bytes
+
+                    if (rngPos < 0) { // make positive
+                        rngPos = (short) -rngPos;
+                    }
+                    rngPos %= length; // make < param length
+
+                    byte original = buffer[rngPos];
+                    do {
+                        randomData.generateData(buffer, rngPos, (short) 1);
+                    } while (original == buffer[rngPos]);
+                    break;
+                case TRANSFORMATION_ZERO:
+                    Util.arrayFillNonAtomic(buffer, offset, length, (byte) 0);
+                    break;
+                case TRANSFORMATION_ONE:
+                    Util.arrayFillNonAtomic(buffer, offset, length, (byte) 0);
+                    buffer[(short) (offset + length)] = (byte) 1;
+                    break;
+                case TRANSFORMATION_MAX:
+                    Util.arrayFillNonAtomic(buffer, offset, length, (byte) 1);
+                    break;
+                case TRANSFORMATION_INCREMENT:
+                    short index = (short) (offset + length - 1);
+                    byte value;
+                    do {
+                        value = buffer[index];
+                        buffer[index--] = ++value;
+                    } while (value == (byte) 0 && index >= offset);
+                    break;
+                case TRANSFORMATION_INFINITY:
+                    Util.arrayFillNonAtomic(buffer, offset, length, (byte) 0);
+                    length = 1;
+                    break;
+                case TRANSFORMATION_COMPRESS_HYBRID:
+                case TRANSFORMATION_COMPRESS:
+                    if ((short) (length % 2) != 1) {
+                        // an uncompressed point should have odd length (since 1 byte type, + 2 * coords)
+                        ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+                    }
+                    short half = (short) ((short) (length - 1) / 2);
+                    byte yLSB = buffer[(short) (offset + length)];
+                    byte yBit = (byte) (yLSB & 0x01);
+                    if (yBit == 1) {
+                        buffer[offset] = 3;
+                    } else {
+                        buffer[offset] = 2;
+                    }
+
+                    if (transformationPart == TRANSFORMATION_COMPRESS) {
+                        length = (short) (half + 1);
+                    } else {
+                        buffer[offset] += 4;
+                    }
+                    break;
+                case TRANSFORMATION_04_MASK:
+                    buffer[offset] = 4;
+                    break;
+                default:
+                    ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+            }
+            transformationMask = (short) (transformationMask << 1);
+        }
+        return length;
+    }
+
+    public static byte getCurveType(byte curve) {
+        return curve <= FP_CURVES ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M;
+    }
+
+    @SuppressWarnings("fallthrough")
+    public static short toX962(byte form, byte[] outputBuffer, short outputOffset, byte[] xBuffer, short xOffset, short xLength, byte[] yBuffer, short yOffset, short yLength) {
+        short size = 1;
+        size += xLength;
+
+        short offset = outputOffset;
+        outputBuffer[offset] = 0;
+        switch (form) {
+            case X962_UNCOMPRESSED:
+                outputBuffer[offset] = 4;
+                break;
+            case X962_HYBRID:
+                outputBuffer[offset] = 4;
+            case X962_COMPRESSED: /* fallthrough */
+                byte yLSB = yBuffer[(short) (yOffset + yLength)];
+                byte yBit = (byte) (yLSB & 0x01);
+
+                if (yBit == 1) {
+                    outputBuffer[offset] += 3;
+                } else {
+                    outputBuffer[offset] += 2;
+                }
+                break;
+            default:
+                ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
+        }
+        offset += 1;
+
+        offset = Util.arrayCopyNonAtomic(xBuffer, xOffset, outputBuffer, offset, xLength);
+        if (form == X962_HYBRID || form == X962_UNCOMPRESSED) {
+            Util.arrayCopyNonAtomic(yBuffer, yOffset, outputBuffer, offset, yLength);
+            size += yLength;
+        }
+
+        return size;
+    }
+
+}
diff --git a/src/cz/crcs/ectester/common/ec/EC_Curve.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Curve.java
index d188551..aaf6538 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Curve.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Curve.java
@@ -1,6 +1,5 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.util.ByteUtil;
 import javacard.security.KeyPair;
 import org.bouncycastle.math.ec.ECCurve;
diff --git a/src/cz/crcs/ectester/common/ec/EC_Data.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Data.java
index 14ae1c5..14ae1c5 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Data.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Data.java
diff --git a/src/cz/crcs/ectester/common/ec/EC_KAResult.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_KAResult.java
index 4e97950..4e97950 100644
--- a/src/cz/crcs/ectester/common/ec/EC_KAResult.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_KAResult.java
diff --git a/src/cz/crcs/ectester/common/ec/EC_Key.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Key.java
index 754775d..a9f0c40 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Key.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Key.java
@@ -1,7 +1,5 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.applet.EC_Consts;
-
 /**
  * An abstract-like EC key. Concrete implementations create a public and private keys.
  *
diff --git a/src/cz/crcs/ectester/common/ec/EC_Keypair.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Keypair.java
index 24ddba7..b1a0cbc 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Keypair.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Keypair.java
@@ -1,7 +1,5 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.applet.EC_Consts;
-
 /**
  * An EC keypair, contains both the W and S parameters.
  *
diff --git a/src/cz/crcs/ectester/common/ec/EC_Params.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Params.java
index e922feb..146c8d6 100644
--- a/src/cz/crcs/ectester/common/ec/EC_Params.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_Params.java
@@ -1,6 +1,5 @@
 package cz.crcs.ectester.common.ec;
 
-import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.util.ByteUtil;
 
 import java.io.ByteArrayOutputStream;
diff --git a/src/cz/crcs/ectester/common/ec/EC_SigResult.java b/common/src/main/java/cz/crcs/ectester/common/ec/EC_SigResult.java
index d97ced1..d97ced1 100644
--- a/src/cz/crcs/ectester/common/ec/EC_SigResult.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/EC_SigResult.java
diff --git a/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java b/common/src/main/java/cz/crcs/ectester/common/ec/RawECPrivateKey.java
index 479118f..479118f 100644
--- a/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/RawECPrivateKey.java
diff --git a/src/cz/crcs/ectester/common/ec/RawECPublicKey.java b/common/src/main/java/cz/crcs/ectester/common/ec/RawECPublicKey.java
index 7888854..7888854 100644
--- a/src/cz/crcs/ectester/common/ec/RawECPublicKey.java
+++ b/common/src/main/java/cz/crcs/ectester/common/ec/RawECPublicKey.java
diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/common/src/main/java/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 5c449db..5c449db 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/BaseTextTestWriter.java
diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/common/src/main/java/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index 53970dd..53970dd 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/common/src/main/java/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index e054563..e054563 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
diff --git a/src/cz/crcs/ectester/common/output/OutputLogger.java b/common/src/main/java/cz/crcs/ectester/common/output/OutputLogger.java
index effd1fd..effd1fd 100644
--- a/src/cz/crcs/ectester/common/output/OutputLogger.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/OutputLogger.java
diff --git a/src/cz/crcs/ectester/common/output/TeeOutputStream.java b/common/src/main/java/cz/crcs/ectester/common/output/TeeOutputStream.java
index 2401fce..2401fce 100644
--- a/src/cz/crcs/ectester/common/output/TeeOutputStream.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/TeeOutputStream.java
diff --git a/src/cz/crcs/ectester/common/output/TeeTestWriter.java b/common/src/main/java/cz/crcs/ectester/common/output/TeeTestWriter.java
index 58a0a15..58a0a15 100644
--- a/src/cz/crcs/ectester/common/output/TeeTestWriter.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/TeeTestWriter.java
diff --git a/src/cz/crcs/ectester/common/output/TestWriter.java b/common/src/main/java/cz/crcs/ectester/common/output/TestWriter.java
index 67aeccb..67aeccb 100644
--- a/src/cz/crcs/ectester/common/output/TestWriter.java
+++ b/common/src/main/java/cz/crcs/ectester/common/output/TestWriter.java
diff --git a/src/cz/crcs/ectester/common/test/BaseTestable.java b/common/src/main/java/cz/crcs/ectester/common/test/BaseTestable.java
index 3c304d9..3c304d9 100644
--- a/src/cz/crcs/ectester/common/test/BaseTestable.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/BaseTestable.java
diff --git a/src/cz/crcs/ectester/common/test/CompoundTest.java b/common/src/main/java/cz/crcs/ectester/common/test/CompoundTest.java
index ba4ad4f..ba4ad4f 100644
--- a/src/cz/crcs/ectester/common/test/CompoundTest.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/CompoundTest.java
diff --git a/src/cz/crcs/ectester/common/test/Result.java b/common/src/main/java/cz/crcs/ectester/common/test/Result.java
index f065f9c..f065f9c 100644
--- a/src/cz/crcs/ectester/common/test/Result.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/Result.java
diff --git a/src/cz/crcs/ectester/common/test/SimpleTest.java b/common/src/main/java/cz/crcs/ectester/common/test/SimpleTest.java
index d2b3e94..d2b3e94 100644
--- a/src/cz/crcs/ectester/common/test/SimpleTest.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/SimpleTest.java
diff --git a/src/cz/crcs/ectester/common/test/Test.java b/common/src/main/java/cz/crcs/ectester/common/test/Test.java
index 8bf9502..8bf9502 100644
--- a/src/cz/crcs/ectester/common/test/Test.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/Test.java
diff --git a/src/cz/crcs/ectester/common/test/TestCallback.java b/common/src/main/java/cz/crcs/ectester/common/test/TestCallback.java
index c5a49f3..c5a49f3 100644
--- a/src/cz/crcs/ectester/common/test/TestCallback.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/TestCallback.java
diff --git a/src/cz/crcs/ectester/common/test/TestException.java b/common/src/main/java/cz/crcs/ectester/common/test/TestException.java
index 0b605eb..0b605eb 100644
--- a/src/cz/crcs/ectester/common/test/TestException.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/TestException.java
diff --git a/src/cz/crcs/ectester/common/test/TestSuite.java b/common/src/main/java/cz/crcs/ectester/common/test/TestSuite.java
index b12680a..b12680a 100644
--- a/src/cz/crcs/ectester/common/test/TestSuite.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/TestSuite.java
diff --git a/src/cz/crcs/ectester/common/test/TestSuiteException.java b/common/src/main/java/cz/crcs/ectester/common/test/TestSuiteException.java
index 2d1ea09..2d1ea09 100644
--- a/src/cz/crcs/ectester/common/test/TestSuiteException.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/TestSuiteException.java
diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/common/src/main/java/cz/crcs/ectester/common/test/Testable.java
index 7b4545c..7b4545c 100644
--- a/src/cz/crcs/ectester/common/test/Testable.java
+++ b/common/src/main/java/cz/crcs/ectester/common/test/Testable.java
diff --git a/src/cz/crcs/ectester/common/util/ByteUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/ByteUtil.java
index 442824a..442824a 100644
--- a/src/cz/crcs/ectester/common/util/ByteUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/ByteUtil.java
diff --git a/common/src/main/java/cz/crcs/ectester/common/util/CardConsts.java b/common/src/main/java/cz/crcs/ectester/common/util/CardConsts.java
new file mode 100644
index 0000000..1483346
--- /dev/null
+++ b/common/src/main/java/cz/crcs/ectester/common/util/CardConsts.java
@@ -0,0 +1,65 @@
+package cz.crcs.ectester.common.util;
+
+public class CardConsts {
+    // MAIN INSTRUCTION CLASS
+    public static final byte CLA_ECTESTERAPPLET = (byte) 0xB0;
+
+    // INSTRUCTIONS
+    public static final byte INS_ALLOCATE = (byte) 0x5a;
+    public static final byte INS_CLEAR = (byte) 0x5b;
+    public static final byte INS_SET = (byte) 0x5c;
+    public static final byte INS_TRANSFORM = (byte) 0x5d;
+    public static final byte INS_GENERATE = (byte) 0x5e;
+    public static final byte INS_EXPORT = (byte) 0x5f;
+    public static final byte INS_ECDH = (byte) 0x70;
+    public static final byte INS_ECDH_DIRECT = (byte) 0x71;
+    public static final byte INS_ECDSA = (byte) 0x72;
+    public static final byte INS_ECDSA_SIGN = (byte) 0x73;
+    public static final byte INS_ECDSA_VERIFY = (byte) 0x74;
+    public static final byte INS_CLEANUP = (byte) 0x75;
+    public static final byte INS_ALLOCATE_KA = (byte) 0x76;
+    public static final byte INS_ALLOCATE_SIG = (byte) 0x77;
+    public static final byte INS_GET_INFO = (byte) 0x78;
+    public static final byte INS_SET_DRY_RUN_MODE = (byte) 0x79;
+    public static final byte INS_BUFFER = (byte) 0x7a;
+    public static final byte INS_PERFORM = (byte) 0x7b;
+
+    // PARAMETERS for P1 and P2
+    public static final byte KEYPAIR_LOCAL = (byte) 0x01;
+    public static final byte KEYPAIR_REMOTE = (byte) 0x02;
+    public static final byte KEYPAIR_BOTH = KEYPAIR_LOCAL | KEYPAIR_REMOTE;
+    public static final byte BUILD_KEYPAIR = (byte) 0x01;
+    public static final byte BUILD_KEYBUILDER = (byte) 0x02;
+    public static final byte EXPORT_TRUE = (byte) 0xff;
+    public static final byte EXPORT_FALSE = (byte) 0x00;
+    public static final byte MODE_NORMAL = (byte) 0xaa;
+    public static final byte MODE_DRY_RUN = (byte) 0xbb;
+
+    // STATUS WORDS
+    public static final short SW_SIG_VERIFY_FAIL = (short) 0x0ee1;
+    public static final short SW_DH_DHC_MISMATCH = (short) 0x0ee2;
+    public static final short SW_KEYPAIR_NULL = (short) 0x0ee3;
+    public static final short SW_KA_NULL = (short) 0x0ee4;
+    public static final short SW_SIGNATURE_NULL = (short) 0x0ee5;
+    public static final short SW_OBJECT_NULL = (short) 0x0ee6;
+    public static final short SW_CANNOT_FIT = (short) 0x0ee7;
+    public static final short SW_Exception = (short) 0xff01;
+    public static final short SW_ArrayIndexOutOfBoundsException = (short) 0xff02;
+    public static final short SW_ArithmeticException = (short) 0xff03;
+    public static final short SW_ArrayStoreException = (short) 0xff04;
+    public static final short SW_NullPointerException = (short) 0xff05;
+    public static final short SW_NegativeArraySizeException = (short) 0xff06;
+    public static final short SW_CryptoException_prefix = (short) 0xf100;
+    public static final short SW_SystemException_prefix = (short) 0xf200;
+    public static final short SW_PINException_prefix = (short) 0xf300;
+    public static final short SW_TransactionException_prefix = (short) 0xf400;
+    public static final short SW_CardRuntimeException_prefix = (short) 0xf500;
+
+    //
+    public static final short BASE_221 = (short) 0x0221;
+    public static final short BASE_222 = (short) 0x0222;
+
+    //
+    public static final short CDATA_BASIC = (short) 5;
+    public static final short CDATA_EXTENDED = (short) 7;
+}
diff --git a/src/cz/crcs/ectester/common/util/CardUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/CardUtil.java
index 72963cf..aac2d3c 100644
--- a/src/cz/crcs/ectester/common/util/CardUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/CardUtil.java
@@ -1,7 +1,6 @@
 package cz.crcs.ectester.common.util;
 
-import cz.crcs.ectester.applet.ECTesterApplet;
-import cz.crcs.ectester.applet.EC_Consts;
+import cz.crcs.ectester.common.ec.EC_Consts;
 import javacard.framework.ISO7816;
 import javacard.security.CryptoException;
 import javacard.security.KeyPair;
@@ -126,13 +125,13 @@ public class CardUtil {
             case CryptoException.INVALID_INIT:
             case CryptoException.ILLEGAL_USE:
                 return "CryptoException";
-            case ECTesterApplet.SW_SIG_VERIFY_FAIL:
-            case ECTesterApplet.SW_DH_DHC_MISMATCH:
-            case ECTesterApplet.SW_KEYPAIR_NULL:
-            case ECTesterApplet.SW_KA_NULL:
-            case ECTesterApplet.SW_SIGNATURE_NULL:
-            case ECTesterApplet.SW_OBJECT_NULL:
-                return "ECTesterApplet";
+            case CardConsts.SW_SIG_VERIFY_FAIL:
+            case CardConsts.SW_DH_DHC_MISMATCH:
+            case CardConsts.SW_KEYPAIR_NULL:
+            case CardConsts.SW_KA_NULL:
+            case CardConsts.SW_SIGNATURE_NULL:
+            case CardConsts.SW_OBJECT_NULL:
+                return "CardConsts";
             default:
                 return "?";
         }
@@ -208,29 +207,29 @@ public class CardUtil {
                         return "INVALID_INIT";
                     case CryptoException.ILLEGAL_USE:
                         return "ILLEGAL_USE";
-                    case ECTesterApplet.SW_SIG_VERIFY_FAIL:
+                    case CardConsts.SW_SIG_VERIFY_FAIL:
                         return "SIG_VERIFY_FAIL";
-                    case ECTesterApplet.SW_DH_DHC_MISMATCH:
+                    case CardConsts.SW_DH_DHC_MISMATCH:
                         return "DH_DHC_MISMATCH";
-                    case ECTesterApplet.SW_KEYPAIR_NULL:
+                    case CardConsts.SW_KEYPAIR_NULL:
                         return "KEYPAIR_NULL";
-                    case ECTesterApplet.SW_KA_NULL:
+                    case CardConsts.SW_KA_NULL:
                         return "KA_NULL";
-                    case ECTesterApplet.SW_SIGNATURE_NULL:
+                    case CardConsts.SW_SIGNATURE_NULL:
                         return "SIGNATURE_NULL";
-                    case ECTesterApplet.SW_OBJECT_NULL:
+                    case CardConsts.SW_OBJECT_NULL:
                         return "OBJECT_NULL";
-                    case ECTesterApplet.SW_Exception:
+                    case CardConsts.SW_Exception:
                         return "Exception";
-                    case ECTesterApplet.SW_ArrayIndexOutOfBoundsException:
+                    case CardConsts.SW_ArrayIndexOutOfBoundsException:
                         return "ArrayIndexOutOfBoundsException";
-                    case ECTesterApplet.SW_ArithmeticException:
+                    case CardConsts.SW_ArithmeticException:
                         return "ArithmeticException";
-                    case ECTesterApplet.SW_ArrayStoreException:
+                    case CardConsts.SW_ArrayStoreException:
                         return "ArrayStoreException";
-                    case ECTesterApplet.SW_NullPointerException:
+                    case CardConsts.SW_NullPointerException:
                         return "NullPointerException";
-                    case ECTesterApplet.SW_NegativeArraySizeException:
+                    case CardConsts.SW_NegativeArraySizeException:
                         return "NegativeArraySizeException";
                     default:
                         return "unknown";
diff --git a/src/cz/crcs/ectester/common/util/ECUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java
index e8c0a11..773644b 100644
--- a/src/cz/crcs/ectester/common/util/ECUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/ECUtil.java
@@ -1,15 +1,11 @@
 package cz.crcs.ectester.common.util;
 
-import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.common.ec.*;
 import cz.crcs.ectester.data.EC_Store;
-import cz.crcs.ectester.standalone.consts.SignatureIdent;
-import org.bouncycastle.asn1.*;
 import org.bouncycastle.crypto.digests.SHA1Digest;
 import org.bouncycastle.crypto.signers.PlainDSAEncoding;
 import org.bouncycastle.crypto.signers.StandardDSAEncoding;
 
-import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
@@ -349,20 +345,6 @@ public class ECUtil {
     }
 
     public static BigInteger recoverSignatureNonce(byte[] signature, byte[] data, BigInteger privkey, ECParameterSpec params, String hashAlgo, String sigType) {
-        SignatureIdent sigIdent = SignatureIdent.get(hashAlgo + "with" + sigType);
-        if (sigIdent == null) {
-            return null;
-        }
-        return recoverSignatureNonce(signature, data, privkey, params, sigIdent);
-    }
-
-    public static BigInteger recoverSignatureNonce(byte[] signature, byte[] data, BigInteger privkey, ECParameterSpec params, SignatureIdent sigIdent) {
-        // Parse the types out of SignatureIdent.
-        String hashAlgo = sigIdent.getHashAlgo();
-        String sigType = sigIdent.getSigType();
-        if (sigType == null) {
-            sigType = sigIdent.toString();
-        }
         // We do not know how to reconstruct those nonces so far.
         // sigType.contains("ECKCDSA") || sigType.contains("ECNR") || sigType.contains("SM2")
         if (!sigType.contains("ECDSA")) {
diff --git a/src/cz/crcs/ectester/common/util/FileUtil.java b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
index e6e319b..e6e319b 100644
--- a/src/cz/crcs/ectester/common/util/FileUtil.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/FileUtil.java
diff --git a/src/cz/crcs/ectester/common/util/Util.java b/common/src/main/java/cz/crcs/ectester/common/util/Util.java
index 5b0cd79..5b0cd79 100644
--- a/src/cz/crcs/ectester/common/util/Util.java
+++ b/common/src/main/java/cz/crcs/ectester/common/util/Util.java
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/common/src/main/java/cz/crcs/ectester/data/EC_Store.java
index bcadf80..bcadf80 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/common/src/main/java/cz/crcs/ectester/data/EC_Store.java
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous112.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous112.csv
index 6711b71..6711b71 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous112.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous112.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous128.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous128.csv
index 2dcf172..2dcf172 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous128.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous160.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous160.csv
index bc50f6d..bc50f6d 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous160.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous160.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous192.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous192.csv
index 35a5c07..35a5c07 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous192.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous224.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous224.csv
index bf24496..bf24496 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous224.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous256.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous256.csv
index 24d7454..24d7454 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous256.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous320.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous320.csv
index 96e98e5..96e98e5 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous320.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous320.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous384.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous384.csv
index 6034b4a..6034b4a 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous384.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous384.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous512.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous512.csv
index ed7ee5b..ed7ee5b 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous512.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous512.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/anomalous521.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous521.csv
index e0d935e..e0d935e 100644
--- a/src/cz/crcs/ectester/data/anomalous/anomalous521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/anomalous521.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/curves.xml b/common/src/main/java/cz/crcs/ectester/data/anomalous/curves.xml
index 5486f35..5486f35 100644
--- a/src/cz/crcs/ectester/data/anomalous/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/curves.xml
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128a1.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128a1.csv
index 20f2863..20f2863 100644
--- a/src/cz/crcs/ectester/data/anomalous/miyaji128a1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128a1.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128a2.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128a2.csv
index 4c0f6bc..4c0f6bc 100644
--- a/src/cz/crcs/ectester/data/anomalous/miyaji128a2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128a2.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128b1.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128b1.csv
index 678ce90..678ce90 100644
--- a/src/cz/crcs/ectester/data/anomalous/miyaji128b1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128b1.csv
diff --git a/src/cz/crcs/ectester/data/anomalous/miyaji128b2.csv b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128b2.csv
index 73bf5aa..73bf5aa 100644
--- a/src/cz/crcs/ectester/data/anomalous/miyaji128b2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anomalous/miyaji128b2.csv
diff --git a/src/cz/crcs/ectester/data/anssi/curves.xml b/common/src/main/java/cz/crcs/ectester/data/anssi/curves.xml
index 0456e67..0456e67 100644
--- a/src/cz/crcs/ectester/data/anssi/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/anssi/curves.xml
diff --git a/src/cz/crcs/ectester/data/anssi/frp256v1.csv b/common/src/main/java/cz/crcs/ectester/data/anssi/frp256v1.csv
index 3e5428d..3e5428d 100644
--- a/src/cz/crcs/ectester/data/anssi/frp256v1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/anssi/frp256v1.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn158.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn158.csv
index 2e3b6b7..2e3b6b7 100644
--- a/src/cz/crcs/ectester/data/bn/bn158.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn158.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn190.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn190.csv
index feb225b..feb225b 100644
--- a/src/cz/crcs/ectester/data/bn/bn190.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn190.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn222.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn222.csv
index 89038b3..89038b3 100644
--- a/src/cz/crcs/ectester/data/bn/bn222.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn222.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn254.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn254.csv
index de71c5d..de71c5d 100644
--- a/src/cz/crcs/ectester/data/bn/bn254.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn254.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn286.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn286.csv
index 46d677e..46d677e 100644
--- a/src/cz/crcs/ectester/data/bn/bn286.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn286.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn318.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn318.csv
index bc431fe..bc431fe 100644
--- a/src/cz/crcs/ectester/data/bn/bn318.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn318.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn350.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn350.csv
index 237a255..237a255 100644
--- a/src/cz/crcs/ectester/data/bn/bn350.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn350.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn382.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn382.csv
index 955882a..955882a 100644
--- a/src/cz/crcs/ectester/data/bn/bn382.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn382.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn414.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn414.csv
index 0c7eb66..0c7eb66 100644
--- a/src/cz/crcs/ectester/data/bn/bn414.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn414.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn446.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn446.csv
index a0a525e..a0a525e 100644
--- a/src/cz/crcs/ectester/data/bn/bn446.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn446.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn478.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn478.csv
index 9c2640a..9c2640a 100644
--- a/src/cz/crcs/ectester/data/bn/bn478.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn478.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn510.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn510.csv
index 9dc79b3..9dc79b3 100644
--- a/src/cz/crcs/ectester/data/bn/bn510.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn510.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn542.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn542.csv
index 1a50175..1a50175 100644
--- a/src/cz/crcs/ectester/data/bn/bn542.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn542.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn574.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn574.csv
index 1d547c7..1d547c7 100644
--- a/src/cz/crcs/ectester/data/bn/bn574.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn574.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn606.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn606.csv
index f488ab2..f488ab2 100644
--- a/src/cz/crcs/ectester/data/bn/bn606.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn606.csv
diff --git a/src/cz/crcs/ectester/data/bn/bn638.csv b/common/src/main/java/cz/crcs/ectester/data/bn/bn638.csv
index cb54f9b..cb54f9b 100644
--- a/src/cz/crcs/ectester/data/bn/bn638.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/bn638.csv
diff --git a/src/cz/crcs/ectester/data/bn/curves.xml b/common/src/main/java/cz/crcs/ectester/data/bn/curves.xml
index c5ca22f..c5ca22f 100644
--- a/src/cz/crcs/ectester/data/bn/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/bn/curves.xml
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv
index a6734e9..a6734e9 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv
index b045237..b045237 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv
index d7fcf54..d7fcf54 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv
index 45ed451..45ed451 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv
index 411ff99..411ff99 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv
index d0e2610..d0e2610 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv
index f88728d..f88728d 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv
index 9c21eac..9c21eac 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv
index a5ea90d..a5ea90d 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv
index cda7844..cda7844 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv
index 4469585..4469585 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv
index 8a9a6ac..8a9a6ac 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv
index 20299d6..20299d6 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv
index 4a7c891..4a7c891 100644
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv
diff --git a/src/cz/crcs/ectester/data/brainpool/curves.xml b/common/src/main/java/cz/crcs/ectester/data/brainpool/curves.xml
index 2cb7fc5..2cb7fc5 100644
--- a/src/cz/crcs/ectester/data/brainpool/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/brainpool/curves.xml
diff --git a/src/cz/crcs/ectester/data/categories.xml b/common/src/main/java/cz/crcs/ectester/data/categories.xml
index 0776b99..0776b99 100644
--- a/src/cz/crcs/ectester/data/categories.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/categories.xml
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p128.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p128.csv
index 58459f6..58459f6 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p128.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p16.csv
index 181c47c..181c47c 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p16.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p2.csv
index d9857d8..d9857d8 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p2.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p32.csv
index 9673835..9673835 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p32.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p4.csv
index 44363ad..44363ad 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p4.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv
index 193f6a7..193f6a7 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p64.csv
index 35a5ecc..35a5ecc 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p64.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv
index 80a1eb3..80a1eb3 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv
index 54da6cc..54da6cc 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p8.csv
index 94d4b4e..94d4b4e 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor128p8.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p16.csv
index 4d82274..4d82274 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p16.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p2.csv
index 54717af..54717af 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p2.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p32.csv
index 75238ea..75238ea 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p32.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p4.csv
index 760dbef..760dbef 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p4.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p56467.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p56467.csv
index f5355bf..f5355bf 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p56467.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p56467.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p64.csv
index 4cdcfdc..4cdcfdc 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p64.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p65521.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p65521.csv
index 10e3605..10e3605 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p65521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p65521.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p65535.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p65535.csv
index bd47372..bd47372 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p65535.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p65535.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p8.csv
index 60ca98e..60ca98e 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor160p8.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t128.csv
index c748587..c748587 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t128.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t16.csv
index decdad3..decdad3 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t16.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t2.csv
index d837a28..d837a28 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t2.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t32.csv
index 2b88982..2b88982 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t32.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t4.csv
index 61f7b03..61f7b03 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t4.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t64.csv
index 6d3ee91..6d3ee91 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t64.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t8.csv
index 349e874..349e874 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor163t8.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p2.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p2.csv
index 4de7049..4de7049 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor192p2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p2.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p4.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p4.csv
index 645f031..645f031 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor192p4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p4.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p8.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p8.csv
index ee39445..ee39445 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor192p8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor192p8.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t128.csv
index 48505d4..48505d4 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t128.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t16.csv
index d838407..d838407 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t16.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t2.csv
index 61a945f..61a945f 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t2.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t32.csv
index 4f14dfe..4f14dfe 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t32.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t4.csv
index 1972de2..1972de2 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t4.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t64.csv
index df9e357..df9e357 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t64.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t8.csv
index 43f6705..43f6705 100644
--- a/src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/cofactor233t8.csv
diff --git a/src/cz/crcs/ectester/data/cofactor/curves.xml b/common/src/main/java/cz/crcs/ectester/data/cofactor/curves.xml
index 30204e8..30204e8 100644
--- a/src/cz/crcs/ectester/data/cofactor/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/curves.xml
diff --git a/src/cz/crcs/ectester/data/cofactor/keys.xml b/common/src/main/java/cz/crcs/ectester/data/cofactor/keys.xml
index d6058f0..d6058f0 100644
--- a/src/cz/crcs/ectester/data/cofactor/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/keys.xml
diff --git a/src/cz/crcs/ectester/data/cofactor/secg_keys.xml b/common/src/main/java/cz/crcs/ectester/data/cofactor/secg_keys.xml
index 9634e9d..9634e9d 100644
--- a/src/cz/crcs/ectester/data/cofactor/secg_keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/cofactor/secg_keys.xml
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_128.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_128.csv
index 400abca..400abca 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_128.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_192.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_192.csv
index 7c21982..7c21982 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_192.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_224.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_224.csv
index d72a30c..d72a30c 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_224.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_256.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_256.csv
index fea4281..fea4281 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_256.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_384.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_384.csv
index 3002514..3002514 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_384.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_384.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_512.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_512.csv
index 59d0b03..59d0b03 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_512.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_512.csv
diff --git a/src/cz/crcs/ectester/data/composite/carmichael_521.csv b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_521.csv
index 47ec1c3..47ec1c3 100644
--- a/src/cz/crcs/ectester/data/composite/carmichael_521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/carmichael_521.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128.csv
index 66b7011..66b7011 100644
--- a/src/cz/crcs/ectester/data/composite/composite128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128_pq.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq.csv
index 8aea6b2..8aea6b2 100644
--- a/src/cz/crcs/ectester/data/composite/composite128_pq.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128_pq1.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq1.csv
index a551487..a551487 100644
--- a/src/cz/crcs/ectester/data/composite/composite128_pq1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq1.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128_pq2.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq2.csv
index 69181df..69181df 100644
--- a/src/cz/crcs/ectester/data/composite/composite128_pq2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_pq2.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128_rg0.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_rg0.csv
index 2e039f4..2e039f4 100644
--- a/src/cz/crcs/ectester/data/composite/composite128_rg0.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_rg0.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite128_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_small.csv
index fbcbdca..fbcbdca 100644
--- a/src/cz/crcs/ectester/data/composite/composite128_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite128_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160.csv
index a78d77c..a78d77c 100644
--- a/src/cz/crcs/ectester/data/composite/composite160.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160_pq.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq.csv
index 3f43b50..3f43b50 100644
--- a/src/cz/crcs/ectester/data/composite/composite160_pq.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160_pq1.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq1.csv
index debd466..debd466 100644
--- a/src/cz/crcs/ectester/data/composite/composite160_pq1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq1.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160_pq2.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq2.csv
index efd7475..efd7475 100644
--- a/src/cz/crcs/ectester/data/composite/composite160_pq2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_pq2.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160_rg0.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_rg0.csv
index e6a1a95..e6a1a95 100644
--- a/src/cz/crcs/ectester/data/composite/composite160_rg0.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_rg0.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite160_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_small.csv
index 2adaa8b..2adaa8b 100644
--- a/src/cz/crcs/ectester/data/composite/composite160_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite160_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192.csv
index a9fbe1f..a9fbe1f 100644
--- a/src/cz/crcs/ectester/data/composite/composite192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192_pq.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq.csv
index 47b8a13..47b8a13 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_pq.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192_pq1.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq1.csv
index 664d35e..664d35e 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_pq1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq1.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192_pq2.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq2.csv
index 33fe0f3..33fe0f3 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_pq2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_pq2.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192_rg0.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_rg0.csv
index a55a994..a55a994 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_rg0.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_rg0.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite192_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_small.csv
index a90364d..a90364d 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite192_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224.csv
index 7902f2b..7902f2b 100644
--- a/src/cz/crcs/ectester/data/composite/composite224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224_pq.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq.csv
index ffa2cc1..ffa2cc1 100644
--- a/src/cz/crcs/ectester/data/composite/composite224_pq.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224_pq1.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq1.csv
index 6a01e2d..6a01e2d 100644
--- a/src/cz/crcs/ectester/data/composite/composite224_pq1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq1.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224_pq2.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq2.csv
index f8bc6df..f8bc6df 100644
--- a/src/cz/crcs/ectester/data/composite/composite224_pq2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_pq2.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224_rg0.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_rg0.csv
index 835676d..835676d 100644
--- a/src/cz/crcs/ectester/data/composite/composite224_rg0.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_rg0.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite224_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_small.csv
index ea18b96..ea18b96 100644
--- a/src/cz/crcs/ectester/data/composite/composite224_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite224_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256.csv
index 7769ef2..7769ef2 100644
--- a/src/cz/crcs/ectester/data/composite/composite256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256_pq.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq.csv
index 380f756..380f756 100644
--- a/src/cz/crcs/ectester/data/composite/composite256_pq.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256_pq1.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq1.csv
index 9ac845f..9ac845f 100644
--- a/src/cz/crcs/ectester/data/composite/composite256_pq1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq1.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256_pq2.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq2.csv
index b8b5e9b..b8b5e9b 100644
--- a/src/cz/crcs/ectester/data/composite/composite256_pq2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_pq2.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256_rg0.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_rg0.csv
index 0c2d123..0c2d123 100644
--- a/src/cz/crcs/ectester/data/composite/composite256_rg0.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_rg0.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite256_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_small.csv
index 58c0a75..58c0a75 100644
--- a/src/cz/crcs/ectester/data/composite/composite256_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite256_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite384.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite384.csv
index 4e9d058..4e9d058 100644
--- a/src/cz/crcs/ectester/data/composite/composite384.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite384.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite384_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite384_small.csv
index 00b643b..00b643b 100644
--- a/src/cz/crcs/ectester/data/composite/composite384_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite384_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite521.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite521.csv
index 8681273..8681273 100644
--- a/src/cz/crcs/ectester/data/composite/composite521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite521.csv
diff --git a/src/cz/crcs/ectester/data/composite/composite521_small.csv b/common/src/main/java/cz/crcs/ectester/data/composite/composite521_small.csv
index 15df9c8..15df9c8 100644
--- a/src/cz/crcs/ectester/data/composite/composite521_small.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/composite521_small.csv
diff --git a/src/cz/crcs/ectester/data/composite/curves.xml b/common/src/main/java/cz/crcs/ectester/data/composite/curves.xml
index 34ad33a..34ad33a 100644
--- a/src/cz/crcs/ectester/data/composite/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/curves.xml
diff --git a/src/cz/crcs/ectester/data/composite/keys.xml b/common/src/main/java/cz/crcs/ectester/data/composite/keys.xml
index da770d8..da770d8 100644
--- a/src/cz/crcs/ectester/data/composite/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/keys.xml
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/10.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/10.csv
index 5fa842a..5fa842a 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/10.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/10.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/112.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/112.csv
index 633ccd5..633ccd5 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/112.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/112.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/12.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/12.csv
index 62bb1a0..62bb1a0 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/12.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/12.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/128.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/128.csv
index 5f8c532..5f8c532 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/128.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/135.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/135.csv
index 232abff..232abff 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/135.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/135.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/14.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/14.csv
index c8df53e..c8df53e 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/14.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/14.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/140.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/140.csv
index 4d59858..4d59858 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/140.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/140.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/144.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/144.csv
index e8c6492..e8c6492 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/144.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/144.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/146.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/146.csv
index f656c72..f656c72 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/146.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/146.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/148.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/148.csv
index b292889..b292889 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/148.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/148.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/150.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/150.csv
index c1bf12e..c1bf12e 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/150.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/150.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/152.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/152.csv
index 24a03ba..24a03ba 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/152.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/152.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv
index 7861bbd..7861bbd 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/152_cofactor.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/16.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/16.csv
index fd76ff7..fd76ff7 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/16.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/16.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/20.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/20.csv
index 940d10c..940d10c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/20.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/20.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/25.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/25.csv
index 318099b..318099b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/25.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/25.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/2a.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/2a.csv
index 670f4bc..670f4bc 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/2a.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/2a.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/2b.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/2b.csv
index 216827b..216827b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/2b.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/2b.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/3.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/3.csv
index 18ec491..18ec491 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/3.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/3.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/32.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/32.csv
index fddfeee..fddfeee 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/32.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/32.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/4.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/4.csv
index a5b9e09..a5b9e09 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/4.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/48.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/48.csv
index 202a15b..202a15b 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/48.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/48.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/5.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/5.csv
index 5f0597c..5f0597c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/5.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/5.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/6.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/6.csv
index 9c1528f..9c1528f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/6.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/6.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/64.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/64.csv
index 94a2709..94a2709 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/64.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/64.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/7.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/7.csv
index 170b180..170b180 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/7.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/7.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/70.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/70.csv
index 1dbf9c0..1dbf9c0 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/70.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/70.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/8.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/8.csv
index 232df05..232df05 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/8.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/8.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/80.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/80.csv
index da082ef..da082ef 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/80.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/80.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/90.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/90.csv
index d67e673..d67e673 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/90.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/90.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/first/96.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/96.csv
index 5dd2d5c..5dd2d5c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/first/96.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/first/96.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/140.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/140.csv
index 08f5ba1..08f5ba1 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/140.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/140.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/141.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/141.csv
index 896493f..896493f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/141.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/141.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/142.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/142.csv
index cc5fd67..cc5fd67 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/142.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/142.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/143.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/143.csv
index 9c4861e..9c4861e 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/143.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/143.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/144.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/144.csv
index db68fad..db68fad 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/144.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/144.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/145.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/145.csv
index 08c8c4f..08c8c4f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/145.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/145.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/146.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/146.csv
index 3afd1a0..3afd1a0 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/146.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/146.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/147.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/147.csv
index 895acfe..895acfe 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/147.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/147.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/148.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/148.csv
index 0e2221f..0e2221f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/148.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/148.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/149.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/149.csv
index 2fb41e3..2fb41e3 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/149.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/149.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/150.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/150.csv
index e38fe99..e38fe99 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/150.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/150.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/151.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/151.csv
index 9b665bc..9b665bc 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/151.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/151.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/152.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/152.csv
index 854a93f..854a93f 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/152.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/152.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/153.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/153.csv
index 90ff712..90ff712 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/153.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/153.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/154.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/154.csv
index 1c45df7..1c45df7 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/154.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/154.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/155.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/155.csv
index a3dcc8c..a3dcc8c 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/155.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/155.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/156.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/156.csv
index 7614b13..7614b13 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/156.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/156.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/157.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/157.csv
index 06cd933..06cd933 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/157.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/157.csv
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/second/158.csv b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/158.csv
index c35a628..c35a628 100644
--- a/src/cz/crcs/ectester/data/composite/varying/160/second/158.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/composite/varying/160/second/158.csv
diff --git a/src/cz/crcs/ectester/data/degenerate/brainpool.xml b/common/src/main/java/cz/crcs/ectester/data/degenerate/brainpool.xml
index 3dd2f54..3dd2f54 100644
--- a/src/cz/crcs/ectester/data/degenerate/brainpool.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/degenerate/brainpool.xml
diff --git a/src/cz/crcs/ectester/data/degenerate/cofactor.xml b/common/src/main/java/cz/crcs/ectester/data/degenerate/cofactor.xml
index 647515b..647515b 100644
--- a/src/cz/crcs/ectester/data/degenerate/cofactor.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/degenerate/cofactor.xml
diff --git a/src/cz/crcs/ectester/data/degenerate/keys.xml b/common/src/main/java/cz/crcs/ectester/data/degenerate/keys.xml
index 498cf26..498cf26 100644
--- a/src/cz/crcs/ectester/data/degenerate/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/degenerate/keys.xml
diff --git a/src/cz/crcs/ectester/data/degenerate/secg.xml b/common/src/main/java/cz/crcs/ectester/data/degenerate/secg.xml
index 2cf81e7..2cf81e7 100644
--- a/src/cz/crcs/ectester/data/degenerate/secg.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/degenerate/secg.xml
diff --git a/src/cz/crcs/ectester/data/gost/curves.xml b/common/src/main/java/cz/crcs/ectester/data/gost/curves.xml
index 2b83c5e..2b83c5e 100644
--- a/src/cz/crcs/ectester/data/gost/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/gost/curves.xml
diff --git a/src/cz/crcs/ectester/data/gost/gost256.csv b/common/src/main/java/cz/crcs/ectester/data/gost/gost256.csv
index baea45a..baea45a 100644
--- a/src/cz/crcs/ectester/data/gost/gost256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/gost/gost256.csv
diff --git a/src/cz/crcs/ectester/data/gost/gost512.csv b/common/src/main/java/cz/crcs/ectester/data/gost/gost512.csv
index 5b24d59..5b24d59 100644
--- a/src/cz/crcs/ectester/data/gost/gost512.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/gost/gost512.csv
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160r1.xml
index 7656432..7656432 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160t1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160t1.xml
index ffac676..ffac676 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160t1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP160t1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192r1.xml
index 4ceb20c..4ceb20c 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192t1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192t1.xml
index fe06dcf..fe06dcf 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192t1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP192t1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224r1.xml
index c708160..c708160 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224t1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224t1.xml
index c7ae75b..c7ae75b 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224t1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP224t1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256r1.xml
index 30343e6..30343e6 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256t1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256t1.xml
index 8b0a544..8b0a544 100644
--- a/src/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256t1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/brainpool/brainpoolP256t1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/keys.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/keys.xml
index d630129..d630129 100644
--- a/src/cz/crcs/ectester/data/invalid/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/keys.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/b163.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b163.xml
index e3df992..e3df992 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/b163.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b163.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/b233.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b233.xml
index f1ebb74..f1ebb74 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/b233.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b233.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/b283.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b283.xml
index b925891..b925891 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/b283.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/b283.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/k163.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k163.xml
index baa9ef5..baa9ef5 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/k163.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k163.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/k233.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k233.xml
index 250c9df..250c9df 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/k233.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k233.xml
diff --git a/src/cz/crcs/ectester/data/invalid/nist/k283.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k283.xml
index 38e3659..38e3659 100644
--- a/src/cz/crcs/ectester/data/invalid/nist/k283.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/nist/k283.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
index c93b236..c93b236 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
index 49f869a..49f869a 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
index e010003..e010003 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
index 1bf0e19..1bf0e19 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
index c0ac9f5..c0ac9f5 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
index 5a0afdc..5a0afdc 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
index 6ecf018..6ecf018 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
index 9ce561d..9ce561d 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
index 6a30210..6a30210 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
diff --git a/src/cz/crcs/ectester/data/misc/keys.xml b/common/src/main/java/cz/crcs/ectester/data/misc/keys.xml
index e17b45b..e17b45b 100644
--- a/src/cz/crcs/ectester/data/misc/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/misc/keys.xml
diff --git a/src/cz/crcs/ectester/data/misc/results.xml b/common/src/main/java/cz/crcs/ectester/data/misc/results.xml
index 07601b1..07601b1 100644
--- a/src/cz/crcs/ectester/data/misc/results.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/misc/results.xml
diff --git a/src/cz/crcs/ectester/data/mnt/curves.xml b/common/src/main/java/cz/crcs/ectester/data/mnt/curves.xml
index 0087a5a..0087a5a 100644
--- a/src/cz/crcs/ectester/data/mnt/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/curves.xml
diff --git a/src/cz/crcs/ectester/data/mnt/mnt1.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt1.csv
index 7ff5784..7ff5784 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt1.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt2_1.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt2_1.csv
index a53376f..a53376f 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt2_1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt2_1.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt2_2.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt2_2.csv
index 20dd8f4..20dd8f4 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt2_2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt2_2.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt3_1.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_1.csv
index d00719d..d00719d 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt3_1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_1.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt3_2.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_2.csv
index 86d8191..86d8191 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt3_2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_2.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt3_3.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_3.csv
index 348b30d..348b30d 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt3_3.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt3_3.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt4.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt4.csv
index ea5eaa1..ea5eaa1 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt4.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt4.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt5_1.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_1.csv
index 2fd1622..2fd1622 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt5_1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_1.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt5_2.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_2.csv
index 18ec3a5..18ec3a5 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt5_2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_2.csv
diff --git a/src/cz/crcs/ectester/data/mnt/mnt5_3.csv b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_3.csv
index 73fce1d..73fce1d 100644
--- a/src/cz/crcs/ectester/data/mnt/mnt5_3.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/mnt/mnt5_3.csv
diff --git a/src/cz/crcs/ectester/data/nist/b163.csv b/common/src/main/java/cz/crcs/ectester/data/nist/b163.csv
index 85b777b..85b777b 100644
--- a/src/cz/crcs/ectester/data/nist/b163.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/b163.csv
diff --git a/src/cz/crcs/ectester/data/nist/b233.csv b/common/src/main/java/cz/crcs/ectester/data/nist/b233.csv
index a9c2711..a9c2711 100644
--- a/src/cz/crcs/ectester/data/nist/b233.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/b233.csv
diff --git a/src/cz/crcs/ectester/data/nist/b283.csv b/common/src/main/java/cz/crcs/ectester/data/nist/b283.csv
index 06cc151..06cc151 100644
--- a/src/cz/crcs/ectester/data/nist/b283.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/b283.csv
diff --git a/src/cz/crcs/ectester/data/nist/b409.csv b/common/src/main/java/cz/crcs/ectester/data/nist/b409.csv
index 66523a7..66523a7 100644
--- a/src/cz/crcs/ectester/data/nist/b409.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/b409.csv
diff --git a/src/cz/crcs/ectester/data/nist/b571.csv b/common/src/main/java/cz/crcs/ectester/data/nist/b571.csv
index 7d824c4..7d824c4 100644
--- a/src/cz/crcs/ectester/data/nist/b571.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/b571.csv
diff --git a/src/cz/crcs/ectester/data/nist/curves.xml b/common/src/main/java/cz/crcs/ectester/data/nist/curves.xml
index 2abf72f..2abf72f 100644
--- a/src/cz/crcs/ectester/data/nist/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/curves.xml
diff --git a/src/cz/crcs/ectester/data/nist/k163.csv b/common/src/main/java/cz/crcs/ectester/data/nist/k163.csv
index e35fbda..e35fbda 100644
--- a/src/cz/crcs/ectester/data/nist/k163.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/k163.csv
diff --git a/src/cz/crcs/ectester/data/nist/k233.csv b/common/src/main/java/cz/crcs/ectester/data/nist/k233.csv
index a429d81..a429d81 100644
--- a/src/cz/crcs/ectester/data/nist/k233.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/k233.csv
diff --git a/src/cz/crcs/ectester/data/nist/k283.csv b/common/src/main/java/cz/crcs/ectester/data/nist/k283.csv
index 32dcc3e..32dcc3e 100644
--- a/src/cz/crcs/ectester/data/nist/k283.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/k283.csv
diff --git a/src/cz/crcs/ectester/data/nist/k409.csv b/common/src/main/java/cz/crcs/ectester/data/nist/k409.csv
index 119754a..119754a 100644
--- a/src/cz/crcs/ectester/data/nist/k409.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/k409.csv
diff --git a/src/cz/crcs/ectester/data/nist/k571.csv b/common/src/main/java/cz/crcs/ectester/data/nist/k571.csv
index 7fb1431..7fb1431 100644
--- a/src/cz/crcs/ectester/data/nist/k571.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/k571.csv
diff --git a/src/cz/crcs/ectester/data/nist/p192.csv b/common/src/main/java/cz/crcs/ectester/data/nist/p192.csv
index 07f9154..07f9154 100644
--- a/src/cz/crcs/ectester/data/nist/p192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/p192.csv
diff --git a/src/cz/crcs/ectester/data/nist/p224.csv b/common/src/main/java/cz/crcs/ectester/data/nist/p224.csv
index 4b206d4..4b206d4 100644
--- a/src/cz/crcs/ectester/data/nist/p224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/p224.csv
diff --git a/src/cz/crcs/ectester/data/nist/p256.csv b/common/src/main/java/cz/crcs/ectester/data/nist/p256.csv
index c5a2440..c5a2440 100644
--- a/src/cz/crcs/ectester/data/nist/p256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/p256.csv
diff --git a/src/cz/crcs/ectester/data/nist/p384.csv b/common/src/main/java/cz/crcs/ectester/data/nist/p384.csv
index eeba9fa..eeba9fa 100644
--- a/src/cz/crcs/ectester/data/nist/p384.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/p384.csv
diff --git a/src/cz/crcs/ectester/data/nist/p521.csv b/common/src/main/java/cz/crcs/ectester/data/nist/p521.csv
index 609672f..609672f 100644
--- a/src/cz/crcs/ectester/data/nist/p521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/nist/p521.csv
diff --git a/src/cz/crcs/ectester/data/other/curve25519.csv b/common/src/main/java/cz/crcs/ectester/data/other/curve25519.csv
index 2e62d80..2e62d80 100644
--- a/src/cz/crcs/ectester/data/other/curve25519.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/other/curve25519.csv
diff --git a/src/cz/crcs/ectester/data/other/curves.xml b/common/src/main/java/cz/crcs/ectester/data/other/curves.xml
index f200d9c..f200d9c 100644
--- a/src/cz/crcs/ectester/data/other/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/other/curves.xml
diff --git a/src/cz/crcs/ectester/data/other/m221.csv b/common/src/main/java/cz/crcs/ectester/data/other/m221.csv
index 0a74263..0a74263 100644
--- a/src/cz/crcs/ectester/data/other/m221.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/other/m221.csv
diff --git a/src/cz/crcs/ectester/data/other/m383.csv b/common/src/main/java/cz/crcs/ectester/data/other/m383.csv
index 9a8890d..9a8890d 100644
--- a/src/cz/crcs/ectester/data/other/m383.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/other/m383.csv
diff --git a/src/cz/crcs/ectester/data/other/m511.csv b/common/src/main/java/cz/crcs/ectester/data/other/m511.csv
index 815714c..815714c 100644
--- a/src/cz/crcs/ectester/data/other/m511.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/other/m511.csv
diff --git a/src/cz/crcs/ectester/data/schema.xsd b/common/src/main/java/cz/crcs/ectester/data/schema.xsd
index 99c9b76..99c9b76 100644
--- a/src/cz/crcs/ectester/data/schema.xsd
+++ b/common/src/main/java/cz/crcs/ectester/data/schema.xsd
diff --git a/src/cz/crcs/ectester/data/secg/curves.xml b/common/src/main/java/cz/crcs/ectester/data/secg/curves.xml
index c04fe38..c04fe38 100644
--- a/src/cz/crcs/ectester/data/secg/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/curves.xml
diff --git a/src/cz/crcs/ectester/data/secg/secp112r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp112r1.csv
index 00d64d6..00d64d6 100644
--- a/src/cz/crcs/ectester/data/secg/secp112r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp112r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp112r2.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp112r2.csv
index 0513e72..0513e72 100644
--- a/src/cz/crcs/ectester/data/secg/secp112r2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp112r2.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp128r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp128r1.csv
index eea5fed..eea5fed 100644
--- a/src/cz/crcs/ectester/data/secg/secp128r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp128r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp128r2.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp128r2.csv
index 6f2d098..6f2d098 100644
--- a/src/cz/crcs/ectester/data/secg/secp128r2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp128r2.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp160k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp160k1.csv
index 7d14c99..7d14c99 100644
--- a/src/cz/crcs/ectester/data/secg/secp160k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp160k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp160r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp160r1.csv
index ed37d81..ed37d81 100644
--- a/src/cz/crcs/ectester/data/secg/secp160r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp160r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp160r2.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp160r2.csv
index 2121fc1..2121fc1 100644
--- a/src/cz/crcs/ectester/data/secg/secp160r2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp160r2.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp192k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp192k1.csv
index 550093b..550093b 100644
--- a/src/cz/crcs/ectester/data/secg/secp192k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp192k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp192r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp192r1.csv
index 07f9154..07f9154 100644
--- a/src/cz/crcs/ectester/data/secg/secp192r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp192r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp224r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp224r1.csv
index 4b206d4..4b206d4 100644
--- a/src/cz/crcs/ectester/data/secg/secp224r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp224r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp256k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp256k1.csv
index 7835afc..7835afc 100644
--- a/src/cz/crcs/ectester/data/secg/secp256k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp256k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp256r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp256r1.csv
index c5a2440..c5a2440 100644
--- a/src/cz/crcs/ectester/data/secg/secp256r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp256r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp384r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp384r1.csv
index eeba9fa..eeba9fa 100644
--- a/src/cz/crcs/ectester/data/secg/secp384r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp384r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/secp521r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/secp521r1.csv
index 609672f..609672f 100644
--- a/src/cz/crcs/ectester/data/secg/secp521r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/secp521r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect163k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect163k1.csv
index e35fbda..e35fbda 100644
--- a/src/cz/crcs/ectester/data/secg/sect163k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect163k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect163r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect163r1.csv
index fa7a328..fa7a328 100644
--- a/src/cz/crcs/ectester/data/secg/sect163r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect163r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect163r2.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect163r2.csv
index 85b777b..85b777b 100644
--- a/src/cz/crcs/ectester/data/secg/sect163r2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect163r2.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect233k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect233k1.csv
index a429d81..a429d81 100644
--- a/src/cz/crcs/ectester/data/secg/sect233k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect233k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect233r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect233r1.csv
index faba42b..faba42b 100644
--- a/src/cz/crcs/ectester/data/secg/sect233r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect233r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect239k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect239k1.csv
index 8b2e58a..8b2e58a 100644
--- a/src/cz/crcs/ectester/data/secg/sect239k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect239k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect283k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect283k1.csv
index 9a3a8f6..9a3a8f6 100644
--- a/src/cz/crcs/ectester/data/secg/sect283k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect283k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect283r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect283r1.csv
index 68c17f6..68c17f6 100644
--- a/src/cz/crcs/ectester/data/secg/sect283r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect283r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect409k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect409k1.csv
index e39e076..e39e076 100644
--- a/src/cz/crcs/ectester/data/secg/sect409k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect409k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect409r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect409r1.csv
index 727fb25..727fb25 100644
--- a/src/cz/crcs/ectester/data/secg/sect409r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect409r1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect571k1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect571k1.csv
index 0c94778..0c94778 100644
--- a/src/cz/crcs/ectester/data/secg/sect571k1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect571k1.csv
diff --git a/src/cz/crcs/ectester/data/secg/sect571r1.csv b/common/src/main/java/cz/crcs/ectester/data/secg/sect571r1.csv
index 739cbb0..739cbb0 100644
--- a/src/cz/crcs/ectester/data/secg/sect571r1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/secg/sect571r1.csv
diff --git a/src/cz/crcs/ectester/data/supersingular/curves.xml b/common/src/main/java/cz/crcs/ectester/data/supersingular/curves.xml
index 186a8a7..186a8a7 100644
--- a/src/cz/crcs/ectester/data/supersingular/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/supersingular/curves.xml
diff --git a/src/cz/crcs/ectester/data/supersingular/ss128.csv b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss128.csv
index 9dd4f13..9dd4f13 100644
--- a/src/cz/crcs/ectester/data/supersingular/ss128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss128.csv
diff --git a/src/cz/crcs/ectester/data/supersingular/ss192.csv b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss192.csv
index 0c8ae8b..0c8ae8b 100644
--- a/src/cz/crcs/ectester/data/supersingular/ss192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss192.csv
diff --git a/src/cz/crcs/ectester/data/supersingular/ss224.csv b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss224.csv
index 01eaa35..01eaa35 100644
--- a/src/cz/crcs/ectester/data/supersingular/ss224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss224.csv
diff --git a/src/cz/crcs/ectester/data/supersingular/ss256.csv b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss256.csv
index 47a8174..47a8174 100644
--- a/src/cz/crcs/ectester/data/supersingular/ss256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/supersingular/ss256.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-raw.csv
index 36c396a..36c396a 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-sha1.csv
index f9abc47..f9abc47 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyA.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyA.csv
index a2f0525..a2f0525 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyA.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyA.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyB.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyB.csv
index b397506..b397506 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyB.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP224r1-keyB.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-raw.csv
index 1d7ab37..1d7ab37 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-sha1.csv
index 45a851b..45a851b 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyA.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyA.csv
index 597d3fe..597d3fe 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyA.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyA.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyB.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyB.csv
index 110f6b5..110f6b5 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyB.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP256r1-keyB.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-raw.csv
index 392d962..392d962 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-sha1.csv
index b293a59..b293a59 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyA.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyA.csv
index 6746753..6746753 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyA.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyA.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyB.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyB.csv
index 83289fd..83289fd 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyB.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP384r1-keyB.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-raw.csv
index fe6c294..fe6c294 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-sha1.csv
index ff8d321..ff8d321 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyA.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyA.csv
index 3648a36..3648a36 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyA.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyA.csv
diff --git a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyB.csv b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyB.csv
index 9684984..9684984 100644
--- a/src/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyB.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/brainpool/brainpoolP512r1-keyB.csv
diff --git a/src/cz/crcs/ectester/data/test/keys.xml b/common/src/main/java/cz/crcs/ectester/data/test/keys.xml
index 380aef1..380aef1 100644
--- a/src/cz/crcs/ectester/data/test/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/test/keys.xml
diff --git a/src/cz/crcs/ectester/data/test/nist/b163-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-dhc-raw.csv
index 25233c1..25233c1 100644
--- a/src/cz/crcs/ectester/data/test/nist/b163-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b163-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-dhc-sha1.csv
index 0ad84c1..0ad84c1 100644
--- a/src/cz/crcs/ectester/data/test/nist/b163-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b163-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-keyCAVS.csv
index 4d85a19..4d85a19 100644
--- a/src/cz/crcs/ectester/data/test/nist/b163-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b163-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-keyIUT.csv
index e56e6c4..e56e6c4 100644
--- a/src/cz/crcs/ectester/data/test/nist/b163-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b163-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b233-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-dhc-raw.csv
index 5e703be..5e703be 100644
--- a/src/cz/crcs/ectester/data/test/nist/b233-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b233-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-dhc-sha1.csv
index 8c6886f..8c6886f 100644
--- a/src/cz/crcs/ectester/data/test/nist/b233-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b233-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-keyCAVS.csv
index 591bfe1..591bfe1 100644
--- a/src/cz/crcs/ectester/data/test/nist/b233-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b233-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-keyIUT.csv
index eb7b5e6..eb7b5e6 100644
--- a/src/cz/crcs/ectester/data/test/nist/b233-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b233-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b283-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-dhc-raw.csv
index 6bc719a..6bc719a 100644
--- a/src/cz/crcs/ectester/data/test/nist/b283-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b283-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-dhc-sha1.csv
index 6980f80..6980f80 100644
--- a/src/cz/crcs/ectester/data/test/nist/b283-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b283-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-keyCAVS.csv
index 52b33fc..52b33fc 100644
--- a/src/cz/crcs/ectester/data/test/nist/b283-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b283-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-keyIUT.csv
index 8d2d534..8d2d534 100644
--- a/src/cz/crcs/ectester/data/test/nist/b283-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b283-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b409-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-dhc-raw.csv
index f84d029..f84d029 100644
--- a/src/cz/crcs/ectester/data/test/nist/b409-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b409-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-dhc-sha1.csv
index f6db38b..f6db38b 100644
--- a/src/cz/crcs/ectester/data/test/nist/b409-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b409-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-keyCAVS.csv
index cecb5f3..cecb5f3 100644
--- a/src/cz/crcs/ectester/data/test/nist/b409-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b409-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-keyIUT.csv
index 066d220..066d220 100644
--- a/src/cz/crcs/ectester/data/test/nist/b409-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b409-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b571-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-dhc-raw.csv
index ffef41d..ffef41d 100644
--- a/src/cz/crcs/ectester/data/test/nist/b571-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b571-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-dhc-sha1.csv
index d75a7ff..d75a7ff 100644
--- a/src/cz/crcs/ectester/data/test/nist/b571-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b571-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-keyCAVS.csv
index 20b1816..20b1816 100644
--- a/src/cz/crcs/ectester/data/test/nist/b571-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/b571-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-keyIUT.csv
index 8e3973d..8e3973d 100644
--- a/src/cz/crcs/ectester/data/test/nist/b571-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/b571-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k163-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-dhc-raw.csv
index 5001502..5001502 100644
--- a/src/cz/crcs/ectester/data/test/nist/k163-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k163-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-dhc-sha1.csv
index e03aa60..e03aa60 100644
--- a/src/cz/crcs/ectester/data/test/nist/k163-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k163-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-keyCAVS.csv
index 6f03652..6f03652 100644
--- a/src/cz/crcs/ectester/data/test/nist/k163-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k163-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-keyIUT.csv
index b34189e..b34189e 100644
--- a/src/cz/crcs/ectester/data/test/nist/k163-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k163-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k233-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-dhc-raw.csv
index 03193ae..03193ae 100644
--- a/src/cz/crcs/ectester/data/test/nist/k233-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k233-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-dhc-sha1.csv
index c6c68ac..c6c68ac 100644
--- a/src/cz/crcs/ectester/data/test/nist/k233-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k233-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-keyCAVS.csv
index 7c60338..7c60338 100644
--- a/src/cz/crcs/ectester/data/test/nist/k233-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k233-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-keyIUT.csv
index d8cc078..d8cc078 100644
--- a/src/cz/crcs/ectester/data/test/nist/k233-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k233-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k283-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-dhc-raw.csv
index 0e14373..0e14373 100644
--- a/src/cz/crcs/ectester/data/test/nist/k283-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k283-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-dhc-sha1.csv
index 6852d2f..6852d2f 100644
--- a/src/cz/crcs/ectester/data/test/nist/k283-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k283-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-keyCAVS.csv
index f91e05a..f91e05a 100644
--- a/src/cz/crcs/ectester/data/test/nist/k283-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k283-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-keyIUT.csv
index 2b19347..2b19347 100644
--- a/src/cz/crcs/ectester/data/test/nist/k283-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k283-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k409-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-dhc-raw.csv
index f02c0dd..f02c0dd 100644
--- a/src/cz/crcs/ectester/data/test/nist/k409-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k409-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-dhc-sha1.csv
index f4f5cdc..f4f5cdc 100644
--- a/src/cz/crcs/ectester/data/test/nist/k409-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k409-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-keyCAVS.csv
index cc40c76..cc40c76 100644
--- a/src/cz/crcs/ectester/data/test/nist/k409-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k409-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-keyIUT.csv
index e8d0c97..e8d0c97 100644
--- a/src/cz/crcs/ectester/data/test/nist/k409-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k409-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k571-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-dhc-raw.csv
index eca4a7b..eca4a7b 100644
--- a/src/cz/crcs/ectester/data/test/nist/k571-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k571-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-dhc-sha1.csv
index 938ba18..938ba18 100644
--- a/src/cz/crcs/ectester/data/test/nist/k571-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k571-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-keyCAVS.csv
index 71d1e64..71d1e64 100644
--- a/src/cz/crcs/ectester/data/test/nist/k571-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/k571-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-keyIUT.csv
index 6222122..6222122 100644
--- a/src/cz/crcs/ectester/data/test/nist/k571-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/k571-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p192-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-dhc-raw.csv
index 4f139f7..4f139f7 100644
--- a/src/cz/crcs/ectester/data/test/nist/p192-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p192-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-dhc-sha1.csv
index f3e01bf..f3e01bf 100644
--- a/src/cz/crcs/ectester/data/test/nist/p192-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p192-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-keyCAVS.csv
index d8a3fab..d8a3fab 100644
--- a/src/cz/crcs/ectester/data/test/nist/p192-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p192-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-keyIUT.csv
index fb58f03..fb58f03 100644
--- a/src/cz/crcs/ectester/data/test/nist/p192-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p192-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p224-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-dhc-raw.csv
index 5a3bb67..5a3bb67 100644
--- a/src/cz/crcs/ectester/data/test/nist/p224-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p224-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-dhc-sha1.csv
index 8e0e8ec..8e0e8ec 100644
--- a/src/cz/crcs/ectester/data/test/nist/p224-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p224-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-keyCAVS.csv
index 183d654..183d654 100644
--- a/src/cz/crcs/ectester/data/test/nist/p224-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p224-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-keyIUT.csv
index 24b992b..24b992b 100644
--- a/src/cz/crcs/ectester/data/test/nist/p224-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p224-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p256-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-dhc-raw.csv
index cd8291f..cd8291f 100644
--- a/src/cz/crcs/ectester/data/test/nist/p256-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p256-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-dhc-sha1.csv
index 021f92b..021f92b 100644
--- a/src/cz/crcs/ectester/data/test/nist/p256-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p256-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-keyCAVS.csv
index e7b0176..e7b0176 100644
--- a/src/cz/crcs/ectester/data/test/nist/p256-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p256-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-keyIUT.csv
index 0df2f99..0df2f99 100644
--- a/src/cz/crcs/ectester/data/test/nist/p256-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p256-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p384-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-dhc-raw.csv
index 725e299..725e299 100644
--- a/src/cz/crcs/ectester/data/test/nist/p384-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p384-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-dhc-sha1.csv
index 765e6de..765e6de 100644
--- a/src/cz/crcs/ectester/data/test/nist/p384-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p384-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-keyCAVS.csv
index 64c6328..64c6328 100644
--- a/src/cz/crcs/ectester/data/test/nist/p384-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p384-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-keyIUT.csv
index 65cf43d..65cf43d 100644
--- a/src/cz/crcs/ectester/data/test/nist/p384-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p384-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p521-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-dhc-raw.csv
index 6467649..6467649 100644
--- a/src/cz/crcs/ectester/data/test/nist/p521-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p521-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-dhc-sha1.csv
index 2f4f557..2f4f557 100644
--- a/src/cz/crcs/ectester/data/test/nist/p521-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p521-keyCAVS.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-keyCAVS.csv
index c00148e..c00148e 100644
--- a/src/cz/crcs/ectester/data/test/nist/p521-keyCAVS.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-keyCAVS.csv
diff --git a/src/cz/crcs/ectester/data/test/nist/p521-keyIUT.csv b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-keyIUT.csv
index b36b3b6..b36b3b6 100644
--- a/src/cz/crcs/ectester/data/test/nist/p521-keyIUT.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/nist/p521-keyIUT.csv
diff --git a/src/cz/crcs/ectester/data/test/results.xml b/common/src/main/java/cz/crcs/ectester/data/test/results.xml
index fa43e4b..fa43e4b 100644
--- a/src/cz/crcs/ectester/data/test/results.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/test/results.xml
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv
index eb56e26..eb56e26 100644
--- a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-kdf.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv
index c246c32..c246c32 100644
--- a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv
index d83d932..d83d932 100644
--- a/src/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv
index dcbe885..dcbe885 100644
--- a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-keyU.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv
index 59aacda..59aacda 100644
--- a/src/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/secp160r1-keyV.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-kdf.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-kdf.csv
index 06a416f..06a416f 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-kdf.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-kdf.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-raw.csv
index 94eacd8..94eacd8 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-sha1.csv
index 651b80c..651b80c 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dh-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dh-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-kdf.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-kdf.csv
index c234f31..c234f31 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-kdf.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-kdf.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-raw.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-raw.csv
index 46a0a0f..46a0a0f 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-raw.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-raw.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-sha1.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-sha1.csv
index 4839c25..4839c25 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-dhc-sha1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-dhc-sha1.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-keyU.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-keyU.csv
index b516f3b..b516f3b 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-keyU.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-keyU.csv
diff --git a/src/cz/crcs/ectester/data/test/secg/sect163k1-keyV.csv b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-keyV.csv
index 00ab019..00ab019 100644
--- a/src/cz/crcs/ectester/data/test/secg/sect163k1-keyV.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/test/secg/sect163k1-keyV.csv
diff --git a/src/cz/crcs/ectester/data/twist/cofactor/cofactor128p4.xml b/common/src/main/java/cz/crcs/ectester/data/twist/cofactor/cofactor128p4.xml
index b558f8e..b558f8e 100644
--- a/src/cz/crcs/ectester/data/twist/cofactor/cofactor128p4.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/cofactor/cofactor128p4.xml
diff --git a/src/cz/crcs/ectester/data/twist/cofactor/cofactor160p4.xml b/common/src/main/java/cz/crcs/ectester/data/twist/cofactor/cofactor160p4.xml
index bb712af..bb712af 100644
--- a/src/cz/crcs/ectester/data/twist/cofactor/cofactor160p4.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/cofactor/cofactor160p4.xml
diff --git a/src/cz/crcs/ectester/data/twist/keys.xml b/common/src/main/java/cz/crcs/ectester/data/twist/keys.xml
index 3292004..3292004 100644
--- a/src/cz/crcs/ectester/data/twist/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/keys.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/b163.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b163.xml
index 03690ac..03690ac 100644
--- a/src/cz/crcs/ectester/data/twist/nist/b163.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b163.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/b233.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b233.xml
index 7a0b579..7a0b579 100644
--- a/src/cz/crcs/ectester/data/twist/nist/b233.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b233.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/b283.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b283.xml
index 7f57585..7f57585 100644
--- a/src/cz/crcs/ectester/data/twist/nist/b283.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/b283.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/k163.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k163.xml
index 31040c0..31040c0 100644
--- a/src/cz/crcs/ectester/data/twist/nist/k163.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k163.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/k233.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k233.xml
index 6354ff9..6354ff9 100644
--- a/src/cz/crcs/ectester/data/twist/nist/k233.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k233.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/k283.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k283.xml
index 48a2dd9..48a2dd9 100644
--- a/src/cz/crcs/ectester/data/twist/nist/k283.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/k283.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/p192.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p192.xml
index d1fdf49..d1fdf49 100644
--- a/src/cz/crcs/ectester/data/twist/nist/p192.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p192.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/p224.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p224.xml
index 3ae34ff..3ae34ff 100644
--- a/src/cz/crcs/ectester/data/twist/nist/p224.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p224.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/p256.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p256.xml
index 2e1c55e..2e1c55e 100644
--- a/src/cz/crcs/ectester/data/twist/nist/p256.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p256.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/p384.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p384.xml
index 8e0d2b6..8e0d2b6 100644
--- a/src/cz/crcs/ectester/data/twist/nist/p384.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p384.xml
diff --git a/src/cz/crcs/ectester/data/twist/nist/p521.xml b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p521.xml
index 1564c80..1564c80 100644
--- a/src/cz/crcs/ectester/data/twist/nist/p521.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/nist/p521.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp112r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp112r1.xml
index bea215a..bea215a 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp112r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp112r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp112r2.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp112r2.xml
index f1d0fee..f1d0fee 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp112r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp112r2.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp128r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp128r1.xml
index e9bf07b..e9bf07b 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp128r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp128r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp128r2.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp128r2.xml
index fdd9028..fdd9028 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp128r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp128r2.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp160k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160k1.xml
index 8d1cc53..8d1cc53 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp160k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp160r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160r1.xml
index dece980..dece980 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp160r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp160r2.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160r2.xml
index bdb8a03..bdb8a03 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp160r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp160r2.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp192k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp192k1.xml
index 457a414..457a414 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp192k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp192k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp192r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp192r1.xml
index 16ba7db..16ba7db 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp192r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp192r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp224r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp224r1.xml
index ee6782e..ee6782e 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp224r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp224r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp256k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp256k1.xml
index 467641e..467641e 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp256k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp256k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp256r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp256r1.xml
index b385548..b385548 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp256r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp256r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp384r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp384r1.xml
index 2ddbe9b..2ddbe9b 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp384r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp384r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/secp521r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp521r1.xml
index 105efa3..105efa3 100644
--- a/src/cz/crcs/ectester/data/twist/secg/secp521r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/secp521r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect163k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163k1.xml
index 754e8e6..754e8e6 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect163k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect163r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163r1.xml
index dd7d798..dd7d798 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect163r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect163r2.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163r2.xml
index 421887d..421887d 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect163r2.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect163r2.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect233k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect233k1.xml
index cf8524c..cf8524c 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect233k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect233k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect233r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect233r1.xml
index 45eecf4..45eecf4 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect233r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect233r1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect239k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect239k1.xml
index bc17d4f..bc17d4f 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect239k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect239k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect283k1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect283k1.xml
index 65ecb63..65ecb63 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect283k1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect283k1.xml
diff --git a/src/cz/crcs/ectester/data/twist/secg/sect283r1.xml b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect283r1.xml
index e2913a0..e2913a0 100644
--- a/src/cz/crcs/ectester/data/twist/secg/sect283r1.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/twist/secg/sect283r1.xml
diff --git a/src/cz/crcs/ectester/data/wrong/curves.xml b/common/src/main/java/cz/crcs/ectester/data/wrong/curves.xml
index 2a51474..2a51474 100644
--- a/src/cz/crcs/ectester/data/wrong/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/curves.xml
diff --git a/src/cz/crcs/ectester/data/wrong/keys.xml b/common/src/main/java/cz/crcs/ectester/data/wrong/keys.xml
index 4be8b4d..4be8b4d 100644
--- a/src/cz/crcs/ectester/data/wrong/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/keys.xml
diff --git a/src/cz/crcs/ectester/data/wrong/results.xml b/common/src/main/java/cz/crcs/ectester/data/wrong/results.xml
index e3f0967..e3f0967 100644
--- a/src/cz/crcs/ectester/data/wrong/results.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/results.xml
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp128.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp128.csv
index d24da0e..d24da0e 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp128.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp128.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp160.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp160.csv
index 20dea88..20dea88 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp160.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp160.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp192.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp192.csv
index 7d2241c..7d2241c 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp192.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp192.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp224.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp224.csv
index aeaaae4..aeaaae4 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp224.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp224.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp256.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp256.csv
index 6902618..6902618 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp256.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp256.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp384.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp384.csv
index 694ae78..694ae78 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp384.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp384.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongp521.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp521.csv
index 76fe2f2..76fe2f2 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongp521.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongp521.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt163.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt163.csv
index 88b142e..88b142e 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt163.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt163.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt233.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt233.csv
index 291cdfe..291cdfe 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt233.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt233.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt239.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt239.csv
index bef2e14..bef2e14 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt239.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt239.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt283.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt283.csv
index 736fe15..736fe15 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt283.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt283.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt409.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt409.csv
index fe7e040..fe7e040 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt409.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt409.csv
diff --git a/src/cz/crcs/ectester/data/wrong/wrongt571.csv b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt571.csv
index 2fcd0df..2fcd0df 100644
--- a/src/cz/crcs/ectester/data/wrong/wrongt571.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/wrong/wrongt571.csv
diff --git a/src/cz/crcs/ectester/data/wycheproof/keys.xml b/common/src/main/java/cz/crcs/ectester/data/wycheproof/keys.xml
index ee7280c..ee7280c 100644
--- a/src/cz/crcs/ectester/data/wycheproof/keys.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/wycheproof/keys.xml
diff --git a/src/cz/crcs/ectester/data/wycheproof/results.xml b/common/src/main/java/cz/crcs/ectester/data/wycheproof/results.xml
index 094043c..094043c 100644
--- a/src/cz/crcs/ectester/data/wycheproof/results.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/wycheproof/results.xml
diff --git a/src/cz/crcs/ectester/data/x962/curves.xml b/common/src/main/java/cz/crcs/ectester/data/x962/curves.xml
index eee64ad..eee64ad 100644
--- a/src/cz/crcs/ectester/data/x962/curves.xml
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/curves.xml
diff --git a/src/cz/crcs/ectester/data/x962/prime192v1.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v1.csv
index 07f9154..07f9154 100644
--- a/src/cz/crcs/ectester/data/x962/prime192v1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v1.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime192v2.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v2.csv
index ee6f1a2..ee6f1a2 100644
--- a/src/cz/crcs/ectester/data/x962/prime192v2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v2.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime192v3.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v3.csv
index f80fd5b..f80fd5b 100644
--- a/src/cz/crcs/ectester/data/x962/prime192v3.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime192v3.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime239v1.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v1.csv
index c9d704b..c9d704b 100644
--- a/src/cz/crcs/ectester/data/x962/prime239v1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v1.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime239v2.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v2.csv
index 100e60b..100e60b 100644
--- a/src/cz/crcs/ectester/data/x962/prime239v2.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v2.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime239v3.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v3.csv
index ce8b38a..ce8b38a 100644
--- a/src/cz/crcs/ectester/data/x962/prime239v3.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime239v3.csv
diff --git a/src/cz/crcs/ectester/data/x962/prime256v1.csv b/common/src/main/java/cz/crcs/ectester/data/x962/prime256v1.csv
index c5a2440..c5a2440 100644
--- a/src/cz/crcs/ectester/data/x962/prime256v1.csv
+++ b/common/src/main/java/cz/crcs/ectester/data/x962/prime256v1.csv