Move new curves to the file curves.json. (#11)

* Add seeds

* Add ANSSI seed.

* Add SECG seeds.

* Add another GOST curves. These are from RFC7836

* Move the new curves to the curves.json file and delete the file another_curves.json

1 files changed, 75 insertions, 3 deletions

diff --git a/gost/curves.json b/gost/curves.json
index 61c682f..a3075d2 100644
--- a/gost/curves.json
+++ b/gost/curves.json
@@ -1,11 +1,11 @@
 {
   "name": "GOST",
-  "desc": "GOST R 34.10-2001: RFC5832",
+  "desc": "GOST R 34.10-2001: RFC5832, GOST R 34.10-2012: RFC7836",
   "curves": [
     {
       "name": "gost256",
       "category": "gost",
-      "desc": "",
+      "desc": "RFC5832",
       "field": {
         "type": "Prime",
         "p": "0x8000000000000000000000000000000000000000000000000000000000000431",
@@ -86,7 +86,7 @@
     {
       "name": "gost512",
       "category": "gost",
-      "desc": "",
+      "desc": "RFC5832",
       "field": {
         "type": "Prime",
         "p": "0x4531acd1fe0023c7550d267b6b2fee80922b14b2ffb90f04d4eb7c09b5d2d15df1d852741af4704a0458047e80e4546d35b8336fac224dd81664bbf528be6373",
@@ -117,5 +117,77 @@
         "trace_of_frobenius": "33317690176989408428354063686744165122149707869071609401230178415964786752661"
       }
     }
+	 {"name": "id-tc26-gost-3410-12-512-paramSetA",
+      "category": "gost",
+      "desc": "RFC7836",
+      "field": {
+        "type": "Prime",
+        "p": "0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7",
+        "bits": 512
+      },
+      "form": "Weierstrass",
+      "params": {
+        "a": {
+          "raw": "0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4"
+        },
+        "b": {
+          "raw": "0x00E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x03"
+        },
+        "y": {
+          "raw": "0x7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4
+"
+        }
+      },
+      "order": "0x00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275",
+      "cofactor": "0x1",
+      "characteristics": {
+        "discriminant": "12198408522911213052632489093057402109612720640096098688583378894786958412526782601142507389753258425683973521245032174347351331325939929127804416473292375",
+        "j_invariant": "2850514806025719070145724293578244494155992500562074285019380556682599199784707862702432619340199207468768980481671624645560499531743272474439893330387268",
+        "trace_of_frobenius": "97744483583712349266929640403245629889151353128602905529915952558174263790419",
+        "embedding_degree": "13407807929942597099574024998205846127479365820592393377723561443721764030073449232318290585817636498049628612556596899500625279906416653993875474742293108",
+        "supersingular": false,
+      }
+    },
+    {
+      "name": "id-tc26-gost-3410-12-512-paramSetB",
+      "category": "gost",
+      "desc": "RFC7836",
+      "field": {
+        "type": "Prime",
+        "p": "0x008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F",
+        "bits": 512
+      },
+      "form": "Weierstrass",
+      "params": {
+        "a": {
+          "raw": "0x008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C"
+        },
+        "b": {
+          "raw": "0x687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x02"
+        },
+        "y": {
+          "raw": "0x1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD"
+        }
+      },
+      "order": "0x00800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD",
+      "cofactor": "0x1",
+      "characteristics": {
+        "discriminant": "3168251429939329401500982659836128598832488836312881941454031137145329322102983037116860271709983280267186414249706141598349259183530624792370505272178517",
+        "j_invariant": "3279526492516777515918714136866447726665055949835218722150114206701277040061277147122787695822725918855580899339255833327922367669454014389888618448520937",
+        "trace_of_frobenius": "-149097018916599106931901217895018650162542083271457414743815309640053273077069",
+		"supersingular": false,
+		"embedding_degree" : "1117317327495216424964502083183820510623280485049366114810296786976813669172820430903308958031730602510485157957234261251691399803452850047142812962686538"
+      }
+    }
   ]
 }