Merge GH #2653 Autogenerate ec_named.cpp from a list of curves

4 files changed, 417 insertions, 26 deletions

diff --git a/src/build-data/ec_groups.txt b/src/build-data/ec_groups.txt
new file mode 100644
index 000000000..616e2c365
--- /dev/null
+++ b/src/build-data/ec_groups.txt
@@ -0,0 +1,242 @@
+Name = secp256r1
+OID = 1.2.840.10045.3.1.7
+P = 0xFFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF
+A = -3
+B = 0x5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B
+X = 0x6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296
+Y = 0x4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5
+N = 0xFFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551
+
+Name = secp384r1
+OID = 1.3.132.0.34
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF
+A = -3
+B = 0xB3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF
+X = 0xAA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7
+Y = 0x3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973
+
+Name = secp521r1
+OID = 1.3.132.0.35
+P = 0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+A = -3
+B = 0x51953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00
+X = 0xC6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66
+Y = 0x11839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650
+N = 0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409
+
+Name = brainpool160r1
+OID = 1.3.36.3.3.2.8.1.1.1
+P = 0xE95E4A5F737059DC60DFC7AD95B3D8139515620F
+A = 0x340E7BE2A280EB74E2BE61BADA745D97E8F7C300
+B = 0x1E589A8595423412134FAA2DBDEC95C8D8675E58
+X = 0xBED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3
+Y = 0x1667CB477A1A8EC338F94741669C976316DA6321
+N = 0xE95E4A5F737059DC60DF5991D45029409E60FC09
+
+Name = brainpool192r1
+OID = 1.3.36.3.3.2.8.1.1.3
+P = 0xC302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297
+A = 0x6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF
+B = 0x469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9
+X = 0xC0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6
+Y = 0x14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F
+N = 0xC302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1
+
+Name = brainpool224r1
+OID = 1.3.36.3.3.2.8.1.1.5
+P = 0xD7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF
+A = 0x68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43
+B = 0x2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B
+X = 0xD9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D
+Y = 0x58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD
+N = 0xD7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F
+
+Name = brainpool256r1
+OID = 1.3.36.3.3.2.8.1.1.7
+P = 0xA9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377
+A = 0x7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9
+B = 0x26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6
+X = 0x8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262
+Y = 0x547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997
+N = 0xA9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7
+
+Name = brainpool320r1
+OID = 1.3.36.3.3.2.8.1.1.9
+P = 0xD35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27
+A = 0x3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4
+B = 0x520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6
+X = 0x43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611
+Y = 0x14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1
+N = 0xD35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311
+
+Name = brainpool384r1
+OID = 1.3.36.3.3.2.8.1.1.11
+P = 0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53
+A = 0x7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826
+B = 0x4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11
+X = 0x1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E
+Y = 0x8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315
+N = 0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565
+
+Name = brainpool512r1
+OID = 1.3.36.3.3.2.8.1.1.13
+P = 0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3
+A = 0x7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA
+B = 0x3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723
+X = 0x81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822
+Y = 0x7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892
+N = 0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069
+
+Name = frp256v1
+OID = 1.2.250.1.223.101.256.1
+P = 0xF1FD178C0B3AD58F10126DE8CE42435B3961ADBCABC8CA6DE8FCF353D86E9C03
+A = -3
+B = 0xEE353FCA5428A9300D4ABA754A44C00FDFEC0C9AE4B1A1803075ED967B7BB73F
+X = 0xB6B3D4C356C139EB31183D4749D423958C27D2DCAF98B70164C97A2DD98F5CFF
+Y = 0x6142E0F7C8B204911F9271F0F3ECEF8C2701C307E8E4C9E183115A1554062CFB
+N = 0xF1FD178C0B3AD58F10126DE8CE42435B53DC67E140D2BF941FFDD459C6D655E1
+
+Name = gost_256A
+OID = 1.2.643.7.1.2.1.1.1 1.2.643.2.2.35.1 1.2.643.2.2.36.0
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97
+A = -3
+B = 0xA6
+X = 0x1
+Y = 0x8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893
+
+Name = gost_512A
+OID = 1.2.643.7.1.2.1.2.1
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7
+A = -3
+B = 0xE8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760
+X = 3
+Y = 0x7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275
+
+Name = secp160k1
+OID = 1.3.132.0.9
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73
+A = 0x0
+B = 0x7
+X = 0x3B4C382CE37AA192A4019E763036F4F5DD4D7EBB
+Y = 0x938CF935318FDCED6BC28286531733C3F03C4FEE
+N = 0x100000000000000000001B8FA16DFAB9ACA16B6B3
+
+Name = secp160r1
+OID = 1.3.132.0.8
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF
+A = -3
+B = 0x1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45
+X = 0x4A96B5688EF573284664698968C38BB913CBFC82
+Y = 0x23A628553168947D59DCC912042351377AC5FB32
+N = 0x100000000000000000001F4C8F927AED3CA752257
+
+Name = secp160r2
+OID = 1.3.132.0.30
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73
+A = -3
+B = 0xB4E134D3FB59EB8BAB57274904664D5AF50388BA
+X = 0x52DCB034293A117E1F4FF11B30F7199D3144CE6D
+Y = 0xFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E
+N = 0x100000000000000000000351EE786A818F3A1A16B
+
+Name = secp192k1
+OID = 1.3.132.0.31
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37
+A = 0x0
+B = 0x3
+X = 0xDB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D
+Y = 0x9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D
+
+Name = secp192r1
+OID = 1.2.840.10045.3.1.1
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF
+A = -3
+B = 0x64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1
+X = 0x188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012
+Y = 0x7192B95FFC8DA78631011ED6B24CDD573F977A11E794811
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831
+
+Name = secp224k1
+OID = 1.3.132.0.32
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D
+A = 0x0
+B = 0x5
+X = 0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C
+Y = 0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5
+N = 0x10000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7
+
+Name = secp224r1
+OID = 1.3.132.0.33
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001
+A = -3
+B = 0xB4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4
+X = 0xB70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21
+Y = 0xBD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D
+
+Name = secp256k1
+OID = 1.3.132.0.10
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F
+A = 0x0
+B = 0x7
+X = 0x79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798
+Y = 0x483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+
+Name = sm2p256v1
+OID = 1.2.156.10197.1.301
+P = 0xFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFF
+A = -3
+B = 0x28E9FA9E9D9F5E344D5A9E4BCF6509A7F39789F515AB8F92DDBCBD414D940E93
+X = 0x32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7
+Y = 0xBC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0
+N = 0xFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6B21C6052B53BBF40939D54123
+
+Name = x962_p192v2
+OID = 1.2.840.10045.3.1.2
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF
+A = -3
+B = 0xCC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953
+X = 0xEEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A
+Y = 0x6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31
+
+Name = x962_p192v3
+OID = 1.2.840.10045.3.1.3
+P = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF
+A = -3
+B = 0x22123DC2395A05CAA7423DAECCC94760A7D462256BD56916
+X = 0x7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896
+Y = 0x38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0
+N = 0xFFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13
+
+Name = x962_p239v1
+OID = 1.2.840.10045.3.1.4
+P = 0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF
+A = -3
+B = 0x6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A
+X = 0xFFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF
+Y = 0x7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE
+N = 0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B
+
+Name = x962_p239v2
+OID = 1.2.840.10045.3.1.5
+P = 0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF
+A = -3
+B = 0x617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C
+X = 0x38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7
+Y = 0x5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA
+N = 0x7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063
+
+Name = x962_p239v3
+OID = 1.2.840.10045.3.1.6
+P = 0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF
+A = -3
+B = 0x255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E
+X = 0x6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A
+Y = 0x1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3
+N = 0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551
diff --git a/src/build-data/ec_named.cpp.in b/src/build-data/ec_named.cpp.in
new file mode 100644
index 000000000..fc7b6165c
--- /dev/null
+++ b/src/build-data/ec_named.cpp.in
@@ -0,0 +1,28 @@
+/*
+* ECC Group Info
+* This file was automatically generated using %s on %s
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
+#include <botan/ec_group.h>
+
+namespace Botan {
+
+//static
+std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
+   {
+%s
+   return std::shared_ptr<EC_Group_Data>();
+   }
+
+//static
+const std::set<std::string>& EC_Group::known_named_groups()
+   {
+   static const std::set<std::string> named_groups = {
+%s
+      };
+   return named_groups;
+   }
+
+}
diff --git a/src/lib/pubkey/ec_group/ec_named.cpp b/src/lib/pubkey/ec_group/ec_named.cpp
index 7fe1517e4..fbd1f1458 100644
--- a/src/lib/pubkey/ec_group/ec_named.cpp
+++ b/src/lib/pubkey/ec_group/ec_named.cpp
@@ -1,6 +1,6 @@
 /*
-* List of ECC groups
-* (C) 2013,2018 Jack Lloyd
+* ECC Group Info
+* This file was automatically generated using ./src/scripts/gen_ec_groups.py on 2021-03-12
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
@@ -12,7 +12,7 @@ namespace Botan {
 //static
 std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
    {
-   // P-256
+   // secp256r1
    if(oid == OID{1,2,840,10045,3,1,7})
       return load_EC_group_info("0xFFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
                                 "0xFFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
@@ -22,7 +22,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0xFFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551",
                                 oid);
 
-   // P-384
+   // secp384r1
    if(oid == OID{1,3,132,0,34})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC",
@@ -31,7 +31,8 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973",
                                 oid);
-   // P-521
+
+   // secp521r1
    if(oid == OID{1,3,132,0,35})
       return load_EC_group_info("0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
                                 "0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
@@ -50,6 +51,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x1667CB477A1A8EC338F94741669C976316DA6321",
                                 "0xE95E4A5F737059DC60DF5991D45029409E60FC09",
                                 oid);
+
    // brainpool192r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,3})
       return load_EC_group_info("0xC302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
@@ -59,6 +61,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
                                 "0xC302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
                                 oid);
+
    // brainpool224r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,5})
       return load_EC_group_info("0xD7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
@@ -68,6 +71,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
                                 "0xD7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
                                 oid);
+
    // brainpool256r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,7})
       return load_EC_group_info("0xA9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
@@ -77,6 +81,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
                                 "0xA9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
                                 oid);
+
    // brainpool320r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,9})
       return load_EC_group_info("0xD35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
@@ -86,6 +91,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
                                 "0xD35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
                                 oid);
+
    // brainpool384r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,11})
       return load_EC_group_info("0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
@@ -95,6 +101,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
                                 "0x8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
                                 oid);
+
    // brainpool512r1
    if(oid == OID{1,3,36,3,3,2,8,1,1,13})
       return load_EC_group_info("0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
@@ -104,6 +111,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
                                 "0xAADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
                                 oid);
+
    // frp256v1
    if(oid == OID{1,2,250,1,223,101,256,1})
       return load_EC_group_info("0xF1FD178C0B3AD58F10126DE8CE42435B3961ADBCABC8CA6DE8FCF353D86E9C03",
@@ -113,12 +121,13 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x6142E0F7C8B204911F9271F0F3ECEF8C2701C307E8E4C9E183115A1554062CFB",
                                 "0xF1FD178C0B3AD58F10126DE8CE42435B53DC67E140D2BF941FFDD459C6D655E1",
                                 oid);
+
    // gost_256A
-   if(oid == OID{1,2,643,2,2,35,1} || oid == OID{1,2,643,2,2,36,0} || oid == OID{1,2,643,7,1,2,1,1,1})
+   if(oid == OID{1,2,643,7,1,2,1,1,1} || oid == OID{1,2,643,2,2,35,1} || oid == OID{1,2,643,2,2,36,0})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD94",
                                 "0xA6",
-                                "0x1",
+                                "1",
                                 "0x8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893",
                                 OID{1,2,643,7,1,2,1,1,1});
@@ -136,12 +145,13 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
    // secp160k1
    if(oid == OID{1,3,132,0,9})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-                                "0x0",
-                                "0x7",
+                                "0",
+                                "7",
                                 "0x3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
                                 "0x938CF935318FDCED6BC28286531733C3F03C4FEE",
                                 "0x100000000000000000001B8FA16DFAB9ACA16B6B3",
                                 oid);
+
    // secp160r1
    if(oid == OID{1,3,132,0,8})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
@@ -151,6 +161,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x23A628553168947D59DCC912042351377AC5FB32",
                                 "0x100000000000000000001F4C8F927AED3CA752257",
                                 oid);
+
    // secp160r2
    if(oid == OID{1,3,132,0,30})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
@@ -160,15 +171,17 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0xFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
                                 "0x100000000000000000000351EE786A818F3A1A16B",
                                 oid);
+
    // secp192k1
    if(oid == OID{1,3,132,0,31})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-                                "0x0",
-                                "0x3",
+                                "0",
+                                "3",
                                 "0xDB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
                                 "0x9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
                                 oid);
+
    // secp192r1
    if(oid == OID{1,2,840,10045,3,1,1})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
@@ -178,15 +191,17 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x7192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
                                 oid);
+
    // secp224k1
    if(oid == OID{1,3,132,0,32})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-                                "0x0",
-                                "0x5",
+                                "0",
+                                "5",
                                 "0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
                                 "0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
                                 "0x10000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
                                 oid);
+
    // secp224r1
    if(oid == OID{1,3,132,0,33})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
@@ -196,11 +211,12 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0xBD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
                                 oid);
+
    // secp256k1
    if(oid == OID{1,3,132,0,10})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-                                "0x0",
-                                "0x7",
+                                "0",
+                                "7",
                                 "0x79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
                                 "0x483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
@@ -215,6 +231,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0xBC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0",
                                 "0xFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6B21C6052B53BBF40939D54123",
                                 oid);
+
    // x962_p192v2
    if(oid == OID{1,2,840,10045,3,1,2})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
@@ -224,6 +241,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
                                 oid);
+
    // x962_p192v3
    if(oid == OID{1,2,840,10045,3,1,3})
       return load_EC_group_info("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
@@ -233,6 +251,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
                                 "0xFFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
                                 oid);
+
    // x962_p239v1
    if(oid == OID{1,2,840,10045,3,1,4})
       return load_EC_group_info("0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
@@ -242,6 +261,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
                                 "0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
                                 oid);
+
    // x962_p239v2
    if(oid == OID{1,2,840,10045,3,1,5})
       return load_EC_group_info("0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
@@ -251,6 +271,7 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
                                 "0x5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
                                 "0x7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
                                 oid);
+
    // x962_p239v3
    if(oid == OID{1,2,840,10045,3,1,6})
       return load_EC_group_info("0x7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
@@ -268,6 +289,16 @@ std::shared_ptr<EC_Group_Data> EC_Group::EC_group_info(const OID& oid)
 const std::set<std::string>& EC_Group::known_named_groups()
    {
    static const std::set<std::string> named_groups = {
+      "brainpool160r1",
+      "brainpool192r1",
+      "brainpool224r1",
+      "brainpool256r1",
+      "brainpool320r1",
+      "brainpool384r1",
+      "brainpool512r1",
+      "frp256v1",
+      "gost_256A",
+      "gost_512A",
       "secp160k1",
       "secp160r1",
       "secp160r2",
@@ -279,23 +310,15 @@ const std::set<std::string>& EC_Group::known_named_groups()
       "secp256r1",
       "secp384r1",
       "secp521r1",
-      "brainpool160r1",
-      "brainpool192r1",
-      "brainpool224r1",
-      "brainpool256r1",
-      "brainpool320r1",
-      "brainpool384r1",
-      "brainpool512r1",
+      "sm2p256v1",
       "x962_p192v2",
       "x962_p192v3",
       "x962_p239v1",
       "x962_p239v2",
       "x962_p239v3",
-      "gost_256A",
-      "gost_512A",
-      "frp256v1",
-      "sm2p256v1"
       };
    return named_groups;
    }
+
 }
+
diff --git a/src/scripts/gen_ec_groups.py b/src/scripts/gen_ec_groups.py
new file mode 100755
index 000000000..6f5aac04d
--- /dev/null
+++ b/src/scripts/gen_ec_groups.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+
+"""
+(C) 2021 Jack Lloyd
+
+Botan is released under the Simplified BSD License (see license.txt)
+"""
+
+import sys
+import re
+import datetime
+
+def curve_info(src):
+    re_kv = re.compile('([A-Za-z]+) = ([0-9A-Za-z-_\. ]+)')
+
+    current = {}
+
+    for line in src:
+        line = line.strip()
+        if line == '':
+            continue
+
+        kv = re_kv.match(line)
+        if kv is None:
+            raise Exception('Unknown line', line)
+
+        key = kv.group(1)
+        val = kv.group(2)
+
+        if key in ['Name']:
+            current[key] = val
+        elif key in ['OID']:
+            current[key] = val.split(' ')
+        elif key in ['A']:
+            if val == '-3':
+                current[key] = current['P'] - 3
+            else:
+                current[key] = int(val, 16)
+        elif key in ['P', 'B', 'X', 'Y', 'N']:
+            current[key] = int(val, 16)
+
+        if key == 'N':
+            yield current
+            current = {}
+
+def format_int(x):
+    if x.bit_length() <= 5:
+        return str(x)
+    return hex(x).upper().replace('0X', '0x')
+
+def print_curve(curve):
+    template_str = """   // %s
+   if(%s)
+      return load_EC_group_info("%s",
+                                "%s",
+                                "%s",
+                                "%s",
+                                "%s",
+                                "%s",
+                                %s);
+"""
+
+    name = curve['Name']
+    oids = ['OID{%s}' % (oid.replace('.', ',')) for oid in curve['OID']]
+    p = format_int(curve['P'])
+    a = format_int(curve['A'])
+    b = format_int(curve['B'])
+    x = format_int(curve['X'])
+    y = format_int(curve['Y'])
+    n = format_int(curve['N'])
+
+    oid_match = ' || '.join(['oid == %s' % oid for oid in oids])
+
+    pref_oid = 'oid' if len(oids) == 1 else oids[0]
+
+    return template_str % (name, oid_match, p, a, b, x, y, n, pref_oid)
+
+def format_names(names):
+    for nm in sorted(names):
+        yield '      \"%s\",' % (nm)
+
+def main(args = None):
+    if args is None:
+        args = sys.argv
+
+    curves = [c for c in curve_info(open('./src/build-data/ec_groups.txt'))]
+
+    template_str = open('./src/build-data/ec_named.cpp.in').read()
+
+    names = "\n".join(format_names([c['Name'] for c in curves]))
+    curves = '\n'.join([print_curve(curve) for curve in curves])
+    this_script = sys.argv[0]
+    today = datetime.date.today().strftime("%Y-%m-%d")
+
+    print(template_str % (this_script, today, curves, names))
+
+if __name__ == '__main__':
+    sys.exit(main())