add support for elliptic curves over binary fields
[openssl.git] / crypto / ec / ec_curve.c
index a2fed3d..55ce45d 100644 (file)
  * Hudson (tjh@cryptsoft.com).
  *
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * In addition, Sun covenants to all licensees who provide a reciprocal
+ * covenant with respect to their own patents if any, not to sue under
+ * current and future patent claims necessarily infringed by the making,
+ * using, practicing, selling, offering for sale and/or otherwise
+ * disposing of the Contribution as delivered hereunder 
+ * (or portions thereof), provided that such covenant shall not apply:
+ *  1) for code that a licensee deletes from the Contribution;
+ *  2) separates from the Contribution; or
+ *  3) for infringements caused by:
+ *       i) the modification of the Contribution or
+ *      ii) the combination of the Contribution with other software or
+ *          devices where such combination causes the infringement.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
 
 #include "ec_lcl.h"
 #include <openssl/err.h>
                "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",0,\
                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",1
 /* some wap/wtls curves */
-#define _EC_GROUP_WTLS_6       \
-               "DB7C2ABF62E35E668076BEAD208B",\
-               "DB7C2ABF62E35E668076BEAD2088",\
-               "659EF8BA043916EEDE8911702B22",\
-               "09487239995A5EE76B55F9C2F098",0,\
-               "DB7C2ABF62E35E7628DFAC6561C5",1
 #define _EC_GROUP_WTLS_8       \
                "FFFFFFFFFFFFFFFFFFFFFFFFFDE7",\
                "0",\
                "3",\
                "1",0,\
                "0100000000000000000001CDC98AE0E2DE574ABF33",1
