Sync upstream changes.

2026-01-07 20:43:59 -05:00 · 2021-08-05 16:08:00 +02:00
parent 722a841150
commit 0fbb137e76
7 changed files with 735 additions and 17 deletions
--- a/anssi/curves.json
+++ b/anssi/curves.json
@@ -31,7 +31,7 @@
      "order": "0xf1fd178c0b3ad58f10126de8ce42435b53dc67e140d2bf941ffdd459c6d655e1",
      "cofactor": "0x1",
      "characteristics": {
-		"seed": "22210330C1F1D5B1CB62BD35A98AA05D4555D04960F21EC2C86CD591E30275A883FEF63F34D2653AAD9CB76BCED4463A4F52B9DABC0F5DAF4C632E04F87281B379835A03411F3A1C1F271BD1C05DCA421E32A2BA2CCA081B427E0B73F810F5506ECCE6EAE6676E3469804DCB3F5994FEC1AF568FF78622F2E0102BEF13269C0A133B4DFFF2D92FDD6313C892B8284A202E3CDB70966CD10A54CDE0CD8325E8C3D70BD689B81BB6488823D416719B10238C25D98C654468CC4EC3DD780AB468AB0B7F404A079B22389127C74B6E026156DD1B029BD127F85EFBBE46E8A7CA4BBC1B9D6A4F3E6F88C964E33E830E94DA15BC0347B893D9F64D59896FA058E107EFFD7BA4D5A5027E3C37E8A2FF03BC6293A8FF2A5C43092A5E16032A07533574818265A6651689DE41C970DAB7E9245CC5462173A9A5DCB98002A4AFE1110651445105382EE226EE0B325C5B194E20CFE9A972AC74CBD72D5073362AD8C718203A779C605BC14B45F6D1E2343CA980B78E81D2BACEE3338347490E966ECBDC2BC16B0D09C0190E5E4DA02E22683BB92E6431A41308EF69B95EFDF48C2DEFF92B4AC82B6C134D197C6D8B0F72CFC901B8F68CC62DFDD9FFA59A0F6E098A14E9A669058F8B9C22502FA3F24AD2BEAD2883635D4DFF091C93E8D34D346137B3D5C987D6E150DB335DAD723D862B33411288952F7FA97BF04B14C88446ACA1FB9D19C385C8180A44BA7244B64E37EE569FE8577DDF3A3263FDE075C874674F637018D41CB0A4DBC4D72DB0D38D50F2DC6CC975E7E21AC78977C21B499E60221D2A9F85107CB24A31B19D5FCAFD4AD98400B383FE08C67B28390E30D07813290EECC536396D9C0C6B033186B8B51194EB7E19D0963F8916E86BDEBAA88C9CDDFA62493815A251B38296205A7266C124E2F2063BC9E5172681B9F344A0715DDDEF0A80F535C1950A935AF4681F422C8172BFFF6A78BAD30F544A2AAF54CD6806A24CC822A575F3C7B1B90F42C8697A6AE3C41C8276C2944FC53E791873FF22BFFAF3215271DA62E66CD0AFA2783D92B5D81BE6780B1376743BAA37458569338EC04A8FBFC25F07F2B1C009000FB600023F793D31E5F36595456E44C3CD1BA786326D63F5CA0C619034D47C721DBFFBF165F924B0FC979B4B39303F478A1ED1FAC027CA6E24737246B9C0A8DA35EE57143D292F9E22D5AC4BFC237E5AAF798958D4586DB671436F1DA3E11EB6AA08F1497481F4CD614D4787E0F24FD9D207E005DB85586EF5371138D41818E63327ED57BC1C87F2DB9C831988AF62FB735E4508DCBF2331020CCCAE9E2D74287DEDE097F2AD9E4262A8A78E123EE93516AA7579087518D3D472710628BC15C423E123919806AEA3CDD5A7F6893B51D6B3C7ED9A202A5FB8681BA68553283A0D718960F1CB274E48E24C5DD7BEB70DBED9EDEE81EB2A27D510694E482D",
+        "seed": "22210330C1F1D5B1CB62BD35A98AA05D4555D04960F21EC2C86CD591E30275A883FEF63F34D2653AAD9CB76BCED4463A4F52B9DABC0F5DAF4C632E04F87281B379835A03411F3A1C1F271BD1C05DCA421E32A2BA2CCA081B427E0B73F810F5506ECCE6EAE6676E3469804DCB3F5994FEC1AF568FF78622F2E0102BEF13269C0A133B4DFFF2D92FDD6313C892B8284A202E3CDB70966CD10A54CDE0CD8325E8C3D70BD689B81BB6488823D416719B10238C25D98C654468CC4EC3DD780AB468AB0B7F404A079B22389127C74B6E026156DD1B029BD127F85EFBBE46E8A7CA4BBC1B9D6A4F3E6F88C964E33E830E94DA15BC0347B893D9F64D59896FA058E107EFFD7BA4D5A5027E3C37E8A2FF03BC6293A8FF2A5C43092A5E16032A07533574818265A6651689DE41C970DAB7E9245CC5462173A9A5DCB98002A4AFE1110651445105382EE226EE0B325C5B194E20CFE9A972AC74CBD72D5073362AD8C718203A779C605BC14B45F6D1E2343CA980B78E81D2BACEE3338347490E966ECBDC2BC16B0D09C0190E5E4DA02E22683BB92E6431A41308EF69B95EFDF48C2DEFF92B4AC82B6C134D197C6D8B0F72CFC901B8F68CC62DFDD9FFA59A0F6E098A14E9A669058F8B9C22502FA3F24AD2BEAD2883635D4DFF091C93E8D34D346137B3D5C987D6E150DB335DAD723D862B33411288952F7FA97BF04B14C88446ACA1FB9D19C385C8180A44BA7244B64E37EE569FE8577DDF3A3263FDE075C874674F637018D41CB0A4DBC4D72DB0D38D50F2DC6CC975E7E21AC78977C21B499E60221D2A9F85107CB24A31B19D5FCAFD4AD98400B383FE08C67B28390E30D07813290EECC536396D9C0C6B033186B8B51194EB7E19D0963F8916E86BDEBAA88C9CDDFA62493815A251B38296205A7266C124E2F2063BC9E5172681B9F344A0715DDDEF0A80F535C1950A935AF4681F422C8172BFFF6A78BAD30F544A2AAF54CD6806A24CC822A575F3C7B1B90F42C8697A6AE3C41C8276C2944FC53E791873FF22BFFAF3215271DA62E66CD0AFA2783D92B5D81BE6780B1376743BAA37458569338EC04A8FBFC25F07F2B1C009000FB600023F793D31E5F36595456E44C3CD1BA786326D63F5CA0C619034D47C721DBFFBF165F924B0FC979B4B39303F478A1ED1FAC027CA6E24737246B9C0A8DA35EE57143D292F9E22D5AC4BFC237E5AAF798958D4586DB671436F1DA3E11EB6AA08F1497481F4CD614D4787E0F24FD9D207E005DB85586EF5371138D41818E63327ED57BC1C87F2DB9C831988AF62FB735E4508DCBF2331020CCCAE9E2D74287DEDE097F2AD9E4262A8A78E123EE93516AA7579087518D3D472710628BC15C423E123919806AEA3CDD5A7F6893B51D6B3C7ED9A202A5FB8681BA68553283A0D718960F1CB274E48E24C5DD7BEB70DBED9EDEE81EB2A27D510694E482D",
        "discriminant": "36852496142108626283186094975130945312915652343771992238361306471587988304996",
        "j_invariant": "40896549830710972397896969473453290820546317441961689722588313512802554631657",
        "trace_of_frobenius": "-35197163533674495870879651530057169373",
--- a/bls/curves.json
+++ b/bls/curves.json
@@ -146,6 +146,31 @@
      },
      "order": "0x57F52EE445CC41781FCD53D13E45F6ACDFE4F9F2A3CD414E71238AFC9FCFC7D38CAEF64F4FF79F90013FFFFFF0000001",
      "cofactor": "0x41550AAAC04B3FD5000015AB"
