removed newlines, changed f2m format, removed old SimpleAPDU

data:
 - now truly csv
 - f2m format now:
   m,e_1,e_2,e_3,a,b,gx,gy,r,k,wx,wy,s

reader:
 - removed SimpleAPDU
 - changed f2m format

applet:
 - changed f2m format

29 files changed, 103 insertions, 98 deletions

diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv
new file mode 100644
index 0000000..859424e
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.csv
@@ -0,0 +1 @@
+E95E4A5F737059DC60DFC7AD95B3D8139515620F,340E7BE2A280EB74E2BE61BADA745D97E8F7C300,1E589A8595423412134FAA2DBDEC95C8D8675E58,BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3,1667CB477A1A8EC338F94741669C976316DA6321,E95E4A5F737059DC60DF5991D45029409E60FC09,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.txt
deleted file mode 100644
index 69abf52..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP160r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-E95E4A5F737059DC60DFC7AD95B3D8139515620F,
-340E7BE2A280EB74E2BE61BADA745D97E8F7C300,
-1E589A8595423412134FAA2DBDEC95C8D8675E58,
-BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3,
-1667CB477A1A8EC338F94741669C976316DA6321,
-E95E4A5F737059DC60DF5991D45029409E60FC09,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv
new file mode 100644
index 0000000..7e2f428
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.csv
@@ -0,0 +1 @@
+24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B,E95E4A5F737059DC60DFC7AD95B3D8139515620C,7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380,B199B13B9B34EFC1397E64BAEB05ACC265FF2378,ADD6718B7C7C1961F0991B842443772152C9E0AD,E95E4A5F737059DC60DF5991D45029409E60FC09,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.txt
deleted file mode 100644
index fadafdf..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP160t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B,
-E95E4A5F737059DC60DFC7AD95B3D8139515620C,
-7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380,
-B199B13B9B34EFC1397E64BAEB05ACC265FF2378,
-ADD6718B7C7C1961F0991B842443772152C9E0AD,
-E95E4A5F737059DC60DF5991D45029409E60FC09,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv
new file mode 100644
index 0000000..c4f1999
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.csv
@@ -0,0 +1 @@
+C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297,6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF,469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9,C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6,14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F,C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.txt
deleted file mode 100644
index 3e6bed8..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP192r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297,
-6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF,
-469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9,
-C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6,
-14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F,
-C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv
new file mode 100644
index 0000000..8236331
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.csv
@@ -0,0 +1 @@
+1B6F5CC8DB4DC7AF19458A9CB80DC2295E5EB9C3732104CB,C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294,13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79,3AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129,97E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9,C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.txt
deleted file mode 100644
index cd52697..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP192t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-1B6F5CC8DB4DC7AF19458A9CB80DC2295E5EB9C3732104CB,
-C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294,
-13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79,
-3AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129,
-97E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9,
-C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv
new file mode 100644
index 0000000..6839e31
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.csv
@@ -0,0 +1 @@
+D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF,68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43,2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B,D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D,58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD,D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.txt
deleted file mode 100644
index 12e536c..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP224r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF,
-68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43,
-2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B,
-D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D,
-58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD,
-D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv
new file mode 100644
index 0000000..480f7c2
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.csv
@@ -0,0 +1 @@
+2DF271E14427A346910CF7A2E6CFA7B3F484E5C2CCE1C8B730E28B3F,D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC,4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D,6AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D580,374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C,D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.txt
deleted file mode 100644
index 522d09e..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP224t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-2DF271E14427A346910CF7A2E6CFA7B3F484E5C2CCE1C8B730E28B3F,
-D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC,
-4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D,
-6AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D580,
-374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C,
-D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv
new file mode 100644
index 0000000..f30cf91
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.csv
@@ -0,0 +1 @@
+A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377,7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9,26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6,8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262,547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997,A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.txt
deleted file mode 100644
index e0e50ad..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP256r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377,
-7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9,
-26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6,
-8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262,
-547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997,
-A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv
new file mode 100644
index 0000000..7070064
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.csv
@@ -0,0 +1 @@
+3E2D4BD9597B58639AE7AA669CAB9837CF5CF20A2C852D10F655668DFC150EF0,A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374,662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04,A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4,2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE,A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.txt
deleted file mode 100644
index f5bb2d6..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP256t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-3E2D4BD9597B58639AE7AA669CAB9837CF5CF20A2C852D10F655668DFC150EF0,
-A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374,
-662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04,
-A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4,
-2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE,
-A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv
new file mode 100644
index 0000000..128cfb0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.csv
@@ -0,0 +1 @@
+D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27,3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4,520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6,43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611,14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1,D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.txt
deleted file mode 100644
index 474fa9d..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP320r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27,
-3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4,
-520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6,
-43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611,
-14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1,
-D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv
new file mode 100644
index 0000000..6d776de
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.csv
@@ -0,0 +1 @@
+15F75CAF668077F7E85B42EB01F0A81FF56ECD6191D55CB82B7D861458A18FEFC3E5AB7496F3C7B1,D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E24,A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353,925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED52,63BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3,D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.txt
deleted file mode 100644
index d92d52b..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP320t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-15F75CAF668077F7E85B42EB01F0A81FF56ECD6191D55CB82B7D861458A18FEFC3E5AB7496F3C7B1,
-D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E24,
-A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353,
-925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED52,
-63BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3,
-D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv
new file mode 100644
index 0000000..9b333f0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.csv
@@ -0,0 +1 @@
+8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53,7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826,4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11,1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E,8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315,8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.txt
deleted file mode 100644
index 34ed1fc..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP384r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53,
-7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826,
-4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11,
-1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E,
-8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315,
-8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv
new file mode 100644
index 0000000..60c4ffb
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.csv
@@ -0,0 +1 @@
+41DFE8DD399331F7166A66076734A89CD0D2BCDB7D068E44E1F378F41ECBAE97D2D63DBC87BCCDDCCC5DA39E8589291C,8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC50,7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE,18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC,25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928,8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.txt
deleted file mode 100644
index 6bb42c9..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP384t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-41DFE8DD399331F7166A66076734A89CD0D2BCDB7D068E44E1F378F41ECBAE97D2D63DBC87BCCDDCCC5DA39E8589291C,
-8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC50,
-7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE,
-18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC,
-25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928,
-8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv
new file mode 100644
index 0000000..0c2f051
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.csv
@@ -0,0 +1 @@
+AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3,7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA,3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723,81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822,7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892,AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.txt
deleted file mode 100644
index 39e205e..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP512r1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3,
-7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA,
-3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723,
-81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822,
-7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892,
-AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv b/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv
new file mode 100644
index 0000000..1274943
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.csv
@@ -0,0 +1 @@
+12EE58E6764838B69782136F0F2D3BA06E27695716054092E60A80BEDB212B64E585D90BCE13761F85C3F1D2A64E3BE8FEA2220F01EBA5EEB0F35DBD29D922AB,AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0,7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E,640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA,5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332,AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069,1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.txt b/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.txt
deleted file mode 100644
index 288c2c1..0000000
--- a/src/cz/crcs/ectester/data/brainpool/brainpoolP512t1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-12EE58E6764838B69782136F0F2D3BA06E27695716054092E60A80BEDB212B64E585D90BCE13761F85C3F1D2A64E3BE8FEA2220F01EBA5EEB0F35DBD29D922AB,
-AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0,
-7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E,
-640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA,
-5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332,
-AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069,
-1
diff --git a/src/cz/crcs/ectester/data/brainpool/curves.xml b/src/cz/crcs/ectester/data/brainpool/curves.xml
new file mode 100644
index 0000000..0395ba1
--- /dev/null
+++ b/src/cz/crcs/ectester/data/brainpool/curves.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<curves xmlns="http://crcs.cz/ectester/curves"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://crcs.cz/ectester/curves ../schema.xsd">
+    <curve>
+        <id>brainpoolP160r1</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>brainpoolP160r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP160t1</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>brainpoolP160t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP192r1</id>
+        <bits>192</bits>
+        <field>prime</field>
+        <file>brainpoolP192r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP192t1</id>
+        <bits>192</bits>
+        <field>prime</field>
+        <file>brainpoolP192t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP224r1</id>
+        <bits>224</bits>
+        <field>prime</field>
+        <file>brainpoolP224r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP224t1</id>
+        <bits>224</bits>
+        <field>prime</field>
+        <file>brainpoolP224t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP256r1</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>brainpoolP256r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP256t1</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>brainpoolP256t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP320r1</id>
+        <bits>320</bits>
+        <field>prime</field>
+        <file>brainpoolP320r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP320t1</id>
+        <bits>320</bits>
+        <field>prime</field>
+        <file>brainpoolP320t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP384r1</id>
+        <bits>384</bits>
+        <field>prime</field>
+        <file>brainpoolP384r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP384t1</id>
+        <bits>384</bits>
+        <field>prime</field>
+        <file>brainpoolP384t1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP512r1</id>
+        <bits>512</bits>
+        <field>prime</field>
+        <file>brainpoolP512r1.csv</file>
+    </curve>
+    <curve>
+        <id>brainpoolP512t1</id>
+        <bits>512</bits>
+        <field>prime</field>
+        <file>brainpoolP512t1.csv</file>
+    </curve>
+</curves>
\ No newline at end of file