+#define _EC_GROUP_WTLS_12      \
+               "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", \
+               "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", \
+               "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", \
+               "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", 0, \
+               "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1
+
+/* #define _EC_GROUP_EXAMPLE_CHAR2_CURVE       \
+ *             "prime polynomial", "a", "b", "base point x-coord", "base point y-coord", "order", "cofactor"
+ */
+#define _EC_GROUP_SECG_CHAR2_113R1 \
+               "020000000000000000000000000201", \
+               "003088250CA6E7C7FE649CE85820F7", \
+               "00E8BEE4D3E2260744188BE0E9C723", \
+               "009D73616F35F4AB1407D73562C10F", \
+               "00A52830277958EE84D1315ED31886", \
+               "0100000000000000D9CCEC8A39E56F", 2
+#define _EC_GROUP_SECG_CHAR2_113R2 \
+               "020000000000000000000000000201", \
+               "00689918DBEC7E5A0DD6DFC0AA55C7", \
+               "0095E9A9EC9B297BD4BF36E059184F", \
+               "01A57A6A7B26CA5EF52FCDB8164797", \
+               "00B3ADC94ED1FE674C06E695BABA1D", \
+               "010000000000000108789B2496AF93", 2
+#define _EC_GROUP_SECG_CHAR2_131R1 \
+               "080000000000000000000000000000010D", \
+               "07A11B09A76B562144418FF3FF8C2570B8", \
+               "0217C05610884B63B9C6C7291678F9D341", \
+               "0081BAF91FDF9833C40F9C181343638399", \
+               "078C6E7EA38C001F73C8134B1B4EF9E150", \
+               "0400000000000000023123953A9464B54D", 2
+#define _EC_GROUP_SECG_CHAR2_131R2 \
+               "080000000000000000000000000000010D", \
+               "03E5A88919D7CAFCBF415F07C2176573B2", \
+               "04B8266A46C55657AC734CE38F018F2192", \
+               "0356DCD8F2F95031AD652D23951BB366A8", \
+               "0648F06D867940A5366D9E265DE9EB240F", \
+               "0400000000000000016954A233049BA98F", 2
+#define _EC_GROUP_SECG_CHAR2_163K1 \
+               "0800000000000000000000000000000000000000C9", \
+               "1", \
+               "1", \
+               "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8", \
+               "0289070FB05D38FF58321F2E800536D538CCDAA3D9", \
+               "04000000000000000000020108A2E0CC0D99F8A5EF", 2
+#define _EC_GROUP_SECG_CHAR2_163R1 \
+               "0800000000000000000000000000000000000000C9", \
+               "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2", \
+               "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9", \
+               "0369979697AB43897789566789567F787A7876A654", \
+               "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883", \
+               "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2
+#define _EC_GROUP_SECG_CHAR2_163R2 \
+               "0800000000000000000000000000000000000000C9", \
+               "1", \
+               "020A601907B8C953CA1481EB10512F78744A3205FD", \
+               "03F0EBA16286A2D57EA0991168D4994637E8343E36", \
+               "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1", \
+               "040000000000000000000292FE77E70C12A4234C33", 2
+#define _EC_GROUP_SECG_CHAR2_193R1 \
+               "02000000000000000000000000000000000000000000008001", \
+               "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01", \
+               "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814", \
+               "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1", \
+               "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05", \
+               "01000000000000000000000000C7F34A778F443ACC920EBA49", 2
+#define _EC_GROUP_SECG_CHAR2_193R2 \
+               "02000000000000000000000000000000000000000000008001", \
+               "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B", \
+               "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE", \
+               "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F", \
+               "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C", \
+               "010000000000000000000000015AAB561B005413CCD4EE99D5", 2
+#define _EC_GROUP_SECG_CHAR2_233K1 \
+               "020000000000000000000000000000000000000004000000000000000001", \
+               "0", \
+               "1", \
+               "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126", \
+               "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3", \
+               "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4
+#define _EC_GROUP_SECG_CHAR2_233R1 \
+               "020000000000000000000000000000000000000004000000000000000001", \
+               "000000000000000000000000000000000000000000000000000000000001", \
+               "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD", \
+               "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B", \
+               "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052", \
+               "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2
+#define _EC_GROUP_SECG_CHAR2_239K1 \
+               "800000000000000000004000000000000000000000000000000000000001", \
+               "0", \
+               "1", \
+               "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC", \
+               "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA", \
+               "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4
+#define _EC_GROUP_SECG_CHAR2_283K1 \
+               "0800000000000000000000000000000000000000000000000000000000000000000010A1", \
+               "0", \
+               "1", \
+               "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836", \
+               "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259", \
+               "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", 4
+#define _EC_GROUP_SECG_CHAR2_283R1 \
+               "0800000000000000000000000000000000000000000000000000000000000000000010A1", \
+               "000000000000000000000000000000000000000000000000000000000000000000000001", \
+               "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5", \
+               "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053", \
+               "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4", \
+               "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", 2
+#define _EC_GROUP_SECG_CHAR2_409K1 \
+               "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", \
+               "0", \
+               "1", \
+               "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746", \
+               "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B", \
+               "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", 4
+
+#define _EC_GROUP_SECG_CHAR2_409R1 \
+               "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001", \
+               "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", \
+               "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F", \
+               "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7", \
+               "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706", \
+               "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", 2
+#define _EC_GROUP_SECG_CHAR2_571K1 \
+               "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", \
+               "0", \
+               "1", \
+               "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972", \
+               "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3", \
+               "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", 4
+#define _EC_GROUP_SECG_CHAR2_571R1 \
+               "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425", \
+               "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", \
+               "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A", \
+               "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19", \
+               "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B", \
+               "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", 2
+
+#define _EC_GROUP_X9_62_CHAR2_163V1 \
+               "0800000000000000000000000000000000000000C9", \
+               "072546B5435234A422E0789675F432C89435DE5242", \
+               "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9", \
+               "07AF69989546103D79329FCC3D74880F33BBE803CB", \
+               "0190C402D65BCC2B845337BC52352774E879B94B0D", \
+               "0400000000000000000001E60FC8821CC74DAEAFC1", 2
+#define _EC_GROUP_X9_62_CHAR2_163V2 \
+               "0800000000000000000000000000000000000000C9", \
+               "0108B39E77C4B108BED981ED0E890E117C511CF072", \
+               "0667ACEB38AF4E488C407433FFAE4F1C811638DF20", \
+               "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5", \
+               "01F64F1C0280E19A062003DBAECEAEDEC1CE141D41", \
+               "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2
+#define _EC_GROUP_X9_62_CHAR2_163V3 \
+               "0800000000000000000000000000000000000000C9", \
+               "07A526C63D3E25A256A007699F5447E32AE456B50E", \
+               "03F7061798EB99E238FD6F1BF95B48FEEB4854252B", \
+               "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB", \
+               "01D42417D750A363F61E455807D047059CA039ACFE", \
+               "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2
+#define _EC_GROUP_X9_62_CHAR2_176V1 \
+               "0100000000000000000000000000000000080000000007", \
+               "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B", \
+               "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2", \
+               "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798", \
+               "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C", \
+               "00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E
+#define _EC_GROUP_X9_62_CHAR2_191V1 \
+               "800000000000000000000000000000000000000000000201", \
+               "2866537B676752636A68F56554E12640276B649EF7526267", \
+               "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC", \
+               "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D", \
+               "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB", \
+               "40000000000000000000000004A20E90C39067C893BBB9A5", 2
+#define _EC_GROUP_X9_62_CHAR2_191V2 \
+               "800000000000000000000000000000000000000000000201", \
+               "401028774D7777C7B7666D1366EA432071274F89FF01E718", \
+               "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01", \
+               "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10", \
+               "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A", \
+               "20000000000000000000000050508CB89F652824E06B8173", 4
+#define _EC_GROUP_X9_62_CHAR2_191V3 \
+               "800000000000000000000000000000000000000000000201", \
+               "6C01074756099122221056911C77D77E77A777E7E7E77FCB", \
+               "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8", \
+               "375D4CE24FDE434489DE8746E71786015009E66E38A926DD", \
+               "545A39176196575D985999366E6AD34CE0A77CD7127B06BE", \
+               "155555555555555555555555610C0B196812BFB6288A3EA3", 6
+#define _EC_GROUP_X9_62_CHAR2_208W1 \
+               "010000000000000000000000000000000800000000000000000007", \
+               "0000000000000000000000000000000000000000000000000000", \
+               "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E", \
+               "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A", \
+               "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3", \
+               "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48
+#define _EC_GROUP_X9_62_CHAR2_239V1 \
+               "800000000000000000000000000000000000000000000000001000000001", \
+               "32010857077C5431123A46B808906756F543423E8D27877578125778AC76", \
+               "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", \
+               "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D", \
+               "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305", \
+               "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4
+#define _EC_GROUP_X9_62_CHAR2_239V2 \
+               "800000000000000000000000000000000000000000000000001000000001", \
+               "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F", \
+               "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B", \
+               "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205", \
+               "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833", \
+               "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6
+#define _EC_GROUP_X9_62_CHAR2_239V3 \
+               "800000000000000000000000000000000000000000000000001000000001", \
+               "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F", \
+               "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40", \
+               "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92", \
+               "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461", \
+               "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA
+#define _EC_GROUP_X9_62_CHAR2_272W1 \
+               "010000000000000000000000000000000000000000000000000000010000000000000B", \
+               "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20", \
+               "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7", \
+               "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D", \
+               "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23", \
+               "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521", 0xFF06
+#define _EC_GROUP_X9_62_CHAR2_304W1 \
+               "010000000000000000000000000000000000000000000000000000000000000000000000000807", \
+               "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681", \
+               "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE", \
+               "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614", \
+               "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B", \
+               "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", 0xFE2E
+#define _EC_GROUP_X9_62_CHAR2_359V1 \
+               "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001", \
+               "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557", \
+               "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988", \
+               "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097", \
+               "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD", \
+               "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", 0x4C
+#define _EC_GROUP_X9_62_CHAR2_368W1 \
+               "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007", \
+               "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D", \
+               "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A", \
+               "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F", \
+               "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310", \
+               "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", 0xFF70
+#define _EC_GROUP_X9_62_CHAR2_431R1 \
+               "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001", \
+               "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F", \
+               "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618", \
+               "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7", \
+               "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760", \
+               "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", 0x2760
+
+#define _EC_GROUP_WTLS_1 \
+               "020000000000000000000000000201", \
+               "1", \
+               "1", \
+               "01667979A40BA497E5D5C270780617", \
+               "00F44B4AF1ECC2630E08785CEBCC15", \
+               "00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2
 
 static EC_GROUP *ec_group_new_GFp_from_hex(const char *prime_in,
            const char *a_in, const char *b_in,
@@ -256,6 +534,54 @@ err:
        return(group);
        }
 