+    },
+    {
+      "name": "Bandersnatch",
+      "category": "bls",
+      "desc": "Curve from https://ethresear.ch/t/introducing-bandersnatch-a-fast-elliptic-curve-built-over-the-bls12-381-scalar-field/9957",
+      "field": {
+        "type": "Prime",
+        "p": "0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+        "bits": 255
+      },
+      "form": "TwistedEdwards",
+      "params": {
+        "a": {
+          "raw": "-0x05"
+        },
+        "d": {
+          "raw": "0x6389c12633c267cbc66e3bf86be3b6d8cb66677177e54f92b369f2f5188d58e7"
+        }
+      },
+      "order": "0x1cfb69d4ca675f520cce760202687600ff8f87007419047174fd06b52876e7e1",
+      "cofactor": "0x04",
+      "characteristics": {
+        "discriminant": "-0x08",
+        "j_invariant": "0x1f40"
+      }
    }
  ]
 }
--- a/gost/curves.json
+++ b/gost/curves.json
@@ -188,6 +188,151 @@
        "supersingular": false,
        "embedding_degree": "1117317327495216424964502083183820510623280485049366114810296786976813669172820430903308958031730602510485157957234261251691399803452850047142812962686538"
      }
+    },
+    {
+      "name": "id-GostR3410-2001-CryptoPro-A-ParamSet",
+      "category": "gost",
+      "desc": "RFC4357",
+      "field": {
+        "type": "Prime",
+        "p": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd97",
+        "bits": 256
+      },
+      "form": "Weierstrass",
+      "params": {
+        "a": {
+          "raw": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd94"
+        },
+        "b": {
+          "raw": "0xa6"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x01"
+        },
+        "y": {
+          "raw": "0x8d91e471e0989cda27df505a453f2b7635294f2ddf23e3b122acc99c9e9f1e14"
+        }
+      },
+      "order": "0xffffffffffffffffffffffffffffffff6c611070995ad10045841b09b761b893",
+      "cofactor": "0x1"
+    },
+    {
+      "name": "id-GostR3410-2001-CryptoPro-B-ParamSet",
+      "category": "gost",
+      "desc": "RFC4357",
+      "field": {
+        "type": "Prime",
+        "p": "0x8000000000000000000000000000000000000000000000000000000000000c99",
+        "bits": 256
+      },
+      "form": "Weierstrass",
+      "params": {
+        "a": {
+          "raw": "0x8000000000000000000000000000000000000000000000000000000000000c96"
+        },
+        "b": {
+          "raw": "0x3e1af419a269a5f866a7d3c25c3df80ae979259373ff2b182f49d4ce7e1bbc8b"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x01"
+        },
+        "y": {
+          "raw": "0x3fa8124359f96680b83d1c3eb2c070e5c545c9858d03ecfb744bf8d717717efc"
+        }
+      },
+      "order": "0x800000000000000000000000000000015f700cfff1a624e5e497161bcc8a198f",
+      "cofactor": "0x1"
+    },
+    {
+      "name": "id-GostR3410-2001-CryptoPro-C-ParamSet",
+      "category": "gost",
+      "desc": "RFC4357",
+      "field": {
+        "type": "Prime",
+        "p": "0x9b9f605f5a858107ab1ec85e6b41c8aacf846e86789051d37998f7b9022d759b",
+        "bits": 256
+      },
+      "form": "Weierstrass",
+      "params": {
+        "a": {
+          "raw": "0x9b9f605f5a858107ab1ec85e6b41c8aacf846e86789051d37998f7b9022d7598"
+        },
+        "b": {
+          "raw": "0x805a"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x00"
+        },
+        "y": {
+          "raw": "0x41ece55743711a8c3cbf3783cd08c0ee4d4dc440d4641a8f366e550dfdb3bb67"
+        }
+      },
+      "order": "0x9b9f605f5a858107ab1ec85e6b41c8aa582ca3511eddfb74f02f3a6598980bb9",
+      "cofactor": "0x1"
+    },
+    {
+      "name": "id-tc26-gost-3410-2012-256-paramSetA",
+      "category": "gost",
+      "desc": "RFC5832",
+      "field": {
+        "type": "Prime",
+        "p": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd97",
+        "bits": 256
+      },
+      "form": "TwistedEdwards",
+      "params": {
+        "a": {
+          "raw": "0x01"
+        },
+        "d": {
+          "raw": "0x605f6b7c183fa81578bc39cfad518132b9df62897009af7e522c32d6dc7bffb"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x0d"
+        },
+        "y": {
+          "raw": "0x60ca1e32aa475b348488c38fab07649ce7ef8dbe87f22e81f92b2592dba300e7"
+        }
+      },
+      "order": "0x400000000000000000000000000000000fd8cddfc87b6635c115af556c360c67",
+      "cofactor": "0x4"
+    },
+    {
+      "name": "id-tc26-gost-3410-2012-512-paramSetC",
+      "category": "gost",
+      "desc": "RFC5832",
+      "field": {
+        "type": "Prime",
+        "p": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdc7",
+        "bits": 512
+      },
+      "form": "TwistedEdwards",
+      "params": {
+        "a": {
+          "raw": "0x01"
+        },
+        "d": {
+          "raw": "0x9e4f5d8c017d8d9f13a5cf3cdf5bfe4dab402d54198e31ebde28a0621050439ca6b39e0a515c06b304e2ce43e79e369e91a0cfc2bc2a22b4ca302dbb33ee7550"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0x12"
+        },
+        "y": {
+          "raw": "0x469af79d1fb1f5e16b99592b77a01e2a0fdfb0d01794368d9a56117f7b38669522dd4b650cf789eebf068c5d139732f0905622c04b2baae7600303ee73001a3d"
+        }
+      },
+      "order": "0x3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc98cdba46506ab004c33a9ff5147502cc8eda9e7a769a12694623cef47f023ed",
+      "cofactor": "0x4"
    }
  ]
 }
