7 files changed, 39 insertions, 0 deletions

diff --git a/dist/ECTester.jar b/dist/ECTester.jar
index d672e37..5544cfd 100644
--- a/dist/ECTester.jar
+++ b/dist/ECTester.jar
diff --git a/src/cz/crcs/ectester/data/anssi/curves.xml b/src/cz/crcs/ectester/data/anssi/curves.xml
new file mode 100644
index 0000000..0456e67
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anssi/curves.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../schema.xsd">
+    <curve>
+        <id>FRP256v1</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>frp256v1.csv</file>
+    </curve>
+</curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/anssi/frp256v1.csv b/src/cz/crcs/ectester/data/anssi/frp256v1.csv
new file mode 100644
index 0000000..3e5428d
--- /dev/null
+++ b/src/cz/crcs/ectester/data/anssi/frp256v1.csv
@@ -0,0 +1 @@
+0xf1fd178c0b3ad58f10126de8ce42435b3961adbcabc8ca6de8fcf353d86e9c03,0xf1fd178c0b3ad58f10126de8ce42435b3961adbcabc8ca6de8fcf353d86e9c00,0xee353fca5428a9300d4aba754a44c00fdfec0c9ae4b1a1803075ed967b7bb73f,0xb6b3d4c356c139eb31183d4749d423958c27d2dcaf98b70164c97a2dd98f5cff,0x6142e0f7c8b204911f9271f0f3ecef8c2701c307e8e4c9e183115a1554062cfb,0xf1fd178c0b3ad58f10126de8ce42435b53dc67e140d2bf941ffdd459c6d655e1,0x1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/categories.xml b/src/cz/crcs/ectester/data/categories.xml
index 29dcba0..c53a7c0 100644
--- a/src/cz/crcs/ectester/data/categories.xml
+++ b/src/cz/crcs/ectester/data/categories.xml
@@ -22,6 +22,16 @@
         <desc>SEC 2: Recommended Elliptic Curve Domain Parameters version 2.0  January 27, 2010</desc>
     </category>
     <category>
+        <name>anssi</name>
+        <directory>anssi</directory>
+        <desc>Agence nationale de la sécurité des systèmes d'information: Publication d'un paramétrage de courbe elliptique visant des applications de passeport électronique et de l'administration électronique française. 21 November 2011</desc>
+    </category>
+    <category>
+        <name>GOST</name>
+        <directory>gost</directory>
+        <desc>GOST R 34.10-2001: RFC5832</desc>
+    </category>
+    <category>
         <name>nonprime</name>
         <directory>nonprime</directory>
         <desc>Non-prime order curves, with points of very small order pregenerated.</desc>
diff --git a/src/cz/crcs/ectester/data/gost/curves.xml b/src/cz/crcs/ectester/data/gost/curves.xml
new file mode 100644
index 0000000..2b83c5e
--- /dev/null
+++ b/src/cz/crcs/ectester/data/gost/curves.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../schema.xsd">
+    <curve>
+        <id>gost256</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>gost256.csv</file>
+    </curve>
+    <curve>
+        <id>gost512</id>
+        <bits>512</bits>
+        <field>prime</field>
+        <file>gost512.csv</file>
+    </curve>
+</curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/gost/gost256.csv b/src/cz/crcs/ectester/data/gost/gost256.csv
new file mode 100644
index 0000000..baea45a
--- /dev/null
+++ b/src/cz/crcs/ectester/data/gost/gost256.csv
@@ -0,0 +1 @@
+0x8000000000000000000000000000000000000000000000000000000000000431,0x7,0x5fbff498aa938ce739b8e022fbafef40563f6e6a3472fc2a514c0ce9dae23b7e,0x2,0x8e2a8a0e65147d4bd6316030e16d19c85c97f0a9ca267122b96abbcea7e8fc8,0x8000000000000000000000000000000150fe8a1892976154c59cfc193accf5b3,0x1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/gost/gost512.csv b/src/cz/crcs/ectester/data/gost/gost512.csv
new file mode 100644
index 0000000..5b24d59
--- /dev/null
+++ b/src/cz/crcs/ectester/data/gost/gost512.csv
@@ -0,0 +1 @@
+0x4531acd1fe0023c7550d267b6b2fee80922b14b2ffb90f04d4eb7c09b5d2d15df1d852741af4704a0458047e80e4546d35b8336fac224dd81664bbf528be6373,0x7,0x1cff0806a31116da29d8cfa54e57eb748bc5f377e49400fdd788b649eca1ac4361834013b2ad7322480a89ca58e0cf74bc9e540c2add6897fad0a3084f302adc,0x24d19cc64572ee30f396bf6ebbfd7a6c5213b3b3d7057cc825f91093a68cd762fd60611262cd838dc6b60aa7eee804e28bc849977fac33b4b530f1b120248a9a,0x2bb312a43bd2ce6e0d020613c857acddcfbf061e91e5f2c3f32447c259f39b2c83ab156d77f1496bf7eb3351e1ee4e43dc1a18b91b24640b6dbb92cb1add371e,0x4531acd1fe0023c7550d267b6b2fee80922b14b2ffb90f04d4eb7c09b5d2d15da82f2d7ecb1dbac719905c5eecc423f1d86e25edbe23c595d644aaf187e6e6df,0x1
\ No newline at end of file