+static EC_GROUP *ec_group_new_GF2m_from_hex(const char *prime_in,
+           const char *a_in, const char *b_in,
+           const char *x_in, const char *y_in, const char *order_in, const BN_ULONG cofac_in)
+       {
+       EC_GROUP *group=NULL;
+       EC_POINT *P=NULL;
+       BN_CTX   *ctx=NULL;
+       BIGNUM   *prime=NULL,*a=NULL,*b=NULL,*x=NULL,*y=NULL,*order=NULL;
+       int      ok=0;
+
+       if ((ctx = BN_CTX_new()) == NULL) goto bn_err;
+       if ((prime = BN_new()) == NULL || (a = BN_new()) == NULL || (b = BN_new()) == NULL ||
+               (x = BN_new()) == NULL || (y = BN_new()) == NULL || (order = BN_new()) == NULL) goto bn_err;
+       
+       if (!BN_hex2bn(&prime, prime_in)) goto bn_err;
+       if (!BN_hex2bn(&a, a_in)) goto bn_err;
+       if (!BN_hex2bn(&b, b_in)) goto bn_err;
+
+       if ((group = EC_GROUP_new_curve_GF2m(prime, a, b, ctx)) == NULL) goto err;
+       if ((P = EC_POINT_new(group)) == NULL) goto err;
+       
+       if (!BN_hex2bn(&x, x_in)) goto bn_err;
+       if (!BN_hex2bn(&y, y_in)) goto bn_err;
+       if (!EC_POINT_set_affine_coordinates_GF2m(group, P, x, y, ctx)) goto err;
+       if (!BN_hex2bn(&order, order_in)) goto bn_err;
+       if (!BN_set_word(x, cofac_in)) goto bn_err;
+       if (!EC_GROUP_set_generator(group, P, order, x)) goto err;
+       ok=1;
+bn_err:
+       if (!ok)
+               ECerr(EC_F_EC_GROUP_NEW_GF2M_FROM_HEX, ERR_R_BN_LIB);
+err:
+       if (!ok)
+               {
+               EC_GROUP_free(group);
+               group = NULL;
+               }
+       if (P)     EC_POINT_free(P);
+       if (ctx)   BN_CTX_free(ctx);
+       if (prime) BN_free(prime);
+       if (a)     BN_free(a);
+       if (b)     BN_free(b);
+       if (order) BN_free(order);
+       if (x)     BN_free(x);
+       if (y)     BN_free(y);
+       return(group);
+       }
+
 EC_GROUP *EC_GROUP_new_by_name(int name)
        {
        EC_GROUP *ret = NULL;
@@ -263,86 +589,272 @@ EC_GROUP *EC_GROUP_new_by_name(int name)
                {
        case EC_GROUP_NO_CURVE:
                return NULL;
-       /* some nist curves */
-       case EC_GROUP_NIST_PRIME_224: /* EC_GROUP_NIST_PRIME_224 == EC_GROUP_SECG_PRIME_224R1 */
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_224);
-               break;
 
-       case EC_GROUP_NIST_PRIME_384: /* EC_GROUP_NIST_PRIME_384 == EC_GROUP_SECG_PRIME_384R1 */
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_384);
+       /* prime field curves */        
+       /* prime field curves of degree 112 */
+       case EC_GROUP_SECG_PRIME_112R1:
+       case EC_GROUP_WTLS_6:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_112R1);
                break;