--- a/nist/curves.json
+++ b/nist/curves.json
@@ -35,7 +35,7 @@
        "x962/prime192v1"
      ],
      "characteristics": {
-		"seed": "3045AE6FC8422F64ED579528D38120EAE12196D5",
+        "seed": "3045AE6FC8422F64ED579528D38120EAE12196D5",
        "discriminant": "5525402385154848923235289274741921730185152131202286251655",
        "j_invariant": "6234286251230310114240839169629130138801351179850969208331",
        "trace_of_frobenius": "31607402316713927207482677199",
@@ -112,7 +112,7 @@
        "x963/ansip224r1"
      ],
      "characteristics": {
-		"seed": "BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5",
+        "seed": "BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5",
        "discriminant": "8133954887115844930654026312464158747844254983800706208418026371607",
        "j_invariant": "20781977079628996477063007379734849057519732242287194936686605794677",
        "trace_of_frobenius": "4733100108545601916421827343930821",
@@ -173,7 +173,7 @@
        "x962/prime256v1"
      ],
      "characteristics": {
-		"seed": "C49D360886E704936A6678E1139D26B7819F7E90",
+        "seed": "C49D360886E704936A6678E1139D26B7819F7E90",
        "discriminant": "47064476442213300654454205837611899485069387829947879813735601543372794627813",
        "j_invariant": "7958909377132088453074743217357398615041065282494610304372115906626967530147",
        "trace_of_frobenius": "89188191154553853111372247798585809583",
@@ -239,7 +239,7 @@
        "x963/ansip384r1"
      ],
      "characteristics": {
-		"seed": "A335926AA319A27A1D00896A6773A4827ACDAC73",
+        "seed": "A335926AA319A27A1D00896A6773A4827ACDAC73",
        "discriminant": "38275261264050278989862136034342276004573039492779555073863190029182890449044186682105480613137214197175883602718257",
        "j_invariant": "12550029517991417762405079599420518784762671286028430215113399824456742172589190955698027499893480133182923443701083",
        "trace_of_frobenius": "1388124618062372383606759648309780106643088307173319169677"
@@ -278,7 +278,7 @@
        "x963/ansip521r1"
      ],
      "characteristics": {
-		"seed": "D09E8800291CB85396CC6717393284AAA0DA64BA",
+        "seed": "D09E8800291CB85396CC6717393284AAA0DA64BA",
        "discriminant": "2687853087729004331535582886185403114835754464152651523509230634031161977750238608042000458607319784141115468556368066113806987449553072575343372028907331922",
        "j_invariant": "3619090631887053412807272747807643016060282478111249168973675223587770705025281286979867546071268566958111997954788345609183745222693618155278831649044785613",
        "trace_of_frobenius": "657877501894328237357444332315020117536923257219387276263472201219398408051703"
@@ -404,7 +404,7 @@
        "x963/ansit163r2"
      ],
      "characteristics": {
-		"seed": "85E25BFE5C86226CDB12016F7553F9D0E693A268",
+        "seed": "85E25BFE5C86226CDB12016F7553F9D0E693A268",
        "discriminant": "2982236234343851336267446656627785008148015875581",
        "j_invariant": "924715273381456531451948543458511393546700947074",
        "trace_of_frobenius": "-6224022517221266226059365",
@@ -520,7 +520,7 @@
        "x963/ansit233r1"
      ],
      "characteristics": {
-		"seed": "74D59FF07F6B413D0EA14B344B20A2DB049B50C3",
+        "seed": "74D59FF07F6B413D0EA14B344B20A2DB049B50C3",
        "discriminant": "2760497980029204187078845502377898520307707256259003964398570147123373",
        "j_invariant": "4307676474001897771242333711874131057278497100044075715856582737706846",
        "trace_of_frobenius": "-206777407530349254000433718821372333",
@@ -651,7 +651,7 @@
        "x963/ansit283r1"
      ],
      "characteristics": {
-		"seed": "77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE",
+        "seed": "77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE",
        "discriminant": "4821813576056072374006997780399081180312270030300601270120450341205914644378616963829",
        "j_invariant": "627751430426462883238147702498843470781790640735057151432982237133924095803873168483",
        "trace_of_frobenius": "2863663306391796106224371145726066910599667",
@@ -764,7 +764,7 @@
        "x963/ansit409r1"
      ],
      "characteristics": {
-		"seed": "4099B5A457F9D69F79213D094C4BCD4D4262210B",
+        "seed": "4099B5A457F9D69F79213D094C4BCD4D4262210B",
        "discriminant": "86886261634090707672817770640384425264505829479043641824438658614111870471004564988634410809058207142318571212147935892575",
        "j_invariant": "754296572979130966367055702570030140076184810784727299570664029563208238737796673624760610953546729716274009429339787708937",
        "trace_of_frobenius": "-6059503967182126918765909026644927652236777310526686418445029",
@@ -891,7 +891,7 @@
        "x963/ansit571r1"
      ],
      "characteristics": {
-		"seed": "2AA058F73A0E33AB486B0F610410C53A7F132310",
+        "seed": "2AA058F73A0E33AB486B0F610410C53A7F132310",
        "discriminant": "2853329245261343535560086964181551296889298776106832980891560850944180011701123307905326019642652653533003482753023669016842884108172514870944140611113679225347419720217210",
        "j_invariant": "4214501753546941913223695905024629172637342244349568219783929342383426637975668846684512012478218604779111370893214803288669006084397110899225485839234972840008396689070376",
        "trace_of_frobenius": "99534385013609758659469819150465382236412396452349171016760770327496674607579419075443",
--- a/nums/curves.json
+++ b/nums/curves.json
@@ -175,6 +175,384 @@
          "raw": "0x7d67e841dc4c467b605091d80869212f9ceb124bf726973f9ff048779e1d614e62ae2ece5057b5dad96b7a897c1d72799261134638750f4f0cb91027543b1c5e"
        }
      }
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-256-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffa7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 256
+      },
+      "params": {
+        "a": {
+          "raw": "0xffa7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0x350a"
+        }
+      },
+      "order": "0x3fe9ffffffffffffffffffffffffffffb154bbafb86733c966d92eded8ec7bab",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-254-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3f80ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 254
+      },
+      "params": {
+        "a": {
+          "raw": "0x3f80fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0x367b"
+        }
+      },
+      "order": "0xfe03fffffffffffffffffffffffffffeb95306c8bd62fb0eaf3d3fec46e98c7",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-255-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd03",
+        "bits": 255
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd02"
+        },
+        "d": {
+          "raw": "0xea97"
+        }
+      },
+      "order": "0x1fffffffffffffffffffffffffffffffdcf1a785eda6832eac49d1ed0436eb75",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-384-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xb0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 384
+      },
+      "params": {
+        "a": {
+          "raw": "0xb0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0x6f17"
+        }
+      },
+      "order": "0x2c3ffffffffffffffffffffffffffffffffffffffffffffff56d07e24e2749cd9f6b769aec80f6fe06fe4e3a6332489b",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-382-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3ffaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 382
+      },
+      "params": {
+        "a": {
+          "raw": "0x3ffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0xaf381"
+        }
+      },
+      "order": "0xffebfffffffffffffffffffffffffffffffffffffffffffd31afaa1520dc177d8c1605c481e068269880369e5f3fa61",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-383-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5b",
+        "bits": 383
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5a"
+        },
+        "d": {
+          "raw": "0x7fed6"
+        }
+      },
+      "order": "0x1ffffffffffffffffffffffffffffffffffffffffffffffff1109704e73d9fbbbcd5687c9eaca2206ffebcec1ba7c81d",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-512-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xfe14ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 512
+      },
+      "params": {
+        "a": {
+          "raw": "0xfe14fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0x12a9c"
+        }
+      },
+      "order": "0x3f853fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcccfd59cdc33470d103060513f6def4d37d9af21b2b2701fa331487ecb8db605",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-510-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3eddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 510
+      },
+      "params": {
+        "a": {
+          "raw": "0x3eddfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        },
+        "d": {
+          "raw": "0x8da1e"
+        }
+      },
+      "order": "0xfb77fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd7ced11e7c2f1abf716df42a6c246080b5fcc20917e59a42c85821cdf36d51b1",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "TwistedEdwards",
+      "name": "ed-511-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1f",
+        "bits": 511
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1e"
+        },
+        "d": {
+          "raw": "0x10bf7d"
+        }
+      },
+      "order": "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffea7c34182e41e2e9baa930e478c489b72542706bec5f32194f7c2e8f8d142f11",
+      "cofactor": "0x04"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-256-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffa7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 256
+      },
+      "params": {
+        "a": {
+          "raw": "0xffa7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "0x14e6a"
+        }
+      },
+      "order": "0xffa7fffffffffffffffffffffffffffffc517513e6e5074b9d10c5e1a79857eb",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-254-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3f80ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 254
+      },
+      "params": {
+        "a": {
+          "raw": "0x3f80fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "-0x2f72"
+        }
+      },
+      "order": "0x3f80ffffffffffffffffffffffffffffeb818bea0da375c06fa419c4af8df83f",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-255-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd03",
+        "bits": 255
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00"
+        },
+        "b": {
+          "raw": "-0x51bd"
+        }
+      },
+      "order": "0x7fffffffffffffffffffffffffffffff864a38283ad2b3dfab8fac983c594aeb",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-384-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xb0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 384
+      },
+      "params": {
+        "a": {
+          "raw": "0xb0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "0x6c96"
+        }
+      },
+      "order": "0xb0ffffffffffffffffffffffffffffffffffffffffffffffba9b7f14ca7512537a4edcd38a7c41da29be4894b298eebb",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-382-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3ffaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 382
+      },
+      "params": {
+        "a": {
+          "raw": "0x3ffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "-0x20a72"
+        }
+      },
+      "order": "0x3ffaffffffffffffffffffffffffffffffffffffffffffffa6eb1cff4bde214d73b321ffd8e82cd160ab86803ebb301d",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-383-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5b",
+        "bits": 383
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe58"
+        },
+        "b": {
+          "raw": "0x17dbc"
+        }
+      },
+      "order": "0x7fffffffffffffffffffffffffffffffffffffffffffffffa9caf814a8a116ad9fb0b4035417aaf319297fc0bb7a439f",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-512-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xfe14ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 512
+      },
+      "params": {
+        "a": {
+          "raw": "0xfe14fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "0x185ed"
+        }
+      },
+      "order": "0xfe14ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff638a8d792ee750298064aaf0b8498e61df3d3995064ed73b939628f17e98fdc9",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-510-mont",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x3eddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "bits": 510
+      },
+      "params": {
+        "a": {
+          "raw": "0x3eddfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "0x988d"
+        }
+      },
+      "order": "0x3eddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb9146ccde150ef33747ab29d1e6573d8d22de95e322303f3a00b200986fa9a2d",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "w-511-mers",
+      "category": "nums-original",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1f",
+        "bits": 511
+      },
+      "params": {
+        "a": {
+          "raw": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1c"
+        },
+        "b": {
+          "raw": "0x879da"
+        }
+      },
+      "order": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8dbefa3f5ed9d839a2d4fe6ff516e87fa8d3e656a0f99fa1f0105f73b3b9d19f",
+      "cofactor": "0x01"
    }
  ]
 }
--- a/other/curves.json
+++ b/other/curves.json
@@ -1214,6 +1214,176 @@
      },
      "order": "0x40000000000000000000000000000000224698fc094cf91b992d30ed00000001",
      "cofactor": "0x01"
+    },
+    {
+      "name": "MDC201601",
+      "category": "other",
+      "desc": "The Million Dollar Curve",
+      "field": {
+        "type": "Prime",
+        "p": "0xf13b68b9d456afb4532f92fdd7a5fd4f086a9037ef07af9ec13710405779ec13",
+        "bits": 256
+      },
+      "form": "Edwards",
+      "params": {
+        "c": {
+          "raw": "0x01"
+        },
+        "d": {
+          "raw": "0x571304521965b68a7cdfbfccfb0cb9625f1270f63f21f041ee9309250300cf89"
+        }
+      },
+      "generator": {
+        "x": {
+          "raw": "0xb681886a7f903b83d85b421e03cbcf6350d72abb8d2713e2232c25bfee68363b"
+        },
+        "y": {
+          "raw": "0xca6734e1b59c0b0359814dcf6563da421da8bc3d81a93a3a7e73c355bd2864b5"
+        }
+      },
+      "order": "0x3c4eda2e7515abed14cbe4bf75e97f534fb38975faf974bb588552f421b0f7fb",
+      "cofactor": "0x04",
+      "properties": {
+        "j_invariant": "0x2089683f289cb2a9798ce7341bfedb9079106ce1d8d6810a06d07e572576e62f",
+        "trace": "0x1c99c6a600321dcb15f21c46fd0b60c28",
+        "embedding_degree": "0x3c4eda2e7515abed14cbe4bf75e97f534fb38975faf974bb588552f421b0f7fa",
+        "cm_discriminant": "-0x24bb73e2ad3d18402aae6500a8bc42e34e3b02843c2db6b231fa0846c51cfa83"
+      }
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-R-256",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xf1fd178c0b3ad58f10126de8ce42435b3961adbcabc8ca6de8fcf353d86e9c03",
+        "bits": 256
+      },
+      "params": {
+        "a": {
+          "raw": "0xf1fd178c0b3ad58f10126de8ce42435b3961adbcabc8ca6de8fcf353d86e9c00"
+        },
+        "b": {
+          "raw": "0xbada55bada55bada55bada55bada55bada55bada55bada55bada55bada55bd48"
+        }
+      },
+      "order": "0xf1fd178c0b3ad58f10126de8ce42435a1a8e3837861aa0efa0e52aec7379c967",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-VR-224",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffffffffffffffffffffffffffffffff000000000000000000000001",
+        "bits": 224
+      },
+      "params": {
+        "a": {
+          "raw": "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe"
+        },
+        "b": {
+          "raw": "0xbada55ecfd9ca54c0738b8a6fb8cf4ccf84e916d83d6da1b78b622351e11ab4e"
+        }
+      },
+      "order": "0xffffffffffffffffffffffffffff0d44ef1096b2b67b7a3dcee7b079",
+      "cofactor": "0x01",
+      "characteristics": {
+        "seed": "0x3cc520e9434349df680a8f4bcadda648d693b2907b216ee55cb4853db68f9165"
+      }
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-VR-256",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
+        "bits": 256
+      },
+      "params": {
+        "a": {
+          "raw": "0xffffffff00000001000000000000000000000000fffffffffffffffffffffffc"
+        },
+        "b": {
+          "raw": "0xbada55ecd8bbead3add6c534f92197deb47fceb9be7e0e702a8d1dd56b5d0b0c"
+        }
+      },
+      "order": "0xffffffff00000000fffffffffffffffebedc2797003336661a49d76a903bdb91",
+      "cofactor": "0x01",
+      "characteristics": {
+        "seed": "0x3adcc48e36f1d1926701417f101a75f000118a739d4686e77278325a825aa3c6"
+      }
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-VR-384",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000ffffffff",
+        "bits": 384
+      },
+      "params": {
+        "a": {
+          "raw": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc"
+        },
+        "b": {
+          "raw": "0xbada55ec3be2ad1f9eeea5881ecf95bbf3ac392526f01d4cd13e684c63a17cc4d5f271642ad83899113817a61006413d"
+        }
+      },
+      "order": "0xfffffffffffffffffffffffffffffffffffffffffffffffeefe1169b82ff7e5032c683f766fae57359cfc5fc25ffce37",
+      "cofactor": "0x01",
+      "characteristics": {
+        "seed": "0xca9ebd338a9ee0e6862fd329062abc06a793575a1c744f0ec24503a525f5d06e"
+      }
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-VPR-224",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffffffffffffffffffffffffffffffff000000000000000000000001",
+        "bits": 224
+      },
+      "params": {
+        "a": {
+          "raw": "0x7144ba12ce8a0c3befa053edbada555a42391fc64f052376e041c7d4af23195ebd8d83625321d452e8a0c3bb0a048a26115704e45dceb346a9f4bd9741d14d49"
+        },
+        "b": {
+          "raw": "0x5c32ec7fc48ce1802d9b70dbc3fa574eaf015fce4e99b43ebe3468d6efb2276ba3669aff6ffc0f4c6ae4ae2e5d74c3c0af97dce17147688dda89e734b56944a2"
+        }
+      },
+      "order": "0xffffffffffffffffffffffffffff473fa5d3e9bf40a95a8d3f014add",
+      "cofactor": "0x01"
+    },
+    {
+      "form": "Weierstrass",
+      "name": "BADA55-VPR2-224",
+      "category": "other",
+      "desc": "BADA55 curve from the https://bada55.cr.yp.to/bada55-20150927.pdf",
+      "field": {
+        "type": "Prime",
+        "p": "0xffffffffffffffffffffffffffffffff000000000000000000000001",
+        "bits": 224
+      },
+      "params": {
+        "a": {
+          "raw": "0x8f0ff20e1e3cf4905d492e04110683948bfc236790bbb59e6e6b33f24f348ed2e16c64ee79f9fd27e9a367ff6415b41189e4fb6bada555455dc44c4f87011eef"
+        },
+        "b": {
+          "raw": "0xe85067a95547e30661c854a43ed80f36289043ffc73da78a97e37fb96a2717009088656b948865a660ff3959330d8a1ca1e4de31b7b7d496a4cde555e57d05c"
+        }
+      },
+      "order": "0xffffffffffffffffffffffffffffdf5c0319f61dc6ccebe902bc220f",
+      "cofactor": "0x01"
    }
  ]
 }