-
-       case EC_GROUP_NIST_PRIME_521: /* EC_GROUP_NIST_PRIME_521 == EC_GROUP_SECG_PRIME_521R1 */
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_521);
+               
+       case EC_GROUP_SECG_PRIME_112R2:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_112R2);
+               break;
+               
+       case EC_GROUP_WTLS_8:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_8);
+               break;
+               
+       /* prime field curves of degree 128 */
+       case EC_GROUP_SECG_PRIME_128R1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_128R1);
                break;
-       /* x9.62 prime curves */
+               
+       case EC_GROUP_SECG_PRIME_128R2:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_128R2);
+               break;
+               
+       /* prime field curves of degree 160 */
+       case EC_GROUP_SECG_PRIME_160K1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160K1);
+               break;
+               
+       case EC_GROUP_SECG_PRIME_160R1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160R1);
+               break;
+               
+       case EC_GROUP_SECG_PRIME_160R2:
+       case EC_GROUP_WTLS_7:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160R2);
+               break;
+               
+       case EC_GROUP_WTLS_9:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_9);
+               break;
+               
+       /* prime field curves of degree 192 */
+       case EC_GROUP_SECG_PRIME_192K1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_192K1);
+               break;
+               
        case EC_GROUP_X9_62_PRIME_192V1: /* == EC_GROUP_NIST_PRIME_192 == EC_GROUP_SECG_PRIME_192R1 */
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_192);
                break;
-
+               
        case EC_GROUP_X9_62_PRIME_192V2:
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_192V2);
                break;
-
+               
        case EC_GROUP_X9_62_PRIME_192V3:
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_192V3);
                break;
-
+               
+       /* prime field curves of degree 224 */
+       case EC_GROUP_SECG_PRIME_224K1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_224K1);
+               break;
+               
+       case EC_GROUP_SECG_PRIME_224R1: /* == EC_GROUP_NIST_PRIME_224 */
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_224);
+               break;
+               
+       case EC_GROUP_WTLS_12:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_12);
+               break;
+       
+       /* prime field curves of degree 239 */
        case EC_GROUP_X9_62_PRIME_239V1:
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_239V1);
                break;
-
+               
        case EC_GROUP_X9_62_PRIME_239V2:
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_239V2);
                break;
-
+               
        case EC_GROUP_X9_62_PRIME_239V3:
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_239V3);
                break;
-
-       case EC_GROUP_X9_62_PRIME_256V1: /* == EC_GROUP_NIST_PRIME_256 == EC_GROUP_SECG_PRIME_256R1 */
+               
+       /* prime field curves of degree 256 */
+       case EC_GROUP_SECG_PRIME_256K1:
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_256K1);
+               break;
+               
+       case EC_GROUP_SECG_PRIME_256R1: /* == EC_GROUP_NIST_PRIME_256 == EC_GROUP_X9_62_PRIME_256V1 */
                ret = ec_group_new_GFp_from_hex(_EC_GROUP_X9_62_PRIME_256V1);
                break;
-       /* the remaining secg curves */
-       case EC_GROUP_SECG_PRIME_112R1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_112R1);
+               
+       /* prime field curves of degree 384 */
+       case EC_GROUP_SECG_PRIME_384R1: /* == EC_GROUP_NIST_PRIME_384 */
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_384);
                break;
-       case EC_GROUP_SECG_PRIME_112R2:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_112R2);
+               
+       /* prime field curves of degree 521 */
+       case EC_GROUP_SECG_PRIME_521R1: /* == EC_GROUP_NIST_PRIME_521 */
+               ret = ec_group_new_GFp_from_hex(_EC_GROUP_NIST_PRIME_521);
                break;
-       case EC_GROUP_SECG_PRIME_128R1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_128R1);
+       
+       /* characteristic two field curves */
+       /* binary curves of degree 113 */
+       case EC_GROUP_SECG_CHAR2_113R1:
+       case EC_GROUP_WTLS_4:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_113R1);
                break;
-       case EC_GROUP_SECG_PRIME_128R2:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_128R2);
+       
+       case EC_GROUP_SECG_CHAR2_113R2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_113R2);
                break;
-       case EC_GROUP_SECG_PRIME_160K1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160K1);
+       
+       case EC_GROUP_WTLS_1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_WTLS_1);
                break;
-       case EC_GROUP_SECG_PRIME_160R1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160R1);
+
+       /* binary curves of degree 131 */
+       case EC_GROUP_SECG_CHAR2_131R1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_131R1);
                break;
-       case EC_GROUP_SECG_PRIME_160R2:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_160R2);
+       
+       case EC_GROUP_SECG_CHAR2_131R2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_131R2);
                break;
-       case EC_GROUP_SECG_PRIME_192K1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_192K1);
+
+       /* binary curves of degree 163 */
+       case EC_GROUP_SECG_CHAR2_163K1: /* == EC_GROUP_NIST_CHAR2_K163 */
+       case EC_GROUP_WTLS_3:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_163K1);
                break;
-       case EC_GROUP_SECG_PRIME_224K1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_224K1);
+
+       case EC_GROUP_SECG_CHAR2_163R1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_163R1);
                break;
-       case EC_GROUP_SECG_PRIME_256K1:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_SECG_PRIME_256K1);
+
+       case EC_GROUP_SECG_CHAR2_163R2: /* == EC_GROUP_NIST_CHAR2_B163 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_163R2);
                break;
-       /* some wap/wtls curves */
-       case EC_GROUP_WTLS_6:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_6);
+
+       case EC_GROUP_X9_62_CHAR2_163V1:
+       case EC_GROUP_WTLS_5:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_163V1);
                break;