--- a/secg/curves.json
+++ b/secg/curves.json
@@ -1623,7 +1623,7 @@
        "x963/ansit233r1"
      ],
      "characteristics": {
-		"seed": "74D59FF07F6B413D0EA14B344B20A2DB049B50C3",
+        "seed": "74D59FF07F6B413D0EA14B344B20A2DB049B50C3",
        "discriminant": "2760497980029204187078845502377898520307707256259003964398570147123373",
        "j_invariant": "4307676474001897771242333711874131057278497100044075715856582737706846",
        "trace_of_frobenius": "-206777407530349254000433718821372333",
@@ -1654,8 +1654,8 @@
            "coeff": "0x01"
          }
        ],
-        "bits": 233,
-        "degree": 233,
+        "bits": 239,
+        "degree": 239,
        "basis": "poly"
      },
      "form": "Weierstrass",
@@ -1813,7 +1813,7 @@
        "x963/ansit283r1"
      ],
      "characteristics": {
-		"seed": "77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE",
+        "seed": "77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE",
        "discriminant": "4821813576056072374006997780399081180312270030300601270120450341205914644378616963829",
        "j_invariant": "627751430426462883238147702498843470781790640735057151432982237133924095803873168483",
        "trace_of_frobenius": "2863663306391796106224371145726066910599667",
@@ -1928,7 +1928,7 @@
        "x963/ansit409r1"
      ],
      "characteristics": {
-		"seed": "4099B5A457F9D69F79213D094C4BCD4D4262210B",
+        "seed": "4099B5A457F9D69F79213D094C4BCD4D4262210B",
        "discriminant": "86886261634090707672817770640384425264505829479043641824438658614111870471004564988634410809058207142318571212147935892575",
        "j_invariant": "754296572979130966367055702570030140076184810784727299570664029563208238737796673624760610953546729716274009429339787708937",
        "trace_of_frobenius": "-6059503967182126918765909026644927652236777310526686418445029",
@@ -2057,7 +2057,7 @@
        "x963/ansit571r1"
      ],
      "characteristics": {
-		"seed": "2AA058F73A0E33AB486B0F610410C53A7F132310",
+        "seed": "2AA058F73A0E33AB486B0F610410C53A7F132310",
        "discriminant": "2853329245261343535560086964181551296889298776106832980891560850944180011701123307905326019642652653533003482753023669016842884108172514870944140611113679225347419720217210",
        "j_invariant": "4214501753546941913223695905024629172637342244349568219783929342383426637975668846684512012478218604779111370893214803288669006084397110899225485839234972840008396689070376",
        "trace_of_frobenius": "99534385013609758659469819150465382236412396452349171016760770327496674607579419075443",