-       case EC_GROUP_WTLS_8:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_8);
+
+       case EC_GROUP_X9_62_CHAR2_163V2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_163V2);
                break;
-       case EC_GROUP_WTLS_9:
-               ret = ec_group_new_GFp_from_hex(_EC_GROUP_WTLS_9);
+
+       case EC_GROUP_X9_62_CHAR2_163V3:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_163V3);
+               break;
+
+       /* binary curves of degree 176 */
+       case EC_GROUP_X9_62_CHAR2_176V1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_176V1);
+               break;
+       
+       /* binary curves of degree 191 */
+       case EC_GROUP_X9_62_CHAR2_191V1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_191V1);
+               break;
+       
+       case EC_GROUP_X9_62_CHAR2_191V2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_191V2);
+               break;
+       
+       case EC_GROUP_X9_62_CHAR2_191V3:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_191V3);
+               break;
+
+       /* binary curves of degree 193 */
+       case EC_GROUP_SECG_CHAR2_193R1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_193R1);
+               break;
+
+       case EC_GROUP_SECG_CHAR2_193R2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_193R2);
+               break;
+
+       /* binary curves of degree 208 */
+       case EC_GROUP_X9_62_CHAR2_208W1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_208W1);
+               break;
+
+       /* binary curves of degree 233 */
+       case EC_GROUP_SECG_CHAR2_233K1: /* == EC_GROUP_NIST_CHAR2_K233 */
+       case EC_GROUP_WTLS_10:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_233K1);
+               break;
+
+       case EC_GROUP_SECG_CHAR2_233R1: /* == EC_GROUP_NIST_CHAR2_B233 */
+       case EC_GROUP_WTLS_11:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_233R1);
+               break;
+
+       /* binary curves of degree 239 */
+       case EC_GROUP_SECG_CHAR2_239K1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_239K1);
+               break;
+
+       case EC_GROUP_X9_62_CHAR2_239V1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_239V1);
+               break;
+       
+       case EC_GROUP_X9_62_CHAR2_239V2:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_239V2);
+               break;
+       
+       case EC_GROUP_X9_62_CHAR2_239V3:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_239V3);
+               break;
+
+       /* binary curves of degree 272 */
+       case EC_GROUP_X9_62_CHAR2_272W1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_272W1);
+               break;
+
+       /* binary curves of degree 283 */
+       case EC_GROUP_SECG_CHAR2_283K1: /* == EC_GROUP_NIST_CHAR2_K283 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_283K1);
+               break;
+
+       case EC_GROUP_SECG_CHAR2_283R1: /* == EC_GROUP_NIST_CHAR2_B283 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_283R1);
+               break;
+
+       /* binary curves of degree 304 */
+       case EC_GROUP_X9_62_CHAR2_304W1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_304W1);
+               break;
+
+       /* binary curves of degree 359 */
+       case EC_GROUP_X9_62_CHAR2_359V1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_359V1);
+               break;
+
+       /* binary curves of degree 368 */
+       case EC_GROUP_X9_62_CHAR2_368W1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_368W1);
+               break;
+
+       /* binary curves of degree 409 */
+       case EC_GROUP_SECG_CHAR2_409K1: /* == EC_GROUP_NIST_CHAR2_K409 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_409K1);
+               break;
+
+       case EC_GROUP_SECG_CHAR2_409R1: /* == EC_GROUP_NIST_CHAR2_B409 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_409R1);
+               break;
+
+       /* binary curves of degree 431 */
+       case EC_GROUP_X9_62_CHAR2_431R1:
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_X9_62_CHAR2_431R1);
+               break;
+
+       /* binary curves of degree 571 */
+       case EC_GROUP_SECG_CHAR2_571K1: /* == EC_GROUP_NIST_CHAR2_K571 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_571K1);
+               break;
+
+       case EC_GROUP_SECG_CHAR2_571R1: /* == EC_GROUP_NIST_CHAR2_B571 */
+               ret = ec_group_new_GF2m_from_hex(_EC_GROUP_SECG_CHAR2_571R1);
                break;
 
                }