Fix source where indent will not be able to cope
[openssl.git] / crypto / ec / ec_curve.c
index 0b9b7ca..ec73b1b 100644 (file)
@@ -3,7 +3,7 @@
  * Written by Nils Larsch for the OpenSSL project.
  */
 /* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2010 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  */
 
+
+
+#include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
+#include <openssl/opensslconf.h>
 
-typedef struct ec_curve_data_st {
-       int     field_type;     /* either NID_X9_62_prime_field or
+typedef struct {
+       int     field_type,     /* either NID_X9_62_prime_field or
                                 * NID_X9_62_characteristic_two_field */
-       const char *p;          /* either a prime number or a polynomial */
-       const char *a;
-       const char *b;
-       const char *x;          /* the x coordinate of the generator */
-       const char *y;          /* the y coordinate of the generator */
-       const char *order;      /* the order of the group generated by the
-                                * generator */
-       const BN_ULONG cofactor;/* the cofactor */
-       const unsigned char *seed;/* the seed (optional) */
-       size_t  seed_len;
-       const char *comment;    /* a short (less than 80 characters)
-                                * description of the curve */
+               seed_len,
+               param_len;
+       unsigned int cofactor;  /* promoted to BN_ULONG */
 } EC_CURVE_DATA;
 
 /* the nist prime curves */
-static const unsigned char _EC_NIST_PRIME_192_SEED[] = {
-       0x30,0x45,0xAE,0x6F,0xC8,0x42,0x2F,0x64,0xED,0x57,
-       0x95,0x28,0xD3,0x81,0x20,0xEA,0xE1,0x21,0x96,0xD5};
-static const EC_CURVE_DATA _EC_NIST_PRIME_192 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-       "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-       "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-       "07192b95ffc8da78631011ed6b24cdd573f977a11e794811",
-       "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",1,
-       _EC_NIST_PRIME_192_SEED, 20,
-       "192 bit prime curve from X9.62 and SECG"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_NIST_PRIME_192 = {
+       { NID_X9_62_prime_field,20,24,1 },
+       {
+         /* seed */
+         0x30,0x45,0xAE,0x6F,0xC8,0x42,0x2F,0x64,0xED,0x57,
+         0x95,0x28,0xD3,0x81,0x20,0xEA,0xE1,0x21,0x96,0xD5,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0x64,0x21,0x05,0x19,0xE5,0x9C,0x80,0xE7,0x0F,0xA7,
+         0xE9,0xAB,0x72,0x24,0x30,0x49,0xFE,0xB8,0xDE,0xEC,
+         0xC1,0x46,0xB9,0xB1,
+
+         /* x */
+         0x18,0x8D,0xA8,0x0E,0xB0,0x30,0x90,0xF6,0x7C,0xBF,
+         0x20,0xEB,0x43,0xA1,0x88,0x00,0xF4,0xFF,0x0A,0xFD,
+         0x82,0xFF,0x10,0x12,
+
+         /* y */
+         0x07,0x19,0x2b,0x95,0xff,0xc8,0xda,0x78,0x63,0x10,
+         0x11,0xed,0x6b,0x24,0xcd,0xd5,0x73,0xf9,0x77,0xa1,
+         0x1e,0x79,0x48,0x11,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x99,0xDE,0xF8,0x36,0x14,0x6B,0xC9,0xB1,
+         0xB4,0xD2,0x28,0x31 }
        };
 
-static const unsigned char _EC_NIST_PRIME_224_SEED[] = {
-       0xBD,0x71,0x34,0x47,0x99,0xD5,0xC7,0xFC,0xDC,0x45,
-       0xB5,0x9F,0xA3,0xB9,0xAB,0x8F,0x6A,0x94,0x8B,0xC5};
-static const EC_CURVE_DATA _EC_NIST_PRIME_224 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-       "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-       "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-       "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",1,
-       _EC_NIST_PRIME_224_SEED, 20,
-       "SECG/NIST recommended curve over a 224 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+28*6]; }
+       _EC_NIST_PRIME_224 = {
+       { NID_X9_62_prime_field,20,28,1 },
+       { 
+         /* seed */
+         0xBD,0x71,0x34,0x47,0x99,0xD5,0xC7,0xFC,0xDC,0x45,
+         0xB5,0x9F,0xA3,0xB9,0xAB,0x8F,0x6A,0x94,0x8B,0xC5,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,
+
+         /* b */
+         0xB4,0x05,0x0A,0x85,0x0C,0x04,0xB3,0xAB,0xF5,0x41,
+         0x32,0x56,0x50,0x44,0xB0,0xB7,0xD7,0xBF,0xD8,0xBA,
+         0x27,0x0B,0x39,0x43,0x23,0x55,0xFF,0xB4,
+
+         /* x */
+         0xB7,0x0E,0x0C,0xBD,0x6B,0xB4,0xBF,0x7F,0x32,0x13,
+         0x90,0xB9,0x4A,0x03,0xC1,0xD3,0x56,0xC2,0x11,0x22,
+         0x34,0x32,0x80,0xD6,0x11,0x5C,0x1D,0x21,
+
+         /* y */
+         0xbd,0x37,0x63,0x88,0xb5,0xf7,0x23,0xfb,0x4c,0x22,
+         0xdf,0xe6,0xcd,0x43,0x75,0xa0,0x5a,0x07,0x47,0x64,
+         0x44,0xd5,0x81,0x99,0x85,0x00,0x7e,0x34,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0x16,0xA2,0xE0,0xB8,0xF0,0x3E,
+         0x13,0xDD,0x29,0x45,0x5C,0x5C,0x2A,0x3D }
        };
 
-static const unsigned char _EC_NIST_PRIME_384_SEED[] = {
-       0xA3,0x35,0x92,0x6A,0xA3,0x19,0xA2,0x7A,0x1D,0x00,
-       0x89,0x6A,0x67,0x73,0xA4,0x82,0x7A,0xCD,0xAC,0x73};
-static const EC_CURVE_DATA _EC_NIST_PRIME_384 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFF"
-       "FFF0000000000000000FFFFFFFF",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFF"
-       "FFF0000000000000000FFFFFFFC",
-       "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC6563"
-       "98D8A2ED19D2A85C8EDD3EC2AEF",
-       "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F"
-       "25DBF55296C3A545E3872760AB7",
-       "3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b"
-       "1ce1d7e819d7a431d7c90ea0e5f",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0"
-       "DB248B0A77AECEC196ACCC52973",1,
-       _EC_NIST_PRIME_384_SEED, 20,
-       "SECG/NIST recommended curve over a 384 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+48*6]; }
+       _EC_NIST_PRIME_384 = {
+       { NID_X9_62_prime_field,20,48,1 },
+       { 
+         /* seed */
+         0xA3,0x35,0x92,0x6A,0xA3,0x19,0xA2,0x7A,0x1D,0x00,
+         0x89,0x6A,0x67,0x73,0xA4,0x82,0x7A,0xCD,0xAC,0x73,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,
+         
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFC,
+         /* b */
+         0xB3,0x31,0x2F,0xA7,0xE2,0x3E,0xE7,0xE4,0x98,0x8E,
+         0x05,0x6B,0xE3,0xF8,0x2D,0x19,0x18,0x1D,0x9C,0x6E,
+         0xFE,0x81,0x41,0x12,0x03,0x14,0x08,0x8F,0x50,0x13,
+         0x87,0x5A,0xC6,0x56,0x39,0x8D,0x8A,0x2E,0xD1,0x9D,
+         0x2A,0x85,0xC8,0xED,0xD3,0xEC,0x2A,0xEF,
+         /* x */
+         0xAA,0x87,0xCA,0x22,0xBE,0x8B,0x05,0x37,0x8E,0xB1,
+         0xC7,0x1E,0xF3,0x20,0xAD,0x74,0x6E,0x1D,0x3B,0x62,
+         0x8B,0xA7,0x9B,0x98,0x59,0xF7,0x41,0xE0,0x82,0x54,
+         0x2A,0x38,0x55,0x02,0xF2,0x5D,0xBF,0x55,0x29,0x6C,
+         0x3A,0x54,0x5E,0x38,0x72,0x76,0x0A,0xB7,
+         /* y */
+         0x36,0x17,0xde,0x4a,0x96,0x26,0x2c,0x6f,0x5d,0x9e,
+         0x98,0xbf,0x92,0x92,0xdc,0x29,0xf8,0xf4,0x1d,0xbd,
+         0x28,0x9a,0x14,0x7c,0xe9,0xda,0x31,0x13,0xb5,0xf0,
+         0xb8,0xc0,0x0a,0x60,0xb1,0xce,0x1d,0x7e,0x81,0x9d,
+         0x7a,0x43,0x1d,0x7c,0x90,0xea,0x0e,0x5f,
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xC7,0x63,0x4D,0x81,0xF4,0x37,
+         0x2D,0xDF,0x58,0x1A,0x0D,0xB2,0x48,0xB0,0xA7,0x7A,
+         0xEC,0xEC,0x19,0x6A,0xCC,0xC5,0x29,0x73 }
        };
 
-static const unsigned char _EC_NIST_PRIME_521_SEED[] = {
-       0xD0,0x9E,0x88,0x00,0x29,0x1C,0xB8,0x53,0x96,0xCC,
-       0x67,0x17,0x39,0x32,0x84,0xAA,0xA0,0xDA,0x64,0xBA};
-static const EC_CURVE_DATA _EC_NIST_PRIME_521 = {
-       NID_X9_62_prime_field,
-       "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
-       "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
-       "051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156"
-       "193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
-       "C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14"
-       "B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66",
-       "011839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c9"
-       "7ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650",
-       "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51"
-       "868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",1,
-       _EC_NIST_PRIME_521_SEED, 20,
-       "SECG/NIST recommended curve over a 521 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+66*6]; }
+       _EC_NIST_PRIME_521 = {
+       { NID_X9_62_prime_field,20,66,1 },
+       { 
+         /* seed */
+         0xD0,0x9E,0x88,0x00,0x29,0x1C,0xB8,0x53,0x96,0xCC,
+         0x67,0x17,0x39,0x32,0x84,0xAA,0xA0,0xDA,0x64,0xBA,
+
+         /* p */
+         0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         
+         /* a */
+         0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,
+         
+         /* b */
+         0x00,0x51,0x95,0x3E,0xB9,0x61,0x8E,0x1C,0x9A,0x1F,
+         0x92,0x9A,0x21,0xA0,0xB6,0x85,0x40,0xEE,0xA2,0xDA,
+         0x72,0x5B,0x99,0xB3,0x15,0xF3,0xB8,0xB4,0x89,0x91,
+         0x8E,0xF1,0x09,0xE1,0x56,0x19,0x39,0x51,0xEC,0x7E,
+         0x93,0x7B,0x16,0x52,0xC0,0xBD,0x3B,0xB1,0xBF,0x07,
+         0x35,0x73,0xDF,0x88,0x3D,0x2C,0x34,0xF1,0xEF,0x45,
+         0x1F,0xD4,0x6B,0x50,0x3F,0x00,
+         
+         /* x */
+         0x00,0xC6,0x85,0x8E,0x06,0xB7,0x04,0x04,0xE9,0xCD,
+         0x9E,0x3E,0xCB,0x66,0x23,0x95,0xB4,0x42,0x9C,0x64,
+         0x81,0x39,0x05,0x3F,0xB5,0x21,0xF8,0x28,0xAF,0x60,
+         0x6B,0x4D,0x3D,0xBA,0xA1,0x4B,0x5E,0x77,0xEF,0xE7,
+         0x59,0x28,0xFE,0x1D,0xC1,0x27,0xA2,0xFF,0xA8,0xDE,
+         0x33,0x48,0xB3,0xC1,0x85,0x6A,0x42,0x9B,0xF9,0x7E,
+         0x7E,0x31,0xC2,0xE5,0xBD,0x66,
+         
+         /* y */
+         0x01,0x18,0x39,0x29,0x6a,0x78,0x9a,0x3b,0xc0,0x04,
+         0x5c,0x8a,0x5f,0xb4,0x2c,0x7d,0x1b,0xd9,0x98,0xf5,
+         0x44,0x49,0x57,0x9b,0x44,0x68,0x17,0xaf,0xbd,0x17,
+         0x27,0x3e,0x66,0x2c,0x97,0xee,0x72,0x99,0x5e,0xf4,
+         0x26,0x40,0xc5,0x50,0xb9,0x01,0x3f,0xad,0x07,0x61,
+         0x35,0x3c,0x70,0x86,0xa2,0x72,0xc2,0x40,0x88,0xbe,
+         0x94,0x76,0x9f,0xd1,0x66,0x50,
+         
+         /* order */
+         0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFA,0x51,0x86,0x87,0x83,0xBF,0x2F,
+         0x96,0x6B,0x7F,0xCC,0x01,0x48,0xF7,0x09,0xA5,0xD0,
+         0x3B,0xB5,0xC9,0xB8,0x89,0x9C,0x47,0xAE,0xBB,0x6F,
+         0xB7,0x1E,0x91,0x38,0x64,0x09 }
        };
+
 /* the x9.62 prime curves (minus the nist prime curves) */
-static const unsigned char _EC_X9_62_PRIME_192V2_SEED[] = {
-       0x31,0xA9,0x2E,0xE2,0x02,0x9F,0xD1,0x0D,0x90,0x1B,
-       0x11,0x3E,0x99,0x07,0x10,0xF0,0xD2,0x1A,0xC6,0xB6};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_192V2 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-       "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
-       "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
-       "6574d11d69b6ec7a672bb82a083df2f2b0847de970b2de15",
-       "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",1,
-       _EC_X9_62_PRIME_192V2_SEED, 20,
-       "192 bit prime curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_X9_62_PRIME_192V2 = {
+       { NID_X9_62_prime_field,20,24,1 },
+       { 
+         /* seed */
+         0x31,0xA9,0x2E,0xE2,0x02,0x9F,0xD1,0x0D,0x90,0x1B,    
+         0x11,0x3E,0x99,0x07,0x10,0xF0,0xD2,0x1A,0xC6,0xB6,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,
+         
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0xCC,0x22,0xD6,0xDF,0xB9,0x5C,0x6B,0x25,0xE4,0x9C,    
+         0x0D,0x63,0x64,0xA4,0xE5,0x98,0x0C,0x39,0x3A,0xA2,
+         0x16,0x68,0xD9,0x53,
+
+         /* x */
+         0xEE,0xA2,0xBA,0xE7,0xE1,0x49,0x78,0x42,0xF2,0xDE,    
+         0x77,0x69,0xCF,0xE9,0xC9,0x89,0xC0,0x72,0xAD,0x69,
+         0x6F,0x48,0x03,0x4A,
+
+         /* y */
+         0x65,0x74,0xd1,0x1d,0x69,0xb6,0xec,0x7a,0x67,0x2b,    
+         0xb8,0x2a,0x08,0x3d,0xf2,0xf2,0xb0,0x84,0x7d,0xe9,
+         0x70,0xb2,0xde,0x15,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFE,0x5F,0xB1,0xA7,0x24,0xDC,0x80,0x41,0x86,
+         0x48,0xD8,0xDD,0x31 }
        };
 
-static const unsigned char _EC_X9_62_PRIME_192V3_SEED[] = {
-       0xC4,0x69,0x68,0x44,0x35,0xDE,0xB3,0x78,0xC4,0xB6,
-       0x5C,0xA9,0x59,0x1E,0x2A,0x57,0x63,0x05,0x9A,0x2E};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_192V3 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-       "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
-       "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
-       "38a90f22637337334b49dcb66a6dc8f9978aca7648a943b0",
-       "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",1,
-       _EC_X9_62_PRIME_192V3_SEED, 20,
-       "192 bit prime curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_X9_62_PRIME_192V3 = {
+       { NID_X9_62_prime_field,20,24,1 },
+       { 
+         /* seed */
+         0xC4,0x69,0x68,0x44,0x35,0xDE,0xB3,0x78,0xC4,0xB6,    
+         0x5C,0xA9,0x59,0x1E,0x2A,0x57,0x63,0x05,0x9A,0x2E,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0x22,0x12,0x3D,0xC2,0x39,0x5A,0x05,0xCA,0xA7,0x42,    
+         0x3D,0xAE,0xCC,0xC9,0x47,0x60,0xA7,0xD4,0x62,0x25,
+         0x6B,0xD5,0x69,0x16,
+
+         /* x */
+         0x7D,0x29,0x77,0x81,0x00,0xC6,0x5A,0x1D,0xA1,0x78,    
+         0x37,0x16,0x58,0x8D,0xCE,0x2B,0x8B,0x4A,0xEE,0x8E,
+         0x22,0x8F,0x18,0x96,
+
+         /* y */
+         0x38,0xa9,0x0f,0x22,0x63,0x73,0x37,0x33,0x4b,0x49,    
+         0xdc,0xb6,0x6a,0x6d,0xc8,0xf9,0x97,0x8a,0xca,0x76,
+         0x48,0xa9,0x43,0xb0,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,    
+         0xFF,0xFF,0x7A,0x62,0xD0,0x31,0xC8,0x3F,0x42,0x94,
+         0xF6,0x40,0xEC,0x13 }
        };
 
-static const unsigned char _EC_X9_62_PRIME_239V1_SEED[] = {
-       0xE4,0x3B,0xB4,0x60,0xF0,0xB8,0x0C,0xC0,0xC0,0xB0,
-       0x75,0x79,0x8E,0x94,0x80,0x60,0xF8,0x32,0x1B,0x7D};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_239V1 = {
-       NID_X9_62_prime_field,
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-       "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
-       "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
-       "7debe8e4e90a5dae6e4054ca530ba04654b36818ce226b39fccb7b02f1ae",
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",1,
-       _EC_X9_62_PRIME_239V1_SEED, 20,
-       "239 bit prime curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_PRIME_239V1 = {
+       { NID_X9_62_prime_field,20,30,1 },
+       { 
+         /* seed */
+         0xE4,0x3B,0xB4,0x60,0xF0,0xB8,0x0C,0xC0,0xC0,0xB0,
+         0x75,0x79,0x8E,0x94,0x80,0x60,0xF8,0x32,0x1B,0x7D,
+
+         /* p */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0x6B,0x01,0x6C,0x3B,0xDC,0xF1,0x89,0x41,0xD0,0xD6,
+         0x54,0x92,0x14,0x75,0xCA,0x71,0xA9,0xDB,0x2F,0xB2,
+         0x7D,0x1D,0x37,0x79,0x61,0x85,0xC2,0x94,0x2C,0x0A,
+
+         /* x */
+         0x0F,0xFA,0x96,0x3C,0xDC,0xA8,0x81,0x6C,0xCC,0x33,
+         0xB8,0x64,0x2B,0xED,0xF9,0x05,0xC3,0xD3,0x58,0x57,
+         0x3D,0x3F,0x27,0xFB,0xBD,0x3B,0x3C,0xB9,0xAA,0xAF,
+
+         /* y */
+         0x7d,0xeb,0xe8,0xe4,0xe9,0x0a,0x5d,0xae,0x6e,0x40,
+         0x54,0xca,0x53,0x0b,0xa0,0x46,0x54,0xb3,0x68,0x18,
+         0xce,0x22,0x6b,0x39,0xfc,0xcb,0x7b,0x02,0xf1,0xae,
+
+         /* order */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0x9E,0x5E,0x9A,0x9F,0x5D,
+         0x90,0x71,0xFB,0xD1,0x52,0x26,0x88,0x90,0x9D,0x0B }
        };
 
-static const unsigned char _EC_X9_62_PRIME_239V2_SEED[] = {
-       0xE8,0xB4,0x01,0x16,0x04,0x09,0x53,0x03,0xCA,0x3B,
-       0x80,0x99,0x98,0x2B,0xE0,0x9F,0xCB,0x9A,0xE6,0x16};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_239V2 = {
-       NID_X9_62_prime_field,
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-       "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
-       "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
-       "5b0125e4dbea0ec7206da0fc01d9b081329fb555de6ef460237dff8be4ba",
-       "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",1,
-       _EC_X9_62_PRIME_239V2_SEED, 20,
-       "239 bit prime curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_PRIME_239V2 = {
+       { NID_X9_62_prime_field,20,30,1 },
+       {
+         /* seed */
+         0xE8,0xB4,0x01,0x16,0x04,0x09,0x53,0x03,0xCA,0x3B,
+         0x80,0x99,0x98,0x2B,0xE0,0x9F,0xCB,0x9A,0xE6,0x16,
+
+         /* p */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0x61,0x7F,0xAB,0x68,0x32,0x57,0x6C,0xBB,0xFE,0xD5,
+         0x0D,0x99,0xF0,0x24,0x9C,0x3F,0xEE,0x58,0xB9,0x4B,
+         0xA0,0x03,0x8C,0x7A,0xE8,0x4C,0x8C,0x83,0x2F,0x2C,
+
+         /* x */
+         0x38,0xAF,0x09,0xD9,0x87,0x27,0x70,0x51,0x20,0xC9,
+         0x21,0xBB,0x5E,0x9E,0x26,0x29,0x6A,0x3C,0xDC,0xF2,
+         0xF3,0x57,0x57,0xA0,0xEA,0xFD,0x87,0xB8,0x30,0xE7,
+
+         /* y */
+         0x5b,0x01,0x25,0xe4,0xdb,0xea,0x0e,0xc7,0x20,0x6d,
+         0xa0,0xfc,0x01,0xd9,0xb0,0x81,0x32,0x9f,0xb5,0x55,
+         0xde,0x6e,0xf4,0x60,0x23,0x7d,0xff,0x8b,0xe4,0xba,
+
+         /* order */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x80,0x00,0x00,0xCF,0xA7,0xE8,0x59,0x43,
+         0x77,0xD4,0x14,0xC0,0x38,0x21,0xBC,0x58,0x20,0x63 }
        };
 
-static const unsigned char _EC_X9_62_PRIME_239V3_SEED[] = {
-       0x7D,0x73,0x74,0x16,0x8F,0xFE,0x34,0x71,0xB6,0x0A,
-       0x85,0x76,0x86,0xA1,0x94,0x75,0xD3,0xBF,0xA2,0xFF};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_239V3 = {
-       NID_X9_62_prime_field,
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-       "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
-       "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
-       "1607e6898f390c06bc1d552bad226f3b6fcfe48b6e818499af18e3ed6cf3",
-       "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",1,
-       _EC_X9_62_PRIME_239V3_SEED, 20,
-       "239 bit prime curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_PRIME_239V3 = {
+       { NID_X9_62_prime_field,20,30,1 },
+       { 
+
+         /* seed */
+         0x7D,0x73,0x74,0x16,0x8F,0xFE,0x34,0x71,0xB6,0x0A,
+         0x85,0x76,0x86,0xA1,0x94,0x75,0xD3,0xBF,0xA2,0xFF,
+
+         /* p */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0x80,0x00,
+         0x00,0x00,0x00,0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0x25,0x57,0x05,0xFA,0x2A,0x30,0x66,0x54,0xB1,0xF4,
+         0xCB,0x03,0xD6,0xA7,0x50,0xA3,0x0C,0x25,0x01,0x02,
+         0xD4,0x98,0x87,0x17,0xD9,0xBA,0x15,0xAB,0x6D,0x3E,
+
+         /* x */
+         0x67,0x68,0xAE,0x8E,0x18,0xBB,0x92,0xCF,0xCF,0x00,
+         0x5C,0x94,0x9A,0xA2,0xC6,0xD9,0x48,0x53,0xD0,0xE6,
+         0x60,0xBB,0xF8,0x54,0xB1,0xC9,0x50,0x5F,0xE9,0x5A,
+
+         /* y */
+         0x16,0x07,0xe6,0x89,0x8f,0x39,0x0c,0x06,0xbc,0x1d,
+         0x55,0x2b,0xad,0x22,0x6f,0x3b,0x6f,0xcf,0xe4,0x8b,
+         0x6e,0x81,0x84,0x99,0xaf,0x18,0xe3,0xed,0x6c,0xf3,
+
+         /* order */
+         0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0x7F,0xFF,0xFF,0x97,0x5D,0xEB,0x41,0xB3,
+         0xA6,0x05,0x7C,0x3C,0x43,0x21,0x46,0x52,0x65,0x51 }
        };
 
-static const unsigned char _EC_X9_62_PRIME_256V1_SEED[] = {
-       0xC4,0x9D,0x36,0x08,0x86,0xE7,0x04,0x93,0x6A,0x66,
-       0x78,0xE1,0x13,0x9D,0x26,0xB7,0x81,0x9F,0x7E,0x90};
-static const EC_CURVE_DATA _EC_X9_62_PRIME_256V1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
-       "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
-       "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B",
-       "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
-       "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5",
-       "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551",1,
-       _EC_X9_62_PRIME_256V1_SEED, 20,
-       "256 bit prime curve from X9.62 and SECG"
+
+static const struct { EC_CURVE_DATA h; unsigned char data[20+32*6]; }
+       _EC_X9_62_PRIME_256V1 = {
+       { NID_X9_62_prime_field,20,32,1 },
+       { 
+         /* seed */
+         0xC4,0x9D,0x36,0x08,0x86,0xE7,0x04,0x93,0x6A,0x66,
+         0x78,0xE1,0x13,0x9D,0x26,0xB7,0x81,0x9F,0x7E,0x90,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x01,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,
+
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x01,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFC,
+
+         /* b */
+         0x5A,0xC6,0x35,0xD8,0xAA,0x3A,0x93,0xE7,0xB3,0xEB,
+         0xBD,0x55,0x76,0x98,0x86,0xBC,0x65,0x1D,0x06,0xB0,
+         0xCC,0x53,0xB0,0xF6,0x3B,0xCE,0x3C,0x3E,0x27,0xD2,
+         0x60,0x4B,
+
+         /* x */
+         0x6B,0x17,0xD1,0xF2,0xE1,0x2C,0x42,0x47,0xF8,0xBC,
+         0xE6,0xE5,0x63,0xA4,0x40,0xF2,0x77,0x03,0x7D,0x81,
+         0x2D,0xEB,0x33,0xA0,0xF4,0xA1,0x39,0x45,0xD8,0x98,
+         0xC2,0x96,
+
+         /* y */
+         0x4f,0xe3,0x42,0xe2,0xfe,0x1a,0x7f,0x9b,0x8e,0xe7,
+         0xeb,0x4a,0x7c,0x0f,0x9e,0x16,0x2b,0xce,0x33,0x57,
+         0x6b,0x31,0x5e,0xce,0xcb,0xb6,0x40,0x68,0x37,0xbf,
+         0x51,0xf5,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBC,0xE6,0xFA,0xAD,
+         0xA7,0x17,0x9E,0x84,0xF3,0xB9,0xCA,0xC2,0xFC,0x63,
+         0x25,0x51 }
        };
+
 /* the secg prime curves (minus the nist and x9.62 prime curves) */
-static const unsigned char _EC_SECG_PRIME_112R1_SEED[] = {
-       0x00,0xF5,0x0B,0x02,0x8E,0x4D,0x69,0x6E,0x67,0x68,
-       0x75,0x61,0x51,0x75,0x29,0x04,0x72,0x78,0x3F,0xB1};
-static const EC_CURVE_DATA _EC_SECG_PRIME_112R1 = {
-       NID_X9_62_prime_field,
-       "DB7C2ABF62E35E668076BEAD208B",
-       "DB7C2ABF62E35E668076BEAD2088",
-       "659EF8BA043916EEDE8911702B22",
-       "09487239995A5EE76B55F9C2F098",
-       "a89ce5af8724c0a23e0e0ff77500",
-       "DB7C2ABF62E35E7628DFAC6561C5",1,
-       _EC_SECG_PRIME_112R1_SEED, 20,
-       "SECG/WTLS recommended curve over a 112 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
+       _EC_SECG_PRIME_112R1 = {
+       { NID_X9_62_prime_field,20,14,1 },
+       { 
+         /* seed */
+         0x00,0xF5,0x0B,0x02,0x8E,0x4D,0x69,0x6E,0x67,0x68,
+         0x75,0x61,0x51,0x75,0x29,0x04,0x72,0x78,0x3F,0xB1,
+
+         /* p */
+         0xDB,0x7C,0x2A,0xBF,0x62,0xE3,0x5E,0x66,0x80,0x76,
+         0xBE,0xAD,0x20,0x8B,
+         
+         /* a */
+         0xDB,0x7C,0x2A,0xBF,0x62,0xE3,0x5E,0x66,0x80,0x76,
+         0xBE,0xAD,0x20,0x88,
+
+         /* b */
+         0x65,0x9E,0xF8,0xBA,0x04,0x39,0x16,0xEE,0xDE,0x89,
+         0x11,0x70,0x2B,0x22,
+
+         /* x */
+         0x09,0x48,0x72,0x39,0x99,0x5A,0x5E,0xE7,0x6B,0x55,
+         0xF9,0xC2,0xF0,0x98,
+
+         /* y */
+         0xa8,0x9c,0xe5,0xaf,0x87,0x24,0xc0,0xa2,0x3e,0x0e,
+         0x0f,0xf7,0x75,0x00,
+
+         /* order */
+         0xDB,0x7C,0x2A,0xBF,0x62,0xE3,0x5E,0x76,0x28,0xDF,
+         0xAC,0x65,0x61,0xC5 }
        };
 
-static const unsigned char _EC_SECG_PRIME_112R2_SEED[] = {
-       0x00,0x27,0x57,0xA1,0x11,0x4D,0x69,0x6E,0x67,0x68,
-       0x75,0x61,0x51,0x75,0x53,0x16,0xC0,0x5E,0x0B,0xD4};
-static const EC_CURVE_DATA _EC_SECG_PRIME_112R2 = {
-       NID_X9_62_prime_field,
-       "DB7C2ABF62E35E668076BEAD208B",
-       "6127C24C05F38A0AAAF65C0EF02C",
-       "51DEF1815DB5ED74FCC34C85D709",
-       "4BA30AB5E892B4E1649DD0928643",
-       "adcd46f5882e3747def36e956e97",
-       "36DF0AAFD8B8D7597CA10520D04B",4, 
-       _EC_SECG_PRIME_112R2_SEED, 20,
-       "SECG recommended curve over a 112 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+14*6]; }
+       _EC_SECG_PRIME_112R2 = {
+       { NID_X9_62_prime_field,20,14,4 },
+       { 
+         /* seed */
+         0x00,0x27,0x57,0xA1,0x11,0x4D,0x69,0x6E,0x67,0x68,
+         0x75,0x61,0x51,0x75,0x53,0x16,0xC0,0x5E,0x0B,0xD4,
+
+         /* p */
+         0xDB,0x7C,0x2A,0xBF,0x62,0xE3,0x5E,0x66,0x80,0x76,
+         0xBE,0xAD,0x20,0x8B,
+
+         /* a */
+         0x61,0x27,0xC2,0x4C,0x05,0xF3,0x8A,0x0A,0xAA,0xF6,
+         0x5C,0x0E,0xF0,0x2C,
+
+         /* b */
+         0x51,0xDE,0xF1,0x81,0x5D,0xB5,0xED,0x74,0xFC,0xC3,
+         0x4C,0x85,0xD7,0x09,
+
+         /* x */
+         0x4B,0xA3,0x0A,0xB5,0xE8,0x92,0xB4,0xE1,0x64,0x9D,
+         0xD0,0x92,0x86,0x43,
+
+         /* y */
+         0xad,0xcd,0x46,0xf5,0x88,0x2e,0x37,0x47,0xde,0xf3,
+         0x6e,0x95,0x6e,0x97,
+
+         /* order */
+         0x36,0xDF,0x0A,0xAF,0xD8,0xB8,0xD7,0x59,0x7C,0xA1,
+         0x05,0x20,0xD0,0x4B }
        };
 
-static const unsigned char _EC_SECG_PRIME_128R1_SEED[] = {
-       0x00,0x0E,0x0D,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
-       0x51,0x75,0x0C,0xC0,0x3A,0x44,0x73,0xD0,0x36,0x79};
-static const EC_CURVE_DATA _EC_SECG_PRIME_128R1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-       "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-       "E87579C11079F43DD824993C2CEE5ED3",
-       "161FF7528B899B2D0C28607CA52C5B86",
-       "cf5ac8395bafeb13c02da292dded7a83",
-       "FFFFFFFE0000000075A30D1B9038A115",1,
-       _EC_SECG_PRIME_128R1_SEED, 20,
-       "SECG recommended curve over a 128 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
+       _EC_SECG_PRIME_128R1 = {
+       { NID_X9_62_prime_field,20,16,1 },
+       { 
+         /* seed */
+         0x00,0x0E,0x0D,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+         0x51,0x75,0x0C,0xC0,0x3A,0x44,0x73,0xD0,0x36,0x79,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         
+         /* a */
+         0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,
+
+         /* b */
+         0xE8,0x75,0x79,0xC1,0x10,0x79,0xF4,0x3D,0xD8,0x24,
+         0x99,0x3C,0x2C,0xEE,0x5E,0xD3,
+
+         /* x */
+         0x16,0x1F,0xF7,0x52,0x8B,0x89,0x9B,0x2D,0x0C,0x28,
+         0x60,0x7C,0xA5,0x2C,0x5B,0x86,
+
+         /* y */
+         0xcf,0x5a,0xc8,0x39,0x5b,0xaf,0xeb,0x13,0xc0,0x2d,
+         0xa2,0x92,0xdd,0xed,0x7a,0x83,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFE,0x00,0x00,0x00,0x00,0x75,0xA3,
+         0x0D,0x1B,0x90,0x38,0xA1,0x15 }
        };
 
-static const unsigned char _EC_SECG_PRIME_128R2_SEED[] = {
-       0x00,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,
-       0x12,0xD8,0xF0,0x34,0x31,0xFC,0xE6,0x3B,0x88,0xF4};
-static const EC_CURVE_DATA _EC_SECG_PRIME_128R2 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-       "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-       "5EEEFCA380D02919DC2C6558BB6D8A5D",
-       "7B6AA5D85E572983E6FB32A7CDEBC140",
-       "27b6916a894d3aee7106fe805fc34b44",
-       "3FFFFFFF7FFFFFFFBE0024720613B5A3",4,
-       _EC_SECG_PRIME_128R2_SEED, 20,
-       "SECG recommended curve over a 128 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+16*6]; }
+       _EC_SECG_PRIME_128R2 = {
+       { NID_X9_62_prime_field,20,16,4 },
+       { 
+         /* seed */
+         0x00,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,
+         0x12,0xD8,0xF0,0x34,0x31,0xFC,0xE6,0x3B,0x88,0xF4,
+
+         /* p */
+         0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+
+         /* a */
+         0xD6,0x03,0x19,0x98,0xD1,0xB3,0xBB,0xFE,0xBF,0x59,
+         0xCC,0x9B,0xBF,0xF9,0xAE,0xE1,
+
+         /* b */
+         0x5E,0xEE,0xFC,0xA3,0x80,0xD0,0x29,0x19,0xDC,0x2C,
+         0x65,0x58,0xBB,0x6D,0x8A,0x5D,
+
+         /* x */
+         0x7B,0x6A,0xA5,0xD8,0x5E,0x57,0x29,0x83,0xE6,0xFB,
+         0x32,0xA7,0xCD,0xEB,0xC1,0x40,
+
+         /* y */
+         0x27,0xb6,0x91,0x6a,0x89,0x4d,0x3a,0xee,0x71,0x06,
+         0xfe,0x80,0x5f,0xc3,0x4b,0x44,
+
+         /* order */
+         0x3F,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xBE,0x00,
+         0x24,0x72,0x06,0x13,0xB5,0xA3 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_PRIME_160K1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-       "0",
-       "7",
-       "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
-       "938cf935318fdced6bc28286531733c3f03c4fee",
-       "0100000000000000000001B8FA16DFAB9ACA16B6B3",1,
-       NULL, 0,
-       "SECG recommended curve over a 160 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
+       _EC_SECG_PRIME_160K1 = {
+       { NID_X9_62_prime_field,0,21,1 },
+       {
+         /* no seed */
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xAC,
+         0x73,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x07,
+
+         /* x */
+         0x00,0x3B,0x4C,0x38,0x2C,0xE3,0x7A,0xA1,0x92,0xA4,
+         0x01,0x9E,0x76,0x30,0x36,0xF4,0xF5,0xDD,0x4D,0x7E,
+         0xBB,
+
+         /* y */
+         0x00,0x93,0x8c,0xf9,0x35,0x31,0x8f,0xdc,0xed,0x6b,
+         0xc2,0x82,0x86,0x53,0x17,0x33,0xc3,0xf0,0x3c,0x4f,
+         0xee,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,0xB8,0xFA,0x16,0xDF,0xAB,0x9A,0xCA,0x16,0xB6,
+         0xB3 }
        };
 
-static const unsigned char _EC_SECG_PRIME_160R1_SEED[] = {
-       0x10,0x53,0xCD,0xE4,0x2C,0x14,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x53,0x3B,0xF3,0xF8,0x33,0x45};
-static const EC_CURVE_DATA _EC_SECG_PRIME_160R1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-       "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-       "4A96B5688EF573284664698968C38BB913CBFC82",
-       "23a628553168947d59dcc912042351377ac5fb32",
-       "0100000000000000000001F4C8F927AED3CA752257",1,
-       _EC_SECG_PRIME_160R1_SEED, 20,
-       "SECG recommended curve over a 160 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
+       _EC_SECG_PRIME_160R1 = {
+       { NID_X9_62_prime_field,20,21,1 },
+       { 
+         /* seed */
+         0x10,0x53,0xCD,0xE4,0x2C,0x14,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x53,0x3B,0xF3,0xF8,0x33,0x45,
+
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,
+         0xFF,
+
+         /* a */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,
+         0xFC,
+
+         /* b */
+         0x00,0x1C,0x97,0xBE,0xFC,0x54,0xBD,0x7A,0x8B,0x65,
+         0xAC,0xF8,0x9F,0x81,0xD4,0xD4,0xAD,0xC5,0x65,0xFA,
+         0x45,
+
+         /* x */
+         0x00,0x4A,0x96,0xB5,0x68,0x8E,0xF5,0x73,0x28,0x46,
+         0x64,0x69,0x89,0x68,0xC3,0x8B,0xB9,0x13,0xCB,0xFC,
+         0x82,
+
+         /* y */
+         0x00,0x23,0xa6,0x28,0x55,0x31,0x68,0x94,0x7d,0x59,
+         0xdc,0xc9,0x12,0x04,0x23,0x51,0x37,0x7a,0xc5,0xfb,
+         0x32,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,0xF4,0xC8,0xF9,0x27,0xAE,0xD3,0xCA,0x75,0x22,
+         0x57 }
        };
 
-static const unsigned char _EC_SECG_PRIME_160R2_SEED[] = {
-       0xB9,0x9B,0x99,0xB0,0x99,0xB3,0x23,0xE0,0x27,0x09,
-       0xA4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x51};
-static const EC_CURVE_DATA _EC_SECG_PRIME_160R2 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-       "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-       "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
-       "feaffef2e331f296e071fa0df9982cfea7d43f2e",
-       "0100000000000000000000351EE786A818F3A1A16B",1,
-       _EC_SECG_PRIME_160R2_SEED, 20,
-       "SECG/WTLS recommended curve over a 160 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
+       _EC_SECG_PRIME_160R2 = {
+       { NID_X9_62_prime_field,20,21,1 },
+       {
+         /* seed */
+         0xB9,0x9B,0x99,0xB0,0x99,0xB3,0x23,0xE0,0x27,0x09,
+         0xA4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x51,
+
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xAC,
+         0x73,
+
+         /* a */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xAC,
+         0x70,
+
+         /* b */
+         0x00,0xB4,0xE1,0x34,0xD3,0xFB,0x59,0xEB,0x8B,0xAB,
+         0x57,0x27,0x49,0x04,0x66,0x4D,0x5A,0xF5,0x03,0x88,
+         0xBA,
+
+         /* x */
+         0x00,0x52,0xDC,0xB0,0x34,0x29,0x3A,0x11,0x7E,0x1F,
+         0x4F,0xF1,0x1B,0x30,0xF7,0x19,0x9D,0x31,0x44,0xCE,
+         0x6D,
+
+         /* y */
+         0x00,0xfe,0xaf,0xfe,0xf2,0xe3,0x31,0xf2,0x96,0xe0,
+         0x71,0xfa,0x0d,0xf9,0x98,0x2c,0xfe,0xa7,0xd4,0x3f,
+         0x2e,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x35,0x1E,0xE7,0x86,0xA8,0x18,0xF3,0xA1,0xA1,
+         0x6B }
        };
 
-static const EC_CURVE_DATA _EC_SECG_PRIME_192K1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-       "0",
-       "3",
-       "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
-       "9b2f2f6d9c5628a7844163d015be86344082aa88d95e2f9d",
-       "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",1,
-       NULL, 20,
-       "SECG recommended curve over a 192 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
+       _EC_SECG_PRIME_192K1 = {
+       { NID_X9_62_prime_field,0,24,1 },
+       {
+         /* no seed */
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,
+         0xFF,0xFF,0xEE,0x37,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x03,
+
+         /* x */
+         0xDB,0x4F,0xF1,0x0E,0xC0,0x57,0xE9,0xAE,0x26,0xB0,
+         0x7D,0x02,0x80,0xB7,0xF4,0x34,0x1D,0xA5,0xD1,0xB1,
+         0xEA,0xE0,0x6C,0x7D,
+
+         /* y */
+         0x9b,0x2f,0x2f,0x6d,0x9c,0x56,0x28,0xa7,0x84,0x41,
+         0x63,0xd0,0x15,0xbe,0x86,0x34,0x40,0x82,0xaa,0x88,
+         0xd9,0x5e,0x2f,0x9d,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFE,0x26,0xF2,0xFC,0x17,0x0F,0x69,0x46,0x6A,
+         0x74,0xDE,0xFD,0x8D }
        };
 
-static const EC_CURVE_DATA _EC_SECG_PRIME_224K1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-       "0",
-       "5",
-       "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
-       "7e089fed7fba344282cafbd6f7e319f7c0b0bd59e2ca4bdb556d61a5",
-       "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",1,
-       NULL, 20,
-       "SECG recommended curve over a 224 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+29*6]; }
+       _EC_SECG_PRIME_224K1 = {
+       { NID_X9_62_prime_field,0,29,1 },
+       {
+         /* no seed */
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xE5,0x6D,
+         
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+         
+         /* x */
+         0x00,0xA1,0x45,0x5B,0x33,0x4D,0xF0,0x99,0xDF,0x30,
+         0xFC,0x28,0xA1,0x69,0xA4,0x67,0xE9,0xE4,0x70,0x75,
+         0xA9,0x0F,0x7E,0x65,0x0E,0xB6,0xB7,0xA4,0x5C,
+         
+         /* y */
+         0x00,0x7e,0x08,0x9f,0xed,0x7f,0xba,0x34,0x42,0x82,
+         0xca,0xfb,0xd6,0xf7,0xe3,0x19,0xf7,0xc0,0xb0,0xbd,
+         0x59,0xe2,0xca,0x4b,0xdb,0x55,0x6d,0x61,0xa5,
+         
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x01,0xDC,0xE8,0xD2,0xEC,0x61,
+         0x84,0xCA,0xF0,0xA9,0x71,0x76,0x9F,0xB1,0xF7 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_PRIME_256K1 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-       "0",
-       "7",
-       "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
-       "483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",1,
-       NULL, 20,
-       "SECG recommended curve over a 256 bit prime field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+32*6]; }
+       _EC_SECG_PRIME_256K1 = {
+       { NID_X9_62_prime_field,0,32,1 },
+       {
+         /* no seed */
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,
+         0xFC,0x2F,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x07,
+
+         /* x */
+         0x79,0xBE,0x66,0x7E,0xF9,0xDC,0xBB,0xAC,0x55,0xA0,
+         0x62,0x95,0xCE,0x87,0x0B,0x07,0x02,0x9B,0xFC,0xDB,
+         0x2D,0xCE,0x28,0xD9,0x59,0xF2,0x81,0x5B,0x16,0xF8,
+         0x17,0x98,
+
+         /* y */
+         0x48,0x3a,0xda,0x77,0x26,0xa3,0xc4,0x65,0x5d,0xa4,
+         0xfb,0xfc,0x0e,0x11,0x08,0xa8,0xfd,0x17,0xb4,0x48,
+         0xa6,0x85,0x54,0x19,0x9c,0x47,0xd0,0x8f,0xfb,0x10,
+         0xd4,0xb8,
+
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xBA,0xAE,0xDC,0xE6,
+         0xAF,0x48,0xA0,0x3B,0xBF,0xD2,0x5E,0x8C,0xD0,0x36,
+         0x41,0x41 }
        };
 
 /* some wap/wtls curves */
-static const EC_CURVE_DATA _EC_WTLS_8 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFDE7",
-       "0",
-       "3",
-       "1",
-       "2",
-       "0100000000000001ECEA551AD837E9",1,
-       NULL, 20,
-       "112 bit prime curve from the WTLS standard"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
+       _EC_WTLS_8 = {
+       { NID_X9_62_prime_field,0,15,1 },
+       {
+         /* no seed */
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFD,0xE7,
+         
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,
+         
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x03,
+         
+         /* x */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x01,
+         
+         /* y */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x02,
+         
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xEC,0xEA,
+         0x55,0x1A,0xD8,0x37,0xE9 }
        };
 
-static const EC_CURVE_DATA _EC_WTLS_9 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F",
-       "0",
-       "3",
-       "1",
-       "2",
-       "0100000000000000000001CDC98AE0E2DE574ABF33",1,
-       NULL, 20,
-       "160 bit prime curve from the WTLS standard"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
+       _EC_WTLS_9 = {
+       { NID_X9_62_prime_field,0,21,1 },
+       {
+         /* no seed */
+         /* p */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x80,
+         0x8F,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x03,
+
+         /* x */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,
+
+         /* y */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x02,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,0xCD,0xC9,0x8A,0xE0,0xE2,0xDE,0x57,0x4A,0xBF,
+         0x33 }
        };
 
-static const EC_CURVE_DATA _EC_WTLS_12 = {
-       NID_X9_62_prime_field,
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-       "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-       "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-       "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1,
-       NULL, 0,
-       "224 bit prime curve from the WTLS standard"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+28*6]; }
+       _EC_WTLS_12 = {
+       { NID_X9_62_prime_field,0,28,1 },
+       {
+         /* no seed */
+         /* p */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+         
+         /* a */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,
+         
+         /* b */
+         0xB4,0x05,0x0A,0x85,0x0C,0x04,0xB3,0xAB,0xF5,0x41,
+         0x32,0x56,0x50,0x44,0xB0,0xB7,0xD7,0xBF,0xD8,0xBA,
+         0x27,0x0B,0x39,0x43,0x23,0x55,0xFF,0xB4,
+         
+         /* x */
+         0xB7,0x0E,0x0C,0xBD,0x6B,0xB4,0xBF,0x7F,0x32,0x13,
+         0x90,0xB9,0x4A,0x03,0xC1,0xD3,0x56,0xC2,0x11,0x22,
+         0x34,0x32,0x80,0xD6,0x11,0x5C,0x1D,0x21,
+         
+         /* y */
+         0xbd,0x37,0x63,0x88,0xb5,0xf7,0x23,0xfb,0x4c,0x22,
+         0xdf,0xe6,0xcd,0x43,0x75,0xa0,0x5a,0x07,0x47,0x64,
+         0x44,0xd5,0x81,0x99,0x85,0x00,0x7e,0x34,
+         
+         /* order */
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0x16,0xA2,0xE0,0xB8,0xF0,0x3E,
+         0x13,0xDD,0x29,0x45,0x5C,0x5C,0x2A,0x3D }
        };
 
+#ifndef OPENSSL_NO_EC2M
+
 /* characteristic two curves */
-static const unsigned char _EC_SECG_CHAR2_113R1_SEED[] = {
-       0x10,0xE7,0x23,0xAB,0x14,0xD6,0x96,0xE6,0x76,0x87,
-       0x56,0x15,0x17,0x56,0xFE,0xBF,0x8F,0xCB,0x49,0xA9};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_113R1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000201",
-       "003088250CA6E7C7FE649CE85820F7",
-       "00E8BEE4D3E2260744188BE0E9C723",
-       "009D73616F35F4AB1407D73562C10F",
-       "00A52830277958EE84D1315ED31886",
-       "0100000000000000D9CCEC8A39E56F", 2,
-       _EC_SECG_CHAR2_113R1_SEED, 20,
-       "SECG recommended curve over a 113 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
+       _EC_SECG_CHAR2_113R1 = {
+       { NID_X9_62_characteristic_two_field,20,15,2 },
+       { 
+         /* seed */
+         0x10,0xE7,0x23,0xAB,0x14,0xD6,0x96,0xE6,0x76,0x87,
+         0x56,0x15,0x17,0x56,0xFE,0xBF,0x8F,0xCB,0x49,0xA9,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x00,0x30,0x88,0x25,0x0C,0xA6,0xE7,0xC7,0xFE,0x64,
+         0x9C,0xE8,0x58,0x20,0xF7,
+
+         /* b */
+         0x00,0xE8,0xBE,0xE4,0xD3,0xE2,0x26,0x07,0x44,0x18,
+         0x8B,0xE0,0xE9,0xC7,0x23,
+
+         /* x */
+         0x00,0x9D,0x73,0x61,0x6F,0x35,0xF4,0xAB,0x14,0x07,
+         0xD7,0x35,0x62,0xC1,0x0F,
+
+         /* y */
+         0x00,0xA5,0x28,0x30,0x27,0x79,0x58,0xEE,0x84,0xD1,
+         0x31,0x5E,0xD3,0x18,0x86,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xD9,0xCC,
+         0xEC,0x8A,0x39,0xE5,0x6F }
        };
 
-static const unsigned char _EC_SECG_CHAR2_113R2_SEED[] = {
-       0x10,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
-       0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x5D};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_113R2 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000201",
-       "00689918DBEC7E5A0DD6DFC0AA55C7",
-       "0095E9A9EC9B297BD4BF36E059184F",
-       "01A57A6A7B26CA5EF52FCDB8164797",
-       "00B3ADC94ED1FE674C06E695BABA1D",
-       "010000000000000108789B2496AF93", 2,
-       _EC_SECG_CHAR2_113R2_SEED, 20,
-       "SECG recommended curve over a 113 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+15*6]; }
+       _EC_SECG_CHAR2_113R2 = {
+       { NID_X9_62_characteristic_two_field,20,15,2 },
+       { 
+         /* seed */
+         0x10,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
+         0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x5D,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x00,0x68,0x99,0x18,0xDB,0xEC,0x7E,0x5A,0x0D,0xD6,
+         0xDF,0xC0,0xAA,0x55,0xC7,
+
+         /* b */
+         0x00,0x95,0xE9,0xA9,0xEC,0x9B,0x29,0x7B,0xD4,0xBF,
+         0x36,0xE0,0x59,0x18,0x4F,
+
+         /* x */
+         0x01,0xA5,0x7A,0x6A,0x7B,0x26,0xCA,0x5E,0xF5,0x2F,
+         0xCD,0xB8,0x16,0x47,0x97,
+
+         /* y */
+         0x00,0xB3,0xAD,0xC9,0x4E,0xD1,0xFE,0x67,0x4C,0x06,
+         0xE6,0x95,0xBA,0xBA,0x1D,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x08,0x78,
+         0x9B,0x24,0x96,0xAF,0x93 }
        };
 
-static const unsigned char _EC_SECG_CHAR2_131R1_SEED[] = {
-       0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,0x98,
-       0x5B,0xD3,0xAD,0xBA,0xDA,0x21,0xB4,0x3A,0x97,0xE2};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_131R1 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000010D",
-       "07A11B09A76B562144418FF3FF8C2570B8",
-       "0217C05610884B63B9C6C7291678F9D341",
-       "0081BAF91FDF9833C40F9C181343638399",
-       "078C6E7EA38C001F73C8134B1B4EF9E150",
-       "0400000000000000023123953A9464B54D", 2,
-       _EC_SECG_CHAR2_131R1_SEED, 20,
-       "SECG/WTLS recommended curve over a 131 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
+       _EC_SECG_CHAR2_131R1 = {
+       { NID_X9_62_characteristic_two_field,20,17,2 },
+       { 
+         /* seed */
+         0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,0x98,
+         0x5B,0xD3,0xAD,0xBA,0xDA,0x21,0xB4,0x3A,0x97,0xE2,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x01,0x0D,
+
+         /* a */
+         0x07,0xA1,0x1B,0x09,0xA7,0x6B,0x56,0x21,0x44,0x41,
+         0x8F,0xF3,0xFF,0x8C,0x25,0x70,0xB8,
+
+         /* b */
+         0x02,0x17,0xC0,0x56,0x10,0x88,0x4B,0x63,0xB9,0xC6,
+         0xC7,0x29,0x16,0x78,0xF9,0xD3,0x41,
+
+         /* x */
+         0x00,0x81,0xBA,0xF9,0x1F,0xDF,0x98,0x33,0xC4,0x0F,
+         0x9C,0x18,0x13,0x43,0x63,0x83,0x99,
+
+         /* y */
+         0x07,0x8C,0x6E,0x7E,0xA3,0x8C,0x00,0x1F,0x73,0xC8,
+         0x13,0x4B,0x1B,0x4E,0xF9,0xE1,0x50,
+
+         /* order */
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x31,
+         0x23,0x95,0x3A,0x94,0x64,0xB5,0x4D }
        };
 
-static const unsigned char _EC_SECG_CHAR2_131R2_SEED[] = {
-       0x98,0x5B,0xD3,0xAD,0xBA,0xD4,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x5A,0x21,0xB4,0x3A,0x97,0xE3};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_131R2 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000010D",
-       "03E5A88919D7CAFCBF415F07C2176573B2",
-       "04B8266A46C55657AC734CE38F018F2192",
-       "0356DCD8F2F95031AD652D23951BB366A8",
-       "0648F06D867940A5366D9E265DE9EB240F",
-       "0400000000000000016954A233049BA98F", 2,
-       _EC_SECG_CHAR2_131R2_SEED, 20,
-       "SECG recommended curve over a 131 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+17*6]; }
+       _EC_SECG_CHAR2_131R2 = {
+       { NID_X9_62_characteristic_two_field,20,17,2 },
+       { 
+         /* seed */
+         0x98,0x5B,0xD3,0xAD,0xBA,0xD4,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x5A,0x21,0xB4,0x3A,0x97,0xE3,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x01,0x0D,
+
+         /* a */
+         0x03,0xE5,0xA8,0x89,0x19,0xD7,0xCA,0xFC,0xBF,0x41,
+         0x5F,0x07,0xC2,0x17,0x65,0x73,0xB2,
+
+         /* b */
+         0x04,0xB8,0x26,0x6A,0x46,0xC5,0x56,0x57,0xAC,0x73,
+         0x4C,0xE3,0x8F,0x01,0x8F,0x21,0x92,
+
+         /* x */
+         0x03,0x56,0xDC,0xD8,0xF2,0xF9,0x50,0x31,0xAD,0x65,
+         0x2D,0x23,0x95,0x1B,0xB3,0x66,0xA8,
+
+         /* y */
+         0x06,0x48,0xF0,0x6D,0x86,0x79,0x40,0xA5,0x36,0x6D,
+         0x9E,0x26,0x5D,0xE9,0xEB,0x24,0x0F,
+
+         /* order */
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x69,
+         0x54,0xA2,0x33,0x04,0x9B,0xA9,0x8F }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_163K1 = {
-       NID_X9_62_characteristic_two_field,
-       "0800000000000000000000000000000000000000C9",
-       "1",
-       "1",
-       "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-       "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-       "04000000000000000000020108A2E0CC0D99F8A5EF", 2,
-       NULL, 0,
-       "SECG/NIST/WTLS recommended curve over a 163 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
+       _EC_NIST_CHAR2_163K = {
+       { NID_X9_62_characteristic_two_field,0,21,2 },
+       {
+         /* no seed */
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0xC9,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,
+
+         /* x */
+         0x02,0xFE,0x13,0xC0,0x53,0x7B,0xBC,0x11,0xAC,0xAA,
+         0x07,0xD7,0x93,0xDE,0x4E,0x6D,0x5E,0x5C,0x94,0xEE,
+         0xE8,
+
+         /* y */
+         0x02,0x89,0x07,0x0F,0xB0,0x5D,0x38,0xFF,0x58,0x32,
+         0x1F,0x2E,0x80,0x05,0x36,0xD5,0x38,0xCC,0xDA,0xA3,
+         0xD9,
+
+         /* order */
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x02,0x01,0x08,0xA2,0xE0,0xCC,0x0D,0x99,0xF8,0xA5,
+         0xEF }
        };
 
-static const unsigned char _EC_SECG_CHAR2_163R1_SEED[] = {
-       0x24,0xB7,0xB1,0x37,0xC8,0xA1,0x4D,0x69,0x6E,0x67,
-       0x68,0x75,0x61,0x51,0x75,0x6F,0xD0,0xDA,0x2E,0x5C};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_163R1 = {
-       NID_X9_62_characteristic_two_field,
-       "0800000000000000000000000000000000000000C9",
-       "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-       "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-       "0369979697AB43897789566789567F787A7876A654",
-       "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-       "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2,
-       _EC_SECG_CHAR2_163R1_SEED, 20,
-       "SECG recommended curve over a 163 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
+       _EC_SECG_CHAR2_163R1 = {
+       { NID_X9_62_characteristic_two_field,0,21,2 },
+       {
+         /* no seed */
+#if 0
+/* The algorithm used to derive the curve parameters from
+ * the seed used here is slightly different than the
+ * algorithm described in X9.62 . */
+         0x24,0xB7,0xB1,0x37,0xC8,0xA1,0x4D,0x69,0x6E,0x67,
+         0x68,0x75,0x61,0x51,0x75,0x6F,0xD0,0xDA,0x2E,0x5C,
+#endif
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0xC9,
+
+         /* a */
+         0x07,0xB6,0x88,0x2C,0xAA,0xEF,0xA8,0x4F,0x95,0x54,
+         0xFF,0x84,0x28,0xBD,0x88,0xE2,0x46,0xD2,0x78,0x2A,
+         0xE2,
+
+         /* b */
+         0x07,0x13,0x61,0x2D,0xCD,0xDC,0xB4,0x0A,0xAB,0x94,
+         0x6B,0xDA,0x29,0xCA,0x91,0xF7,0x3A,0xF9,0x58,0xAF,
+         0xD9,
+
+         /* x */
+         0x03,0x69,0x97,0x96,0x97,0xAB,0x43,0x89,0x77,0x89,
+         0x56,0x67,0x89,0x56,0x7F,0x78,0x7A,0x78,0x76,0xA6,
+         0x54,
+
+         /* y */
+         0x00,0x43,0x5E,0xDB,0x42,0xEF,0xAF,0xB2,0x98,0x9D,
+         0x51,0xFE,0xFC,0xE3,0xC8,0x09,0x88,0xF4,0x1F,0xF8,
+         0x83,
+
+         /* order */
+         0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0x48,0xAA,0xB6,0x89,0xC2,0x9C,0xA7,0x10,0x27,
+         0x9B }
        };
 
-static const unsigned char _EC_SECG_CHAR2_163R2_SEED[] = {
-       0x85,0xE2,0x5B,0xFE,0x5C,0x86,0x22,0x6C,0xDB,0x12,
-       0x01,0x6F,0x75,0x53,0xF9,0xD0,0xE6,0x93,0xA2,0x68};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_163R2 ={
-       NID_X9_62_characteristic_two_field,
-       "0800000000000000000000000000000000000000C9",
-       "1",
-       "020A601907B8C953CA1481EB10512F78744A3205FD",
-       "03F0EBA16286A2D57EA0991168D4994637E8343E36",
-       "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-       "040000000000000000000292FE77E70C12A4234C33", 2,
-       _EC_SECG_CHAR2_163R2_SEED, 20,
-       "SECG/NIST recommended curve over a 163 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+21*6]; }
+       _EC_NIST_CHAR2_163B = {
+       { NID_X9_62_characteristic_two_field,0,21,2 },
+       {
+         /* no seed */
+#if 0
+/* The seed here was used to created the curve parameters in normal
+ * basis representation (and not the polynomial representation used here) */
+         0x85,0xE2,0x5B,0xFE,0x5C,0x86,0x22,0x6C,0xDB,0x12,
+         0x01,0x6F,0x75,0x53,0xF9,0xD0,0xE6,0x93,0xA2,0x68,
+#endif
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0xC9,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,
+
+         /* b */
+         0x02,0x0A,0x60,0x19,0x07,0xB8,0xC9,0x53,0xCA,0x14,
+         0x81,0xEB,0x10,0x51,0x2F,0x78,0x74,0x4A,0x32,0x05,
+         0xFD,
+
+         /* x */
+         0x03,0xF0,0xEB,0xA1,0x62,0x86,0xA2,0xD5,0x7E,0xA0,
+         0x99,0x11,0x68,0xD4,0x99,0x46,0x37,0xE8,0x34,0x3E,
+         0x36,
+
+         /* y */
+         0x00,0xD5,0x1F,0xBC,0x6C,0x71,0xA0,0x09,0x4F,0xA2,
+         0xCD,0xD5,0x45,0xB1,0x1C,0x5C,0x0C,0x79,0x73,0x24,
+         0xF1,
+
+         /* order */
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x02,0x92,0xFE,0x77,0xE7,0x0C,0x12,0xA4,0x23,0x4C,
+         0x33 }
        };
 
-static const unsigned char _EC_SECG_CHAR2_193R1_SEED[] = {
-       0x10,0x3F,0xAE,0xC7,0x4D,0x69,0x6E,0x67,0x68,0x75,
-       0x61,0x51,0x75,0x77,0x7F,0xC5,0xB1,0x91,0xEF,0x30};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_193R1 = {
-       NID_X9_62_characteristic_two_field,
-       "02000000000000000000000000000000000000000000008001",
-       "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-       "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-       "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
-       "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-       "01000000000000000000000000C7F34A778F443ACC920EBA49", 2,
-       _EC_SECG_CHAR2_193R1_SEED, 20,
-       "SECG recommended curve over a 193 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
+       _EC_SECG_CHAR2_193R1 = {
+       { NID_X9_62_characteristic_two_field,20,25,2 },
+       { 
+         /* seed */
+         0x10,0x3F,0xAE,0xC7,0x4D,0x69,0x6E,0x67,0x68,0x75,
+         0x61,0x51,0x75,0x77,0x7F,0xC5,0xB1,0x91,0xEF,0x30,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x80,0x01,
+
+         /* a */
+         0x00,0x17,0x85,0x8F,0xEB,0x7A,0x98,0x97,0x51,0x69,
+         0xE1,0x71,0xF7,0x7B,0x40,0x87,0xDE,0x09,0x8A,0xC8,
+         0xA9,0x11,0xDF,0x7B,0x01,
+
+         /* b */
+         0x00,0xFD,0xFB,0x49,0xBF,0xE6,0xC3,0xA8,0x9F,0xAC,
+         0xAD,0xAA,0x7A,0x1E,0x5B,0xBC,0x7C,0xC1,0xC2,0xE5,
+         0xD8,0x31,0x47,0x88,0x14,
+
+         /* x */
+         0x01,0xF4,0x81,0xBC,0x5F,0x0F,0xF8,0x4A,0x74,0xAD,
+         0x6C,0xDF,0x6F,0xDE,0xF4,0xBF,0x61,0x79,0x62,0x53,
+         0x72,0xD8,0xC0,0xC5,0xE1,
+
+         /* y */
+         0x00,0x25,0xE3,0x99,0xF2,0x90,0x37,0x12,0xCC,0xF3,
+         0xEA,0x9E,0x3A,0x1A,0xD1,0x7F,0xB0,0xB3,0x20,0x1B,
+         0x6A,0xF7,0xCE,0x1B,0x05,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0xC7,0xF3,0x4A,0x77,0x8F,0x44,0x3A,
+         0xCC,0x92,0x0E,0xBA,0x49 }
        };
 
-static const unsigned char _EC_SECG_CHAR2_193R2_SEED[] = {
-       0x10,0xB7,0xB4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,
-       0x17,0x51,0x37,0xC8,0xA1,0x6F,0xD0,0xDA,0x22,0x11};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_193R2 = {
-       NID_X9_62_characteristic_two_field,
-       "02000000000000000000000000000000000000000000008001",
-       "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-       "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-       "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
-       "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-       "010000000000000000000000015AAB561B005413CCD4EE99D5", 2,
-       _EC_SECG_CHAR2_193R2_SEED, 20,
-       "SECG recommended curve over a 193 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+25*6]; }
+       _EC_SECG_CHAR2_193R2 = {
+       { NID_X9_62_characteristic_two_field,20,25,2 },
+       { 
+         /* seed */
+         0x10,0xB7,0xB4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,    
+         0x17,0x51,0x37,0xC8,0xA1,0x6F,0xD0,0xDA,0x22,0x11,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x80,0x01,
+
+         /* a */
+         0x01,0x63,0xF3,0x5A,0x51,0x37,0xC2,0xCE,0x3E,0xA6,
+         0xED,0x86,0x67,0x19,0x0B,0x0B,0xC4,0x3E,0xCD,0x69,
+         0x97,0x77,0x02,0x70,0x9B,
+
+         /* b */
+         0x00,0xC9,0xBB,0x9E,0x89,0x27,0xD4,0xD6,0x4C,0x37,
+         0x7E,0x2A,0xB2,0x85,0x6A,0x5B,0x16,0xE3,0xEF,0xB7,
+         0xF6,0x1D,0x43,0x16,0xAE,
+
+         /* x */
+         0x00,0xD9,0xB6,0x7D,0x19,0x2E,0x03,0x67,0xC8,0x03,
+         0xF3,0x9E,0x1A,0x7E,0x82,0xCA,0x14,0xA6,0x51,0x35,
+         0x0A,0xAE,0x61,0x7E,0x8F,
+
+         /* y */
+         0x01,0xCE,0x94,0x33,0x56,0x07,0xC3,0x04,0xAC,0x29,
+         0xE7,0xDE,0xFB,0xD9,0xCA,0x01,0xF5,0x96,0xF9,0x27,
+         0x22,0x4C,0xDE,0xCF,0x6C,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x01,0x5A,0xAB,0x56,0x1B,0x00,0x54,0x13,
+         0xCC,0xD4,0xEE,0x99,0xD5 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_233K1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000000000000000004000000000000000001",
-       "0",
-       "1",
-       "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-       "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-       "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4,
-       NULL, 0,
-       "SECG/NIST/WTLS recommended curve over a 233 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
+       _EC_NIST_CHAR2_233K = {
+       { NID_X9_62_characteristic_two_field,0,30,4 },
+       {
+         /* no seed */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* x */
+         0x01,0x72,0x32,0xBA,0x85,0x3A,0x7E,0x73,0x1A,0xF1,
+         0x29,0xF2,0x2F,0xF4,0x14,0x95,0x63,0xA4,0x19,0xC2,
+         0x6B,0xF5,0x0A,0x4C,0x9D,0x6E,0xEF,0xAD,0x61,0x26,
+
+         /* y */
+         0x01,0xDB,0x53,0x7D,0xEC,0xE8,0x19,0xB7,0xF7,0x0F,
+         0x55,0x5A,0x67,0xC4,0x27,0xA8,0xCD,0x9B,0xF1,0x8A,
+         0xEB,0x9B,0x56,0xE0,0xC1,0x10,0x56,0xFA,0xE6,0xA3,
+
+         /* order */
+         0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x06,0x9D,0x5B,0xB9,0x15,
+         0xBC,0xD4,0x6E,0xFB,0x1A,0xD5,0xF1,0x73,0xAB,0xDF }
        };
 
-static const unsigned char _EC_SECG_CHAR2_233R1_SEED[] = {
-       0x74,0xD5,0x9F,0xF0,0x7F,0x6B,0x41,0x3D,0x0E,0xA1,
-       0x4B,0x34,0x4B,0x20,0xA2,0xDB,0x04,0x9B,0x50,0xC3};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_233R1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000000000000000004000000000000000001",
-       "000000000000000000000000000000000000000000000000000000000001",
-       "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-       "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-       "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-       "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2,
-       _EC_SECG_CHAR2_233R1_SEED, 20,
-       "SECG/NIST/WTLS recommended curve over a 233 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_NIST_CHAR2_233B = {
+       { NID_X9_62_characteristic_two_field,20,30,2 },
+       { 
+         /* seed */
+         0x74,0xD5,0x9F,0xF0,0x7F,0x6B,0x41,0x3D,0x0E,0xA1,
+         0x4B,0x34,0x4B,0x20,0xA2,0xDB,0x04,0x9B,0x50,0xC3,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* b */
+         0x00,0x66,0x64,0x7E,0xDE,0x6C,0x33,0x2C,0x7F,0x8C,
+         0x09,0x23,0xBB,0x58,0x21,0x3B,0x33,0x3B,0x20,0xE9,
+         0xCE,0x42,0x81,0xFE,0x11,0x5F,0x7D,0x8F,0x90,0xAD,
+
+         /* x */
+         0x00,0xFA,0xC9,0xDF,0xCB,0xAC,0x83,0x13,0xBB,0x21,
+         0x39,0xF1,0xBB,0x75,0x5F,0xEF,0x65,0xBC,0x39,0x1F,
+         0x8B,0x36,0xF8,0xF8,0xEB,0x73,0x71,0xFD,0x55,0x8B,
+
+         /* y */
+         0x01,0x00,0x6A,0x08,0xA4,0x19,0x03,0x35,0x06,0x78,
+         0xE5,0x85,0x28,0xBE,0xBF,0x8A,0x0B,0xEF,0xF8,0x67,
+         0xA7,0xCA,0x36,0x71,0x6F,0x7E,0x01,0xF8,0x10,0x52,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x13,0xE9,0x74,0xE7,0x2F,
+         0x8A,0x69,0x22,0x03,0x1D,0x26,0x03,0xCF,0xE0,0xD7 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_239K1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000004000000000000000000000000000000000000001",
-       "0",
-       "1",
-       "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
-       "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-       "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4,
-       NULL, 0,
-       "SECG recommended curve over a 239 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+30*6]; }
+       _EC_SECG_CHAR2_239K1 = {
+       { NID_X9_62_characteristic_two_field,0,30,4 },
+       {
+         /* no seed */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* x */
+         0x29,0xA0,0xB6,0xA8,0x87,0xA9,0x83,0xE9,0x73,0x09,
+         0x88,0xA6,0x87,0x27,0xA8,0xB2,0xD1,0x26,0xC4,0x4C,
+         0xC2,0xCC,0x7B,0x2A,0x65,0x55,0x19,0x30,0x35,0xDC,
+
+         /* y */
+         0x76,0x31,0x08,0x04,0xF1,0x2E,0x54,0x9B,0xDB,0x01,
+         0x1C,0x10,0x30,0x89,0xE7,0x35,0x10,0xAC,0xB2,0x75,
+         0xFC,0x31,0x2A,0x5D,0xC6,0xB7,0x65,0x53,0xF0,0xCA,
+
+         /* order */
+         0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x5A,0x79,0xFE,0xC6,0x7C,
+         0xB6,0xE9,0x1F,0x1C,0x1D,0xA8,0x00,0xE4,0x78,0xA5 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_283K1 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000000000000000000000000000000000000000001"
-       "0A1",
-       "0",
-       "1",
-       "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492"
-       "836",
-       "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2"
-       "259",
-       "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163"
-       "C61", 4,
-       NULL, 20,
-       "SECG/NIST recommended curve over a 283 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+36*6]; }
+       _EC_NIST_CHAR2_283K = {
+       { NID_X9_62_characteristic_two_field,0,36,4 },
+       {
+         /* no seed */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x10,0xA1,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* x */
+         0x05,0x03,0x21,0x3F,0x78,0xCA,0x44,0x88,0x3F,0x1A,
+         0x3B,0x81,0x62,0xF1,0x88,0xE5,0x53,0xCD,0x26,0x5F,
+         0x23,0xC1,0x56,0x7A,0x16,0x87,0x69,0x13,0xB0,0xC2,
+         0xAC,0x24,0x58,0x49,0x28,0x36,
+
+         /* y */
+         0x01,0xCC,0xDA,0x38,0x0F,0x1C,0x9E,0x31,0x8D,0x90,
+         0xF9,0x5D,0x07,0xE5,0x42,0x6F,0xE8,0x7E,0x45,0xC0,
+         0xE8,0x18,0x46,0x98,0xE4,0x59,0x62,0x36,0x4E,0x34,
+         0x11,0x61,0x77,0xDD,0x22,0x59,
+
+         /* order */
+         0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0xAE,
+         0x2E,0xD0,0x75,0x77,0x26,0x5D,0xFF,0x7F,0x94,0x45,
+         0x1E,0x06,0x1E,0x16,0x3C,0x61 }
        };
 
-static const unsigned char _EC_SECG_CHAR2_283R1_SEED[] = {
-       0x77,0xE2,0xB0,0x73,0x70,0xEB,0x0F,0x83,0x2A,0x6D,
-       0xD5,0xB6,0x2D,0xFC,0x88,0xCD,0x06,0xBB,0x84,0xBE};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_283R1 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000000000000000000000000000000000000000001"
-       "0A1",
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "001",
-       "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A"
-       "2F5",
-       "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12"
-       "053",
-       "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE811"
-       "2F4",
-       "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB"
-       "307", 2,
-       _EC_SECG_CHAR2_283R1_SEED, 20,
-       "SECG/NIST recommended curve over a 283 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+36*6]; }
+       _EC_NIST_CHAR2_283B = {
+       { NID_X9_62_characteristic_two_field,20,36,2 },
+       { 
+         /* no seed */
+         0x77,0xE2,0xB0,0x73,0x70,0xEB,0x0F,0x83,0x2A,0x6D,
+         0xD5,0xB6,0x2D,0xFC,0x88,0xCD,0x06,0xBB,0x84,0xBE,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x10,0xA1,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* b */
+         0x02,0x7B,0x68,0x0A,0xC8,0xB8,0x59,0x6D,0xA5,0xA4,
+         0xAF,0x8A,0x19,0xA0,0x30,0x3F,0xCA,0x97,0xFD,0x76,
+         0x45,0x30,0x9F,0xA2,0xA5,0x81,0x48,0x5A,0xF6,0x26,
+         0x3E,0x31,0x3B,0x79,0xA2,0xF5,
+
+         /* x */
+         0x05,0xF9,0x39,0x25,0x8D,0xB7,0xDD,0x90,0xE1,0x93,
+         0x4F,0x8C,0x70,0xB0,0xDF,0xEC,0x2E,0xED,0x25,0xB8,
+         0x55,0x7E,0xAC,0x9C,0x80,0xE2,0xE1,0x98,0xF8,0xCD,
+         0xBE,0xCD,0x86,0xB1,0x20,0x53,
+
+         /* y */
+         0x03,0x67,0x68,0x54,0xFE,0x24,0x14,0x1C,0xB9,0x8F,
+         0xE6,0xD4,0xB2,0x0D,0x02,0xB4,0x51,0x6F,0xF7,0x02,
+         0x35,0x0E,0xDD,0xB0,0x82,0x67,0x79,0xC8,0x13,0xF0,
+         0xDF,0x45,0xBE,0x81,0x12,0xF4,
+
+         /* order */
+         0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0x90,
+         0x39,0x96,0x60,0xFC,0x93,0x8A,0x90,0x16,0x5B,0x04,
+         0x2A,0x7C,0xEF,0xAD,0xB3,0x07 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_409K1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000000000000000000000000000000000000000000000"
-       "00000000000008000000000000000000001",
-       "0",
-       "1",
-       "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C4601"
-       "89EB5AAAA62EE222EB1B35540CFE9023746",
-       "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6"
-       "C42E9C55215AA9CA27A5863EC48D8E0286B",
-       "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400"
-       "EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", 4,
-       NULL, 0,
-       "SECG/NIST recommended curve over a 409 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+52*6]; }
+       _EC_NIST_CHAR2_409K = {
+       { NID_X9_62_characteristic_two_field,0,52,4 },
+       {
+         /* no seed */
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+
+         /* x */
+         0x00,0x60,0xF0,0x5F,0x65,0x8F,0x49,0xC1,0xAD,0x3A,
+         0xB1,0x89,0x0F,0x71,0x84,0x21,0x0E,0xFD,0x09,0x87,
+         0xE3,0x07,0xC8,0x4C,0x27,0xAC,0xCF,0xB8,0xF9,0xF6,
+         0x7C,0xC2,0xC4,0x60,0x18,0x9E,0xB5,0xAA,0xAA,0x62,
+         0xEE,0x22,0x2E,0xB1,0xB3,0x55,0x40,0xCF,0xE9,0x02,
+         0x37,0x46,
+
+         /* y */
+         0x01,0xE3,0x69,0x05,0x0B,0x7C,0x4E,0x42,0xAC,0xBA,
+         0x1D,0xAC,0xBF,0x04,0x29,0x9C,0x34,0x60,0x78,0x2F,
+         0x91,0x8E,0xA4,0x27,0xE6,0x32,0x51,0x65,0xE9,0xEA,
+         0x10,0xE3,0xDA,0x5F,0x6C,0x42,0xE9,0xC5,0x52,0x15,
+         0xAA,0x9C,0xA2,0x7A,0x58,0x63,0xEC,0x48,0xD8,0xE0,
+         0x28,0x6B,
+
+         /* order */
+         0x00,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x5F,0x83,0xB2,
+         0xD4,0xEA,0x20,0x40,0x0E,0xC4,0x55,0x7D,0x5E,0xD3,
+         0xE3,0xE7,0xCA,0x5B,0x4B,0x5C,0x83,0xB8,0xE0,0x1E,
+         0x5F,0xCF }
        };
 
-static const unsigned char _EC_SECG_CHAR2_409R1_SEED[] = {
-       0x40,0x99,0xB5,0xA4,0x57,0xF9,0xD6,0x9F,0x79,0x21,
-       0x3D,0x09,0x4C,0x4B,0xCD,0x4D,0x42,0x62,0x21,0x0B};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_409R1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000000000000000000000000000000000000000000000"
-       "00000000000008000000000000000000001",
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "00000000000000000000000000000000001",
-       "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A19"
-       "7B272822F6CD57A55AA4F50AE317B13545F",
-       "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255"
-       "A868A1180515603AEAB60794E54BB7996A7",
-       "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514"
-       "F1FDF4B4F40D2181B3681C364BA0273C706",
-       "010000000000000000000000000000000000000000000000000001E2AAD6A612F3330"
-       "7BE5FA47C3C9E052F838164CD37D9A21173", 2,
-       _EC_SECG_CHAR2_409R1_SEED, 20,
-       "SECG/NIST recommended curve over a 409 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+52*6]; }
+       _EC_NIST_CHAR2_409B = {
+       { NID_X9_62_characteristic_two_field,20,52,2 },
+       { 
+         /* seed */
+         0x40,0x99,0xB5,0xA4,0x57,0xF9,0xD6,0x9F,0x79,0x21,
+         0x3D,0x09,0x4C,0x4B,0xCD,0x4D,0x42,0x62,0x21,0x0B,
+
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+
+         /* b */
+         0x00,0x21,0xA5,0xC2,0xC8,0xEE,0x9F,0xEB,0x5C,0x4B,
+         0x9A,0x75,0x3B,0x7B,0x47,0x6B,0x7F,0xD6,0x42,0x2E,
+         0xF1,0xF3,0xDD,0x67,0x47,0x61,0xFA,0x99,0xD6,0xAC,
+         0x27,0xC8,0xA9,0xA1,0x97,0xB2,0x72,0x82,0x2F,0x6C,
+         0xD5,0x7A,0x55,0xAA,0x4F,0x50,0xAE,0x31,0x7B,0x13,
+         0x54,0x5F,
+
+         /* x */
+         0x01,0x5D,0x48,0x60,0xD0,0x88,0xDD,0xB3,0x49,0x6B,
+         0x0C,0x60,0x64,0x75,0x62,0x60,0x44,0x1C,0xDE,0x4A,
+         0xF1,0x77,0x1D,0x4D,0xB0,0x1F,0xFE,0x5B,0x34,0xE5,
+         0x97,0x03,0xDC,0x25,0x5A,0x86,0x8A,0x11,0x80,0x51,
+         0x56,0x03,0xAE,0xAB,0x60,0x79,0x4E,0x54,0xBB,0x79,
+         0x96,0xA7,
+
+         /* y */
+         0x00,0x61,0xB1,0xCF,0xAB,0x6B,0xE5,0xF3,0x2B,0xBF,
+         0xA7,0x83,0x24,0xED,0x10,0x6A,0x76,0x36,0xB9,0xC5,
+         0xA7,0xBD,0x19,0x8D,0x01,0x58,0xAA,0x4F,0x54,0x88,
+         0xD0,0x8F,0x38,0x51,0x4F,0x1F,0xDF,0x4B,0x4F,0x40,
+         0xD2,0x18,0x1B,0x36,0x81,0xC3,0x64,0xBA,0x02,0x73,
+         0xC7,0x06,
+
+         /* order */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xE2,0xAA,0xD6,
+         0xA6,0x12,0xF3,0x33,0x07,0xBE,0x5F,0xA4,0x7C,0x3C,
+         0x9E,0x05,0x2F,0x83,0x81,0x64,0xCD,0x37,0xD9,0xA2,
+         0x11,0x73 }
        };
 
-static const EC_CURVE_DATA _EC_SECG_CHAR2_571K1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000000000000000000000000"
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "00425",
-       "0",
-       "1",
-       "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA443709"
-       "58493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A0"
-       "1C8972",
-       "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D497"
-       "9C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143E"
-       "F1C7A3",
-       "020000000000000000000000000000000000000000000000000000000000000000000"
-       "000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F63"
-       "7C1001", 4,
-       NULL, 0,
-       "SECG/NIST recommended curve over a 571 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+72*6]; }
+       _EC_NIST_CHAR2_571K = {
+       { NID_X9_62_characteristic_two_field,0,72,4 },
+       {
+         /* no seed */
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x04,0x25,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+
+         /* x */
+         0x02,0x6E,0xB7,0xA8,0x59,0x92,0x3F,0xBC,0x82,0x18,
+         0x96,0x31,0xF8,0x10,0x3F,0xE4,0xAC,0x9C,0xA2,0x97,
+         0x00,0x12,0xD5,0xD4,0x60,0x24,0x80,0x48,0x01,0x84,
+         0x1C,0xA4,0x43,0x70,0x95,0x84,0x93,0xB2,0x05,0xE6,
+         0x47,0xDA,0x30,0x4D,0xB4,0xCE,0xB0,0x8C,0xBB,0xD1,
+         0xBA,0x39,0x49,0x47,0x76,0xFB,0x98,0x8B,0x47,0x17,
+         0x4D,0xCA,0x88,0xC7,0xE2,0x94,0x52,0x83,0xA0,0x1C,
+         0x89,0x72,
+
+         /* y */
+         0x03,0x49,0xDC,0x80,0x7F,0x4F,0xBF,0x37,0x4F,0x4A,
+         0xEA,0xDE,0x3B,0xCA,0x95,0x31,0x4D,0xD5,0x8C,0xEC,
+         0x9F,0x30,0x7A,0x54,0xFF,0xC6,0x1E,0xFC,0x00,0x6D,
+         0x8A,0x2C,0x9D,0x49,0x79,0xC0,0xAC,0x44,0xAE,0xA7,
+         0x4F,0xBE,0xBB,0xB9,0xF7,0x72,0xAE,0xDC,0xB6,0x20,
+         0xB0,0x1A,0x7B,0xA7,0xAF,0x1B,0x32,0x04,0x30,0xC8,
+         0x59,0x19,0x84,0xF6,0x01,0xCD,0x4C,0x14,0x3E,0xF1,
+         0xC7,0xA3,
+
+         /* order */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x18,0x50,0xE1,
+         0xF1,0x9A,0x63,0xE4,0xB3,0x91,0xA8,0xDB,0x91,0x7F,
+         0x41,0x38,0xB6,0x30,0xD8,0x4B,0xE5,0xD6,0x39,0x38,
+         0x1E,0x91,0xDE,0xB4,0x5C,0xFE,0x77,0x8F,0x63,0x7C,
+         0x10,0x01 }
        };
 
-static const unsigned char _EC_SECG_CHAR2_571R1_SEED[] = {
-       0x2A,0xA0,0x58,0xF7,0x3A,0x0E,0x33,0xAB,0x48,0x6B,
-       0x0F,0x61,0x04,0x10,0xC5,0x3A,0x7F,0x13,0x23,0x10};
-static const EC_CURVE_DATA _EC_SECG_CHAR2_571R1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000000000000000000000000"
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "00425",
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "000000000000000000000000000000000000000000000000000000000000000000000"
-       "000001",
-       "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFA"
-       "BBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F29"
-       "55727A",
-       "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53"
-       "950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8E"
-       "EC2D19",
-       "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423"
-       "E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B"
-       "8AC15B",
-       "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-       "FFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2F"
-       "E84E47", 2,
-       _EC_SECG_CHAR2_571R1_SEED, 20,
-       "SECG/NIST recommended curve over a 571 bit binary field"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+72*6]; }
+       _EC_NIST_CHAR2_571B = {
+       { NID_X9_62_characteristic_two_field,20,72,2 },
+       { 
+         /* seed */
+         0x2A,0xA0,0x58,0xF7,0x3A,0x0E,0x33,0xAB,0x48,0x6B,
+         0x0F,0x61,0x04,0x10,0xC5,0x3A,0x7F,0x13,0x23,0x10,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x04,0x25,
+         
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x01,
+         
+         /* b */
+         0x02,0xF4,0x0E,0x7E,0x22,0x21,0xF2,0x95,0xDE,0x29,
+         0x71,0x17,0xB7,0xF3,0xD6,0x2F,0x5C,0x6A,0x97,0xFF,
+         0xCB,0x8C,0xEF,0xF1,0xCD,0x6B,0xA8,0xCE,0x4A,0x9A,
+         0x18,0xAD,0x84,0xFF,0xAB,0xBD,0x8E,0xFA,0x59,0x33,
+         0x2B,0xE7,0xAD,0x67,0x56,0xA6,0x6E,0x29,0x4A,0xFD,
+         0x18,0x5A,0x78,0xFF,0x12,0xAA,0x52,0x0E,0x4D,0xE7,
+         0x39,0xBA,0xCA,0x0C,0x7F,0xFE,0xFF,0x7F,0x29,0x55,
+         0x72,0x7A,
+         
+         /* x */
+         0x03,0x03,0x00,0x1D,0x34,0xB8,0x56,0x29,0x6C,0x16,
+         0xC0,0xD4,0x0D,0x3C,0xD7,0x75,0x0A,0x93,0xD1,0xD2,
+         0x95,0x5F,0xA8,0x0A,0xA5,0xF4,0x0F,0xC8,0xDB,0x7B,
+         0x2A,0xBD,0xBD,0xE5,0x39,0x50,0xF4,0xC0,0xD2,0x93,
+         0xCD,0xD7,0x11,0xA3,0x5B,0x67,0xFB,0x14,0x99,0xAE,
+         0x60,0x03,0x86,0x14,0xF1,0x39,0x4A,0xBF,0xA3,0xB4,
+         0xC8,0x50,0xD9,0x27,0xE1,0xE7,0x76,0x9C,0x8E,0xEC,
+         0x2D,0x19,
+         
+         /* y */
+         0x03,0x7B,0xF2,0x73,0x42,0xDA,0x63,0x9B,0x6D,0xCC,
+         0xFF,0xFE,0xB7,0x3D,0x69,0xD7,0x8C,0x6C,0x27,0xA6,
+         0x00,0x9C,0xBB,0xCA,0x19,0x80,0xF8,0x53,0x39,0x21,
+         0xE8,0xA6,0x84,0x42,0x3E,0x43,0xBA,0xB0,0x8A,0x57,
+         0x62,0x91,0xAF,0x8F,0x46,0x1B,0xB2,0xA8,0xB3,0x53,
+         0x1D,0x2F,0x04,0x85,0xC1,0x9B,0x16,0xE2,0xF1,0x51,
+         0x6E,0x23,0xDD,0x3C,0x1A,0x48,0x27,0xAF,0x1B,0x8A,
+         0xC1,0x5B,
+
+         /* order */
+         0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE6,0x61,0xCE,0x18,
+         0xFF,0x55,0x98,0x73,0x08,0x05,0x9B,0x18,0x68,0x23,
+         0x85,0x1E,0xC7,0xDD,0x9C,0xA1,0x16,0x1D,0xE9,0x3D,
+         0x51,0x74,0xD6,0x6E,0x83,0x82,0xE9,0xBB,0x2F,0xE8,
+         0x4E,0x47 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_163V1_SEED[] = {
-       0xD2,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
-       0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x54};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V1 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000000000000107",
-       "072546B5435234A422E0789675F432C89435DE5242",
-       "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
-       "07AF69989546103D79329FCC3D74880F33BBE803CB",
-       "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
-       "0400000000000000000001E60FC8821CC74DAEAFC1", 2,
-       _EC_X9_62_CHAR2_163V1_SEED, 20,
-       "163 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
+       _EC_X9_62_CHAR2_163V1 = {
+       { NID_X9_62_characteristic_two_field,20,21,2 },
+       { 
+         /* seed */
+         0xD2,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
+         0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x54,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+         0x07,
+
+         /* a */
+         0x07,0x25,0x46,0xB5,0x43,0x52,0x34,0xA4,0x22,0xE0,
+         0x78,0x96,0x75,0xF4,0x32,0xC8,0x94,0x35,0xDE,0x52,
+         0x42,
+
+         /* b */
+         0x00,0xC9,0x51,0x7D,0x06,0xD5,0x24,0x0D,0x3C,0xFF,
+         0x38,0xC7,0x4B,0x20,0xB6,0xCD,0x4D,0x6F,0x9D,0xD4,
+         0xD9,
+
+         /* x */
+         0x07,0xAF,0x69,0x98,0x95,0x46,0x10,0x3D,0x79,0x32,
+         0x9F,0xCC,0x3D,0x74,0x88,0x0F,0x33,0xBB,0xE8,0x03,
+         0xCB,
+
+         /* y */
+         0x01,0xEC,0x23,0x21,0x1B,0x59,0x66,0xAD,0xEA,0x1D,
+         0x3F,0x87,0xF7,0xEA,0x58,0x48,0xAE,0xF0,0xB7,0xCA,
+         0x9F,
+
+         /* order */
+         0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x01,0xE6,0x0F,0xC8,0x82,0x1C,0xC7,0x4D,0xAE,0xAF,
+         0xC1 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_163V2_SEED[] = {
-       0x53,0x81,0x4C,0x05,0x0D,0x44,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x58,0x0C,0xA4,0xE2,0x9F,0xFD};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V2 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000000000000107",
-       "0108B39E77C4B108BED981ED0E890E117C511CF072",
-       "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
-       "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
-       "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
-       "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2,
-       _EC_X9_62_CHAR2_163V2_SEED, 20,
-       "163 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
+       _EC_X9_62_CHAR2_163V2 = {
+       { NID_X9_62_characteristic_two_field,20,21,2 },
+       { 
+         /* seed */
+         0x53,0x81,0x4C,0x05,0x0D,0x44,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x58,0x0C,0xA4,0xE2,0x9F,0xFD,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+         0x07,
+
+         /* a */
+         0x01,0x08,0xB3,0x9E,0x77,0xC4,0xB1,0x08,0xBE,0xD9,
+         0x81,0xED,0x0E,0x89,0x0E,0x11,0x7C,0x51,0x1C,0xF0,
+         0x72,
+
+         /* b */
+         0x06,0x67,0xAC,0xEB,0x38,0xAF,0x4E,0x48,0x8C,0x40,
+         0x74,0x33,0xFF,0xAE,0x4F,0x1C,0x81,0x16,0x38,0xDF,
+         0x20,
+
+         /* x */
+         0x00,0x24,0x26,0x6E,0x4E,0xB5,0x10,0x6D,0x0A,0x96,
+         0x4D,0x92,0xC4,0x86,0x0E,0x26,0x71,0xDB,0x9B,0x6C,
+         0xC5,
+
+         /* y */
+         0x07,0x9F,0x68,0x4D,0xDF,0x66,0x84,0xC5,0xCD,0x25,
+         0x8B,0x38,0x90,0x02,0x1B,0x23,0x86,0xDF,0xD1,0x9F,
+         0xC5,
+
+         /* order */
+         0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFD,0xF6,0x4D,0xE1,0x15,0x1A,0xDB,0xB7,0x8F,0x10,
+         0xA7 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_163V3_SEED[] = {
-       0x50,0xCB,0xF1,0xD9,0x5C,0xA9,0x4D,0x69,0x6E,0x67,
-       0x68,0x75,0x61,0x51,0x75,0xF1,0x6A,0x36,0xA3,0xB8};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V3 = {
-       NID_X9_62_characteristic_two_field,
-       "080000000000000000000000000000000000000107",
-       "07A526C63D3E25A256A007699F5447E32AE456B50E",
-       "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
-       "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
-       "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
-       "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2,
-       _EC_X9_62_CHAR2_163V3_SEED, 20,
-       "163 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+21*6]; }
+       _EC_X9_62_CHAR2_163V3 = {
+       { NID_X9_62_characteristic_two_field,20,21,2 },
+       { 
+         /* seed */
+         0x50,0xCB,0xF1,0xD9,0x5C,0xA9,0x4D,0x69,0x6E,0x67,
+         0x68,0x75,0x61,0x51,0x75,0xF1,0x6A,0x36,0xA3,0xB8,
+
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+         0x07,
+
+         /* a */
+         0x07,0xA5,0x26,0xC6,0x3D,0x3E,0x25,0xA2,0x56,0xA0,
+         0x07,0x69,0x9F,0x54,0x47,0xE3,0x2A,0xE4,0x56,0xB5,
+         0x0E,
+
+         /* b */
+         0x03,0xF7,0x06,0x17,0x98,0xEB,0x99,0xE2,0x38,0xFD,
+         0x6F,0x1B,0xF9,0x5B,0x48,0xFE,0xEB,0x48,0x54,0x25,
+         0x2B,
+
+         /* x */
+         0x02,0xF9,0xF8,0x7B,0x7C,0x57,0x4D,0x0B,0xDE,0xCF,
+         0x8A,0x22,0xE6,0x52,0x47,0x75,0xF9,0x8C,0xDE,0xBD,
+         0xCB,
+
+         /* y */
+         0x05,0xB9,0x35,0x59,0x0C,0x15,0x5E,0x17,0xEA,0x48,
+         0xEB,0x3F,0xF3,0x71,0x8B,0x89,0x3D,0xF5,0x9A,0x05,
+         0xD0,
+
+         /* order */
+         0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFE,0x1A,0xEE,0x14,0x0F,0x11,0x0A,0xFF,0x96,0x13,
+         0x09 }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_176V1 = {
-       NID_X9_62_characteristic_two_field,
-       "0100000000000000000000000000000000080000000007",
-       "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
-       "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
-       "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
-       "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
-       "00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E,
-       NULL, 0,
-       "176 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+23*6]; }
+       _EC_X9_62_CHAR2_176V1 = {
+       { NID_X9_62_characteristic_two_field,0,23,0xFF6E },
+       {
+         /* no seed */
+         /* p */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,
+         0x00,0x00,0x07,
+
+         /* a */
+         0x00,0xE4,0xE6,0xDB,0x29,0x95,0x06,0x5C,0x40,0x7D,
+         0x9D,0x39,0xB8,0xD0,0x96,0x7B,0x96,0x70,0x4B,0xA8,
+         0xE9,0xC9,0x0B,
+
+         /* b */
+         0x00,0x5D,0xDA,0x47,0x0A,0xBE,0x64,0x14,0xDE,0x8E,
+         0xC1,0x33,0xAE,0x28,0xE9,0xBB,0xD7,0xFC,0xEC,0x0A,
+         0xE0,0xFF,0xF2,
+
+         /* x */
+         0x00,0x8D,0x16,0xC2,0x86,0x67,0x98,0xB6,0x00,0xF9,
+         0xF0,0x8B,0xB4,0xA8,0xE8,0x60,0xF3,0x29,0x8C,0xE0,
+         0x4A,0x57,0x98,
+
+         /* y */
+         0x00,0x6F,0xA4,0x53,0x9C,0x2D,0xAD,0xDD,0xD6,0xBA,
+         0xB5,0x16,0x7D,0x61,0xB4,0x36,0xE1,0xD9,0x2B,0xB1,
+         0x6A,0x56,0x2C,
+
+         /* order */
+         0x00,0x00,0x01,0x00,0x92,0x53,0x73,0x97,0xEC,0xA4,
+         0xF6,0x14,0x57,0x99,0xD6,0x2B,0x0A,0x19,0xCE,0x06,
+         0xFE,0x26,0xAD }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_191V1_SEED[] = {
-       0x4E,0x13,0xCA,0x54,0x27,0x44,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x55,0x2F,0x27,0x9A,0x8C,0x84};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000201",
-       "2866537B676752636A68F56554E12640276B649EF7526267",
-       "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
-       "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
-       "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
-       "40000000000000000000000004A20E90C39067C893BBB9A5", 2,
-       _EC_X9_62_CHAR2_191V1_SEED, 20,
-       "191 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_X9_62_CHAR2_191V1 = {
+       { NID_X9_62_characteristic_two_field,20,24,2 },
+       { 
+         /* seed */
+         0x4E,0x13,0xCA,0x54,0x27,0x44,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x55,0x2F,0x27,0x9A,0x8C,0x84,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x28,0x66,0x53,0x7B,0x67,0x67,0x52,0x63,0x6A,0x68,
+         0xF5,0x65,0x54,0xE1,0x26,0x40,0x27,0x6B,0x64,0x9E,
+         0xF7,0x52,0x62,0x67,
+
+         /* b */
+         0x2E,0x45,0xEF,0x57,0x1F,0x00,0x78,0x6F,0x67,0xB0,
+         0x08,0x1B,0x94,0x95,0xA3,0xD9,0x54,0x62,0xF5,0xDE,
+         0x0A,0xA1,0x85,0xEC,
+
+         /* x */
+         0x36,0xB3,0xDA,0xF8,0xA2,0x32,0x06,0xF9,0xC4,0xF2,
+         0x99,0xD7,0xB2,0x1A,0x9C,0x36,0x91,0x37,0xF2,0xC8,
+         0x4A,0xE1,0xAA,0x0D,
+
+         /* y */
+         0x76,0x5B,0xE7,0x34,0x33,0xB3,0xF9,0x5E,0x33,0x29,
+         0x32,0xE7,0x0E,0xA2,0x45,0xCA,0x24,0x18,0xEA,0x0E,
+         0xF9,0x80,0x18,0xFB,
+
+         /* order */
+         0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x04,0xA2,0x0E,0x90,0xC3,0x90,0x67,0xC8,
+         0x93,0xBB,0xB9,0xA5 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_191V2_SEED[] = {
-       0x08,0x71,0xEF,0x2F,0xEF,0x24,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x58,0xBE,0xE0,0xD9,0x5C,0x15};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V2 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000201",
-       "401028774D7777C7B7666D1366EA432071274F89FF01E718",
-       "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
-       "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
-       "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
-       "20000000000000000000000050508CB89F652824E06B8173", 4,
-       _EC_X9_62_CHAR2_191V2_SEED, 20,
-       "191 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_X9_62_CHAR2_191V2 = {
+       { NID_X9_62_characteristic_two_field,20,24,4 },
+       { 
+         /* seed */
+         0x08,0x71,0xEF,0x2F,0xEF,0x24,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x58,0xBE,0xE0,0xD9,0x5C,0x15,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x40,0x10,0x28,0x77,0x4D,0x77,0x77,0xC7,0xB7,0x66,
+         0x6D,0x13,0x66,0xEA,0x43,0x20,0x71,0x27,0x4F,0x89,
+         0xFF,0x01,0xE7,0x18,
+
+         /* b */
+         0x06,0x20,0x04,0x8D,0x28,0xBC,0xBD,0x03,0xB6,0x24,
+         0x9C,0x99,0x18,0x2B,0x7C,0x8C,0xD1,0x97,0x00,0xC3,
+         0x62,0xC4,0x6A,0x01,
+
+         /* x */
+         0x38,0x09,0xB2,0xB7,0xCC,0x1B,0x28,0xCC,0x5A,0x87,
+         0x92,0x6A,0xAD,0x83,0xFD,0x28,0x78,0x9E,0x81,0xE2,
+         0xC9,0xE3,0xBF,0x10,
+
+         /* y */
+         0x17,0x43,0x43,0x86,0x62,0x6D,0x14,0xF3,0xDB,0xF0,
+         0x17,0x60,0xD9,0x21,0x3A,0x3E,0x1C,0xF3,0x7A,0xEC,
+         0x43,0x7D,0x66,0x8A,
+
+         /* order */
+         0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x50,0x50,0x8C,0xB8,0x9F,0x65,0x28,0x24,
+         0xE0,0x6B,0x81,0x73 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_191V3_SEED[] = {
-       0xE0,0x53,0x51,0x2D,0xC6,0x84,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x50,0x67,0xAE,0x78,0x6D,0x1F};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V3 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000201",
-       "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
-       "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
-       "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
-       "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
-       "155555555555555555555555610C0B196812BFB6288A3EA3", 6,
-       _EC_X9_62_CHAR2_191V3_SEED, 20,
-       "191 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+24*6]; }
+       _EC_X9_62_CHAR2_191V3 = {
+       { NID_X9_62_characteristic_two_field,20,24,6 },
+       {
+         /* seed */
+         0xE0,0x53,0x51,0x2D,0xC6,0x84,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x50,0x67,0xAE,0x78,0x6D,0x1F,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x6C,0x01,0x07,0x47,0x56,0x09,0x91,0x22,0x22,0x10,
+         0x56,0x91,0x1C,0x77,0xD7,0x7E,0x77,0xA7,0x77,0xE7,
+         0xE7,0xE7,0x7F,0xCB,
+
+         /* b */
+         0x71,0xFE,0x1A,0xF9,0x26,0xCF,0x84,0x79,0x89,0xEF,
+         0xEF,0x8D,0xB4,0x59,0xF6,0x63,0x94,0xD9,0x0F,0x32,
+         0xAD,0x3F,0x15,0xE8,
+
+         /* x */
+         0x37,0x5D,0x4C,0xE2,0x4F,0xDE,0x43,0x44,0x89,0xDE,
+         0x87,0x46,0xE7,0x17,0x86,0x01,0x50,0x09,0xE6,0x6E,
+         0x38,0xA9,0x26,0xDD,
+
+         /* y */
+         0x54,0x5A,0x39,0x17,0x61,0x96,0x57,0x5D,0x98,0x59,
+         0x99,0x36,0x6E,0x6A,0xD3,0x4C,0xE0,0xA7,0x7C,0xD7,
+         0x12,0x7B,0x06,0xBE,
+
+         /* order */
+         0x15,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+         0x55,0x55,0x61,0x0C,0x0B,0x19,0x68,0x12,0xBF,0xB6,
+         0x28,0x8A,0x3E,0xA3 }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_208W1 = {
-       NID_X9_62_characteristic_two_field,
-       "010000000000000000000000000000000800000000000000000007",
-       "0000000000000000000000000000000000000000000000000000",
-       "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
-       "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
-       "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
-       "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48,
-       NULL, 0,
-       "208 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+27*6]; }
+       _EC_X9_62_CHAR2_208W1 = {
+       { NID_X9_62_characteristic_two_field,0,27,0xFE48 },
+       {
+         /* no seed */
+         /* p */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,    
+         0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x07,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,    
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0xC8,0x61,0x9E,0xD4,0x5A,0x62,0xE6,0x21,0x2E,    
+         0x11,0x60,0x34,0x9E,0x2B,0xFA,0x84,0x44,0x39,0xFA,
+         0xFC,0x2A,0x3F,0xD1,0x63,0x8F,0x9E,
+
+         /* x */
+         0x00,0x89,0xFD,0xFB,0xE4,0xAB,0xE1,0x93,0xDF,0x95,    
+         0x59,0xEC,0xF0,0x7A,0xC0,0xCE,0x78,0x55,0x4E,0x27,
+         0x84,0xEB,0x8C,0x1E,0xD1,0xA5,0x7A,
+
+         /* y */
+         0x00,0x0F,0x55,0xB5,0x1A,0x06,0xE7,0x8E,0x9A,0xC3,    
+         0x8A,0x03,0x5F,0xF5,0x20,0xD8,0xB0,0x17,0x81,0xBE,
+         0xB1,0xA6,0xBB,0x08,0x61,0x7D,0xE3,
+
+         /* order */
+         0x00,0x00,0x01,0x01,0xBA,0xF9,0x5C,0x97,0x23,0xC5,    
+         0x7B,0x6C,0x21,0xDA,0x2E,0xFF,0x2D,0x5E,0xD5,0x88,
+         0xBD,0xD5,0x71,0x7E,0x21,0x2F,0x9D }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_239V1_SEED[] = {
-       0xD3,0x4B,0x9A,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
-       0x51,0x75,0xCA,0x71,0xB9,0x20,0xBF,0xEF,0xB0,0x5D};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000001000000001",
-       "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
-       "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
-       "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
-       "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
-       "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4,
-       _EC_X9_62_CHAR2_239V1_SEED, 20,
-       "239 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_CHAR2_239V1 = {
+       { NID_X9_62_characteristic_two_field,20,30,4 },
+       {
+         /* seed */
+         0xD3,0x4B,0x9A,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+         0x51,0x75,0xCA,0x71,0xB9,0x20,0xBF,0xEF,0xB0,0x5D,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x32,0x01,0x08,0x57,0x07,0x7C,0x54,0x31,0x12,0x3A,
+         0x46,0xB8,0x08,0x90,0x67,0x56,0xF5,0x43,0x42,0x3E,
+         0x8D,0x27,0x87,0x75,0x78,0x12,0x57,0x78,0xAC,0x76,
+
+         /* b */
+         0x79,0x04,0x08,0xF2,0xEE,0xDA,0xF3,0x92,0xB0,0x12,
+         0xED,0xEF,0xB3,0x39,0x2F,0x30,0xF4,0x32,0x7C,0x0C,
+         0xA3,0xF3,0x1F,0xC3,0x83,0xC4,0x22,0xAA,0x8C,0x16,
+
+         /* x */
+         0x57,0x92,0x70,0x98,0xFA,0x93,0x2E,0x7C,0x0A,0x96,
+         0xD3,0xFD,0x5B,0x70,0x6E,0xF7,0xE5,0xF5,0xC1,0x56,
+         0xE1,0x6B,0x7E,0x7C,0x86,0x03,0x85,0x52,0xE9,0x1D,
+
+         /* y */
+         0x61,0xD8,0xEE,0x50,0x77,0xC3,0x3F,0xEC,0xF6,0xF1,
+         0xA1,0x6B,0x26,0x8D,0xE4,0x69,0xC3,0xC7,0x74,0x4E,
+         0xA9,0xA9,0x71,0x64,0x9F,0xC7,0xA9,0x61,0x63,0x05,
+
+         /* order */
+         0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x0F,0x4D,0x42,0xFF,0xE1,
+         0x49,0x2A,0x49,0x93,0xF1,0xCA,0xD6,0x66,0xE4,0x47 }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_239V2_SEED[] = {
-       0x2A,0xA6,0x98,0x2F,0xDF,0xA4,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x5D,0x26,0x67,0x27,0x27,0x7D};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V2 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000001000000001",
-       "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
-       "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
-       "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
-       "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
-       "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6,
-       _EC_X9_62_CHAR2_239V2_SEED, 20,
-       "239 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_CHAR2_239V2 = {
+       { NID_X9_62_characteristic_two_field,20,30,6 },
+       {
+         /* seed */
+         0x2A,0xA6,0x98,0x2F,0xDF,0xA4,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x5D,0x26,0x67,0x27,0x27,0x7D,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x42,0x30,0x01,0x77,0x57,0xA7,0x67,0xFA,0xE4,0x23,
+         0x98,0x56,0x9B,0x74,0x63,0x25,0xD4,0x53,0x13,0xAF,
+         0x07,0x66,0x26,0x64,0x79,0xB7,0x56,0x54,0xE6,0x5F,
+
+         /* b */
+         0x50,0x37,0xEA,0x65,0x41,0x96,0xCF,0xF0,0xCD,0x82,
+         0xB2,0xC1,0x4A,0x2F,0xCF,0x2E,0x3F,0xF8,0x77,0x52,
+         0x85,0xB5,0x45,0x72,0x2F,0x03,0xEA,0xCD,0xB7,0x4B,
+
+         /* x */
+         0x28,0xF9,0xD0,0x4E,0x90,0x00,0x69,0xC8,0xDC,0x47,
+         0xA0,0x85,0x34,0xFE,0x76,0xD2,0xB9,0x00,0xB7,0xD7,
+         0xEF,0x31,0xF5,0x70,0x9F,0x20,0x0C,0x4C,0xA2,0x05,
+
+         /* y */
+         0x56,0x67,0x33,0x4C,0x45,0xAF,0xF3,0xB5,0xA0,0x3B,
+         0xAD,0x9D,0xD7,0x5E,0x2C,0x71,0xA9,0x93,0x62,0x56,
+         0x7D,0x54,0x53,0xF7,0xFA,0x6E,0x22,0x7E,0xC8,0x33,
+
+         /* order */
+         0x15,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,
+         0x55,0x55,0x55,0x55,0x55,0x3C,0x6F,0x28,0x85,0x25,
+         0x9C,0x31,0xE3,0xFC,0xDF,0x15,0x46,0x24,0x52,0x2D }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_239V3_SEED[] = {
-       0x9E,0x07,0x6F,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
-       0x51,0x75,0xE1,0x1E,0x9F,0xDD,0x77,0xF9,0x20,0x41};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V3 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000001000000001",
-       "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
-       "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
-       "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
-       "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
-       "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA,
-       _EC_X9_62_CHAR2_239V3_SEED, 20,
-       "239 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+30*6]; }
+       _EC_X9_62_CHAR2_239V3 = {
+       { NID_X9_62_characteristic_two_field,20,30,0xA },
+       { 
+         /* seed */
+         0x9E,0x07,0x6F,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+         0x51,0x75,0xE1,0x1E,0x9F,0xDD,0x77,0xF9,0x20,0x41,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x01,0x23,0x87,0x74,0x66,0x6A,0x67,0x76,0x6D,0x66,
+         0x76,0xF7,0x78,0xE6,0x76,0xB6,0x69,0x99,0x17,0x66,
+         0x66,0xE6,0x87,0x66,0x6D,0x87,0x66,0xC6,0x6A,0x9F,
+
+         /* b */
+         0x6A,0x94,0x19,0x77,0xBA,0x9F,0x6A,0x43,0x51,0x99,
+         0xAC,0xFC,0x51,0x06,0x7E,0xD5,0x87,0xF5,0x19,0xC5,
+         0xEC,0xB5,0x41,0xB8,0xE4,0x41,0x11,0xDE,0x1D,0x40,
+
+         /* x */
+         0x70,0xF6,0xE9,0xD0,0x4D,0x28,0x9C,0x4E,0x89,0x91,
+         0x3C,0xE3,0x53,0x0B,0xFD,0xE9,0x03,0x97,0x7D,0x42,
+         0xB1,0x46,0xD5,0x39,0xBF,0x1B,0xDE,0x4E,0x9C,0x92,
+
+         /* y */
+         0x2E,0x5A,0x0E,0xAF,0x6E,0x5E,0x13,0x05,0xB9,0x00,
+         0x4D,0xCE,0x5C,0x0E,0xD7,0xFE,0x59,0xA3,0x56,0x08,
+         0xF3,0x38,0x37,0xC8,0x16,0xD8,0x0B,0x79,0xF4,0x61,
+
+         /* order */
+         0x0C,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,
+         0xCC,0xCC,0xCC,0xCC,0xCC,0xAC,0x49,0x12,0xD2,0xD9,
+         0xDF,0x90,0x3E,0xF9,0x88,0x8B,0x8A,0x0E,0x4C,0xFF }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_272W1 = {
-       NID_X9_62_characteristic_two_field,
-       "010000000000000000000000000000000000000000000000000000010000000000000"
-       "B",
-       "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
-       "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
-       "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
-       "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
-       "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
-       0xFF06,
-       NULL, 0,
-       "272 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+35*6]; }
+       _EC_X9_62_CHAR2_272W1 = {
+       { NID_X9_62_characteristic_two_field,0,35,0xFF06 },
+       {
+         /* no seed */
+         /* p */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,    
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x0B,
+         
+         /* a */
+         0x00,0x91,0xA0,0x91,0xF0,0x3B,0x5F,0xBA,0x4A,0xB2,
+         0xCC,0xF4,0x9C,0x4E,0xDD,0x22,0x0F,0xB0,0x28,0x71,
+         0x2D,0x42,0xBE,0x75,0x2B,0x2C,0x40,0x09,0x4D,0xBA,
+         0xCD,0xB5,0x86,0xFB,0x20,
+
+         /* b */
+         0x00,0x71,0x67,0xEF,0xC9,0x2B,0xB2,0xE3,0xCE,0x7C,
+         0x8A,0xAA,0xFF,0x34,0xE1,0x2A,0x9C,0x55,0x70,0x03,
+         0xD7,0xC7,0x3A,0x6F,0xAF,0x00,0x3F,0x99,0xF6,0xCC,
+         0x84,0x82,0xE5,0x40,0xF7,
+
+         /* x */
+         0x00,0x61,0x08,0xBA,0xBB,0x2C,0xEE,0xBC,0xF7,0x87,
+         0x05,0x8A,0x05,0x6C,0xBE,0x0C,0xFE,0x62,0x2D,0x77,
+         0x23,0xA2,0x89,0xE0,0x8A,0x07,0xAE,0x13,0xEF,0x0D,
+         0x10,0xD1,0x71,0xDD,0x8D,
+
+         /* y */
+         0x00,0x10,0xC7,0x69,0x57,0x16,0x85,0x1E,0xEF,0x6B,
+         0xA7,0xF6,0x87,0x2E,0x61,0x42,0xFB,0xD2,0x41,0xB8,
+         0x30,0xFF,0x5E,0xFC,0xAC,0xEC,0xCA,0xB0,0x5E,0x02,
+         0x00,0x5D,0xDE,0x9D,0x23,
+
+         /* order */
+         0x00,0x00,0x01,0x00,0xFA,0xF5,0x13,0x54,0xE0,0xE3,
+         0x9E,0x48,0x92,0xDF,0x6E,0x31,0x9C,0x72,0xC8,0x16,
+         0x16,0x03,0xFA,0x45,0xAA,0x7B,0x99,0x8A,0x16,0x7B,
+         0x8F,0x1E,0x62,0x95,0x21 }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_304W1 = {
-       NID_X9_62_characteristic_two_field,
-       "010000000000000000000000000000000000000000000000000000000000000000000"
-       "000000807",
-       "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A039"
-       "6C8E681",
-       "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E558"
-       "27340BE",
-       "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F7"
-       "40A2614",
-       "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1"
-       "B92C03B",
-       "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164"
-       "443051D", 0xFE2E,
-       NULL, 0,
-       "304 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+39*6]; }
+       _EC_X9_62_CHAR2_304W1 = {
+       { NID_X9_62_characteristic_two_field,0,39,0xFE2E },
+       {
+         /* no seed */
+         /* p */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x07,
+         /* a */
+         0x00,0xFD,0x0D,0x69,0x31,0x49,0xA1,0x18,0xF6,0x51,
+         0xE6,0xDC,0xE6,0x80,0x20,0x85,0x37,0x7E,0x5F,0x88,
+         0x2D,0x1B,0x51,0x0B,0x44,0x16,0x00,0x74,0xC1,0x28,
+         0x80,0x78,0x36,0x5A,0x03,0x96,0xC8,0xE6,0x81,
+         /* b */
+         0x00,0xBD,0xDB,0x97,0xE5,0x55,0xA5,0x0A,0x90,0x8E,
+         0x43,0xB0,0x1C,0x79,0x8E,0xA5,0xDA,0xA6,0x78,0x8F,
+         0x1E,0xA2,0x79,0x4E,0xFC,0xF5,0x71,0x66,0xB8,0xC1,
+         0x40,0x39,0x60,0x1E,0x55,0x82,0x73,0x40,0xBE,
+         /* x */
+         0x00,0x19,0x7B,0x07,0x84,0x5E,0x9B,0xE2,0xD9,0x6A,
+         0xDB,0x0F,0x5F,0x3C,0x7F,0x2C,0xFF,0xBD,0x7A,0x3E,
+         0xB8,0xB6,0xFE,0xC3,0x5C,0x7F,0xD6,0x7F,0x26,0xDD,
+         0xF6,0x28,0x5A,0x64,0x4F,0x74,0x0A,0x26,0x14,
+         /* y */
+         0x00,0xE1,0x9F,0xBE,0xB7,0x6E,0x0D,0xA1,0x71,0x51,
+         0x7E,0xCF,0x40,0x1B,0x50,0x28,0x9B,0xF0,0x14,0x10,
+         0x32,0x88,0x52,0x7A,0x9B,0x41,0x6A,0x10,0x5E,0x80,
+         0x26,0x0B,0x54,0x9F,0xDC,0x1B,0x92,0xC0,0x3B,
+         /* order */
+         0x00,0x00,0x01,0x01,0xD5,0x56,0x57,0x2A,0xAB,0xAC,
+         0x80,0x01,0x01,0xD5,0x56,0x57,0x2A,0xAB,0xAC,0x80,
+         0x01,0x02,0x2D,0x5C,0x91,0xDD,0x17,0x3F,0x8F,0xB5,
+         0x61,0xDA,0x68,0x99,0x16,0x44,0x43,0x05,0x1D }
        };
 
-static const unsigned char _EC_X9_62_CHAR2_359V1_SEED[] = {
-       0x2B,0x35,0x49,0x20,0xB7,0x24,0xD6,0x96,0xE6,0x76,
-       0x87,0x56,0x15,0x17,0x58,0x5B,0xA1,0x33,0x2D,0xC6};
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_359V1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000000000000000000000000"
-       "000100000000000000001",
-       "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05"
-       "656FB549016A96656A557",
-       "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC34562608968"
-       "7742B6329E70680231988",
-       "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE9"
-       "8E8E707C07A2239B1B097",
-       "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E"
-       "4AE2DE211305A407104BD",
-       "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB9"
-       "64FE7719E74F490758D3B", 0x4C,
-       _EC_X9_62_CHAR2_359V1_SEED, 20,
-       "359 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[20+45*6]; }
+       _EC_X9_62_CHAR2_359V1 = {
+       { NID_X9_62_characteristic_two_field,20,45,0x4C },
+       {
+         /* seed */
+         0x2B,0x35,0x49,0x20,0xB7,0x24,0xD6,0x96,0xE6,0x76,
+         0x87,0x56,0x15,0x17,0x58,0x5B,0xA1,0x33,0x2D,0xC6,
+
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x56,0x67,0x67,0x6A,0x65,0x4B,0x20,0x75,0x4F,0x35,
+         0x6E,0xA9,0x20,0x17,0xD9,0x46,0x56,0x7C,0x46,0x67,
+         0x55,0x56,0xF1,0x95,0x56,0xA0,0x46,0x16,0xB5,0x67,
+         0xD2,0x23,0xA5,0xE0,0x56,0x56,0xFB,0x54,0x90,0x16,
+         0xA9,0x66,0x56,0xA5,0x57,
+
+         /* b */
+         0x24,0x72,0xE2,0xD0,0x19,0x7C,0x49,0x36,0x3F,0x1F,
+         0xE7,0xF5,0xB6,0xDB,0x07,0x5D,0x52,0xB6,0x94,0x7D,
+         0x13,0x5D,0x8C,0xA4,0x45,0x80,0x5D,0x39,0xBC,0x34,
+         0x56,0x26,0x08,0x96,0x87,0x74,0x2B,0x63,0x29,0xE7,
+         0x06,0x80,0x23,0x19,0x88,
+
+         /* x */
+         0x3C,0x25,0x8E,0xF3,0x04,0x77,0x67,0xE7,0xED,0xE0,
+         0xF1,0xFD,0xAA,0x79,0xDA,0xEE,0x38,0x41,0x36,0x6A,
+         0x13,0x2E,0x16,0x3A,0xCE,0xD4,0xED,0x24,0x01,0xDF,
+         0x9C,0x6B,0xDC,0xDE,0x98,0xE8,0xE7,0x07,0xC0,0x7A,
+         0x22,0x39,0xB1,0xB0,0x97,
+
+         /* y */
+         0x53,0xD7,0xE0,0x85,0x29,0x54,0x70,0x48,0x12,0x1E,
+         0x9C,0x95,0xF3,0x79,0x1D,0xD8,0x04,0x96,0x39,0x48,
+         0xF3,0x4F,0xAE,0x7B,0xF4,0x4E,0xA8,0x23,0x65,0xDC,
+         0x78,0x68,0xFE,0x57,0xE4,0xAE,0x2D,0xE2,0x11,0x30,
+         0x5A,0x40,0x71,0x04,0xBD,
+
+         /* order */
+         0x01,0xAF,0x28,0x6B,0xCA,0x1A,0xF2,0x86,0xBC,0xA1,
+         0xAF,0x28,0x6B,0xCA,0x1A,0xF2,0x86,0xBC,0xA1,0xAF,
+         0x28,0x6B,0xC9,0xFB,0x8F,0x6B,0x85,0xC5,0x56,0x89,
+         0x2C,0x20,0xA7,0xEB,0x96,0x4F,0xE7,0x71,0x9E,0x74,
+         0xF4,0x90,0x75,0x8D,0x3B }
+       };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+47*6]; }
+       _EC_X9_62_CHAR2_368W1 = {
+       { NID_X9_62_characteristic_two_field,0,47,0xFF70 },
+       {
+         /* no seed */
+         /* p */
+         0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x07,
+
+         /* a */
+         0x00,0xE0,0xD2,0xEE,0x25,0x09,0x52,0x06,0xF5,0xE2,
+         0xA4,0xF9,0xED,0x22,0x9F,0x1F,0x25,0x6E,0x79,0xA0,
+         0xE2,0xB4,0x55,0x97,0x0D,0x8D,0x0D,0x86,0x5B,0xD9,
+         0x47,0x78,0xC5,0x76,0xD6,0x2F,0x0A,0xB7,0x51,0x9C,
+         0xCD,0x2A,0x1A,0x90,0x6A,0xE3,0x0D,
+
+         /* b */
+         0x00,0xFC,0x12,0x17,0xD4,0x32,0x0A,0x90,0x45,0x2C,
+         0x76,0x0A,0x58,0xED,0xCD,0x30,0xC8,0xDD,0x06,0x9B,
+         0x3C,0x34,0x45,0x38,0x37,0xA3,0x4E,0xD5,0x0C,0xB5,
+         0x49,0x17,0xE1,0xC2,0x11,0x2D,0x84,0xD1,0x64,0xF4,
+         0x44,0xF8,0xF7,0x47,0x86,0x04,0x6A,
+
+         /* x */
+         0x00,0x10,0x85,0xE2,0x75,0x53,0x81,0xDC,0xCC,0xE3,
+         0xC1,0x55,0x7A,0xFA,0x10,0xC2,0xF0,0xC0,0xC2,0x82,
+         0x56,0x46,0xC5,0xB3,0x4A,0x39,0x4C,0xBC,0xFA,0x8B,
+         0xC1,0x6B,0x22,0xE7,0xE7,0x89,0xE9,0x27,0xBE,0x21,
+         0x6F,0x02,0xE1,0xFB,0x13,0x6A,0x5F,
+
+         /* y */
+         0x00,0x7B,0x3E,0xB1,0xBD,0xDC,0xBA,0x62,0xD5,0xD8,
+         0xB2,0x05,0x9B,0x52,0x57,0x97,0xFC,0x73,0x82,0x2C,
+         0x59,0x05,0x9C,0x62,0x3A,0x45,0xFF,0x38,0x43,0xCE,
+         0xE8,0xF8,0x7C,0xD1,0x85,0x5A,0xDA,0xA8,0x1E,0x2A,
+         0x07,0x50,0xB8,0x0F,0xDA,0x23,0x10,
+
+         /* order */
+         0x00,0x00,0x01,0x00,0x90,0x51,0x2D,0xA9,0xAF,0x72,
+         0xB0,0x83,0x49,0xD9,0x8A,0x5D,0xD4,0xC7,0xB0,0x53,
+         0x2E,0xCA,0x51,0xCE,0x03,0xE2,0xD1,0x0F,0x3B,0x7A,
+         0xC5,0x79,0xBD,0x87,0xE9,0x09,0xAE,0x40,0xA6,0xF1,
+         0x31,0xE9,0xCF,0xCE,0x5B,0xD9,0x67 }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_368W1 = {
-       NID_X9_62_characteristic_two_field,
-       "010000000000000000000000000000000000000000000000000000000000000000000"
-       "0002000000000000000000007",
-       "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62"
-       "F0AB7519CCD2A1A906AE30D",
-       "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112"
-       "D84D164F444F8F74786046A",
-       "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E78"
-       "9E927BE216F02E1FB136A5F",
-       "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855"
-       "ADAA81E2A0750B80FDA2310",
-       "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E90"
-       "9AE40A6F131E9CFCE5BD967", 0xFF70,
-       NULL, 0,
-       "368 bit binary curve from X9.62"
+static const struct { EC_CURVE_DATA h; unsigned char data[0+54*6]; }
+       _EC_X9_62_CHAR2_431R1 = {
+       { NID_X9_62_characteristic_two_field,0,54,0x2760 },
+       {
+         /* no seed */
+         /* p */
+         0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x1A,0x82,0x7E,0xF0,0x0D,0xD6,0xFC,0x0E,0x23,0x4C,
+         0xAF,0x04,0x6C,0x6A,0x5D,0x8A,0x85,0x39,0x5B,0x23,
+         0x6C,0xC4,0xAD,0x2C,0xF3,0x2A,0x0C,0xAD,0xBD,0xC9,
+         0xDD,0xF6,0x20,0xB0,0xEB,0x99,0x06,0xD0,0x95,0x7F,
+         0x6C,0x6F,0xEA,0xCD,0x61,0x54,0x68,0xDF,0x10,0x4D,
+         0xE2,0x96,0xCD,0x8F,
+
+         /* b */
+         0x10,0xD9,0xB4,0xA3,0xD9,0x04,0x7D,0x8B,0x15,0x43,
+         0x59,0xAB,0xFB,0x1B,0x7F,0x54,0x85,0xB0,0x4C,0xEB,
+         0x86,0x82,0x37,0xDD,0xC9,0xDE,0xDA,0x98,0x2A,0x67,
+         0x9A,0x5A,0x91,0x9B,0x62,0x6D,0x4E,0x50,0xA8,0xDD,
+         0x73,0x1B,0x10,0x7A,0x99,0x62,0x38,0x1F,0xB5,0xD8,
+         0x07,0xBF,0x26,0x18,
+
+         /* x */
+         0x12,0x0F,0xC0,0x5D,0x3C,0x67,0xA9,0x9D,0xE1,0x61,
+         0xD2,0xF4,0x09,0x26,0x22,0xFE,0xCA,0x70,0x1B,0xE4,
+         0xF5,0x0F,0x47,0x58,0x71,0x4E,0x8A,0x87,0xBB,0xF2,
+         0xA6,0x58,0xEF,0x8C,0x21,0xE7,0xC5,0xEF,0xE9,0x65,
+         0x36,0x1F,0x6C,0x29,0x99,0xC0,0xC2,0x47,0xB0,0xDB,
+         0xD7,0x0C,0xE6,0xB7,
+
+         /* y */
+         0x20,0xD0,0xAF,0x89,0x03,0xA9,0x6F,0x8D,0x5F,0xA2,
+         0xC2,0x55,0x74,0x5D,0x3C,0x45,0x1B,0x30,0x2C,0x93,
+         0x46,0xD9,0xB7,0xE4,0x85,0xE7,0xBC,0xE4,0x1F,0x6B,
+         0x59,0x1F,0x3E,0x8F,0x6A,0xDD,0xCB,0xB0,0xBC,0x4C,
+         0x2F,0x94,0x7A,0x7D,0xE1,0xA8,0x9B,0x62,0x5D,0x6A,
+         0x59,0x8B,0x37,0x60,
+
+         /* order */
+         0x00,0x03,0x40,0x34,0x03,0x40,0x34,0x03,0x40,0x34,
+         0x03,0x40,0x34,0x03,0x40,0x34,0x03,0x40,0x34,0x03,
+         0x40,0x34,0x03,0x40,0x34,0x03,0x40,0x34,0x03,0x23,
+         0xC3,0x13,0xFA,0xB5,0x05,0x89,0x70,0x3B,0x5E,0xC6,
+         0x8D,0x35,0x87,0xFE,0xC6,0x0D,0x16,0x1C,0xC1,0x49,
+         0xC1,0xAD,0x4A,0x91 }
+       };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+15*6]; }
+       _EC_WTLS_1 = {
+       { NID_X9_62_characteristic_two_field,0,15,2 },
+       {
+         /* no seed */
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x02,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x01,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x01,
+
+         /* x */
+         0x01,0x66,0x79,0x79,0xA4,0x0B,0xA4,0x97,0xE5,0xD5,
+         0xC2,0x70,0x78,0x06,0x17,
+
+         /* y */
+         0x00,0xF4,0x4B,0x4A,0xF1,0xEC,0xC2,0x63,0x0E,0x08,
+         0x78,0x5C,0xEB,0xCC,0x15,
+
+         /* order */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0xBF,
+         0x91,0xAF,0x6D,0xEA,0x73 }
        };
 
-static const EC_CURVE_DATA _EC_X9_62_CHAR2_431R1 = {
-       NID_X9_62_characteristic_two_field,
-       "800000000000000000000000000000000000000000000000000000000000000000000"
-       "000000001000000000000000000000000000001",
-       "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0E"
-       "B9906D0957F6C6FEACD615468DF104DE296CD8F",
-       "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B6"
-       "26D4E50A8DD731B107A9962381FB5D807BF2618",
-       "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C2"
-       "1E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
-       "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6"
-       "ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
-       "0340340340340340340340340340340340340340340340340340340323C313FAB5058"
-       "9703B5EC68D3587FEC60D161CC149C1AD4A91", 0x2760,
-       NULL, 0,
-       "431 bit binary curve from X9.62"
+/* IPSec curves */
+/* NOTE: The of curves over a extension field of non prime degree
+ * is not recommended (Weil-descent).
+ * As the group order is not a prime this curve is not suitable
+ * for ECDSA.
+ */
+static const struct { EC_CURVE_DATA h; unsigned char data[0+20*6]; }
+       _EC_IPSEC_155_ID3 = {
+       { NID_X9_62_characteristic_two_field,0,20,3 },
+       {
+         /* no seed */
+         /* p */
+         0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x33,0x8f,
+
+         /* x */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7b,
+
+         /* y */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xc8,
+
+         /* order */
+         0x02,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,
+         0xC7,0xF3,0xC7,0x88,0x1B,0xD0,0x86,0x8F,0xA8,0x6C }
        };
 
-static const EC_CURVE_DATA _EC_WTLS_1 = {
-       NID_X9_62_characteristic_two_field,
-       "020000000000000000000000000201",
-       "1",
-       "1",
-       "01667979A40BA497E5D5C270780617",
-       "00F44B4AF1ECC2630E08785CEBCC15",
-       "00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2,
-       NULL, 0,
-       "113 bit binary curve from the WTLS standard"
+/* NOTE: The of curves over a extension field of non prime degree
+ * is not recommended (Weil-descent).
+ * As the group order is not a prime this curve is not suitable
+ * for ECDSA.
+ */
+static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
+       _EC_IPSEC_185_ID4 = {
+       { NID_X9_62_characteristic_two_field,0,24,2 },
+       {
+         /* no seed */
+         /* p */
+         0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x01,
+
+         /* a */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,
+
+         /* b */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x1e,0xe9,
+
+         /* x */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x18,
+
+         /* y */
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x0d,
+
+         /* order */
+         0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+         0xFF,0xFF,0xED,0xF9,0x7C,0x44,0xDB,0x9F,0x24,0x20,
+         0xBA,0xFC,0xA7,0x5E }
        };
 
+#endif
+
+/* These curves were added by Annie Yousar <a.yousar@informatik.hu-berlin.de>
+ * For the definition of RFC 5639 curves see
+ * http://www.ietf.org/rfc/rfc5639.txt
+ * These curves are generated verifiable at random, nevertheless the seed is
+ * omitted as parameter because the generation mechanism is different from
+ * those defined in ANSI X9.62.
+ */
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+20*6]; }
+   _EC_brainpoolP160r1 = {
+   { NID_X9_62_prime_field, 0,20,1 },
+   {
+        /* no seed */
+        /* p */
+     0xE9,0x5E,0x4A,0x5F,0x73,0x70,0x59,0xDC,0x60,0xDF,
+     0xC7,0xAD,0x95,0xB3,0xD8,0x13,0x95,0x15,0x62,0x0F,
+
+     /* a */
+     0x34,0x0E,0x7B,0xE2,0xA2,0x80,0xEB,0x74,0xE2,0xBE,
+     0x61,0xBA,0xDA,0x74,0x5D,0x97,0xE8,0xF7,0xC3,0x00,
+
+     /* b */
+     0x1E,0x58,0x9A,0x85,0x95,0x42,0x34,0x12,0x13,0x4F,
+     0xAA,0x2D,0xBD,0xEC,0x95,0xC8,0xD8,0x67,0x5E,0x58,
+
+     /* x */
+     0xBE,0xD5,0xAF,0x16,0xEA,0x3F,0x6A,0x4F,0x62,0x93,
+     0x8C,0x46,0x31,0xEB,0x5A,0xF7,0xBD,0xBC,0xDB,0xC3,
+
+     /* y */
+     0x16,0x67,0xCB,0x47,0x7A,0x1A,0x8E,0xC3,0x38,0xF9,
+     0x47,0x41,0x66,0x9C,0x97,0x63,0x16,0xDA,0x63,0x21,
+
+     /* order */
+     0xE9,0x5E,0x4A,0x5F,0x73,0x70,0x59,0xDC,0x60,0xDF,
+     0x59,0x91,0xD4,0x50,0x29,0x40,0x9E,0x60,0xFC,0x09 }
+    };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+20*6]; }
+   _EC_brainpoolP160t1 = {
+   { NID_X9_62_prime_field, 0,20,1 },
+   {
+         /* no seed */
+         /* p */
+     0xE9,0x5E,0x4A,0x5F,0x73,0x70,0x59,0xDC,0x60,0xDF,
+     0xC7,0xAD,0x95,0xB3,0xD8,0x13,0x95,0x15,0x62,0x0F,
+
+     /* a */
+     0xE9,0x5E,0x4A,0x5F,0x73,0x70,0x59,0xDC,0x60,0xDF,
+     0xC7,0xAD,0x95,0xB3,0xD8,0x13,0x95,0x15,0x62,0x0C,
+
+     /* b */
+     0x7A,0x55,0x6B,0x6D,0xAE,0x53,0x5B,0x7B,0x51,0xED,
+     0x2C,0x4D,0x7D,0xAA,0x7A,0x0B,0x5C,0x55,0xF3,0x80,
+
+     /* x */
+     0xB1,0x99,0xB1,0x3B,0x9B,0x34,0xEF,0xC1,0x39,0x7E,
+     0x64,0xBA,0xEB,0x05,0xAC,0xC2,0x65,0xFF,0x23,0x78,
+
+      /* y */
+     0xAD,0xD6,0x71,0x8B,0x7C,0x7C,0x19,0x61,0xF0,0x99,
+     0x1B,0x84,0x24,0x43,0x77,0x21,0x52,0xC9,0xE0,0xAD,
+
+     /* order */
+     0xE9,0x5E,0x4A,0x5F,0x73,0x70,0x59,0xDC,0x60,0xDF,
+     0x59,0x91,0xD4,0x50,0x29,0x40,0x9E,0x60,0xFC,0x09 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
+   _EC_brainpoolP192r1 = {
+   { NID_X9_62_prime_field, 0,24,1 },
+   {
+        /* no seed */
+        /* p */
+     0xC3,0x02,0xF4,0x1D,0x93,0x2A,0x36,0xCD,0xA7,0xA3,
+     0x46,0x30,0x93,0xD1,0x8D,0xB7,0x8F,0xCE,0x47,0x6D,
+     0xE1,0xA8,0x62,0x97,
+     
+     /* a */
+     0x6A,0x91,0x17,0x40,0x76,0xB1,0xE0,0xE1,0x9C,0x39,
+     0xC0,0x31,0xFE,0x86,0x85,0xC1,0xCA,0xE0,0x40,0xE5,
+     0xC6,0x9A,0x28,0xEF,
+     
+     /* b */
+     0x46,0x9A,0x28,0xEF,0x7C,0x28,0xCC,0xA3,0xDC,0x72,
+     0x1D,0x04,0x4F,0x44,0x96,0xBC,0xCA,0x7E,0xF4,0x14,
+     0x6F,0xBF,0x25,0xC9,
+     
+     /* x */
+     0xC0,0xA0,0x64,0x7E,0xAA,0xB6,0xA4,0x87,0x53,0xB0,
+     0x33,0xC5,0x6C,0xB0,0xF0,0x90,0x0A,0x2F,0x5C,0x48,
+     0x53,0x37,0x5F,0xD6,
+     
+     /* y */
+     0x14,0xB6,0x90,0x86,0x6A,0xBD,0x5B,0xB8,0x8B,0x5F,
+     0x48,0x28,0xC1,0x49,0x00,0x02,0xE6,0x77,0x3F,0xA2,
+     0xFA,0x29,0x9B,0x8F,
+     
+     /* order */
+     0xC3,0x02,0xF4,0x1D,0x93,0x2A,0x36,0xCD,0xA7,0xA3,
+     0x46,0x2F,0x9E,0x9E,0x91,0x6B,0x5B,0xE8,0xF1,0x02,
+     0x9A,0xC4,0xAC,0xC1 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+24*6]; }
+   _EC_brainpoolP192t1 = {
+   { NID_X9_62_prime_field, 0,24,1 },
+   {
+        /* no seed */
+        /* p */
+     0xC3,0x02,0xF4,0x1D,0x93,0x2A,0x36,0xCD,0xA7,0xA3,
+     0x46,0x30,0x93,0xD1,0x8D,0xB7,0x8F,0xCE,0x47,0x6D,
+     0xE1,0xA8,0x62,0x97,
+
+     /* a */
+     0xC3,0x02,0xF4,0x1D,0x93,0x2A,0x36,0xCD,0xA7,0xA3,
+     0x46,0x30,0x93,0xD1,0x8D,0xB7,0x8F,0xCE,0x47,0x6D,
+     0xE1,0xA8,0x62,0x94,
+
+     /* b */
+     0x13,0xD5,0x6F,0xFA,0xEC,0x78,0x68,0x1E,0x68,0xF9,
+     0xDE,0xB4,0x3B,0x35,0xBE,0xC2,0xFB,0x68,0x54,0x2E,
+     0x27,0x89,0x7B,0x79,
+
+     /* x */
+     0x3A,0xE9,0xE5,0x8C,0x82,0xF6,0x3C,0x30,0x28,0x2E,
+     0x1F,0xE7,0xBB,0xF4,0x3F,0xA7,0x2C,0x44,0x6A,0xF6,
+     0xF4,0x61,0x81,0x29,
+
+     /* y */
+     0x09,0x7E,0x2C,0x56,0x67,0xC2,0x22,0x3A,0x90,0x2A,
+     0xB5,0xCA,0x44,0x9D,0x00,0x84,0xB7,0xE5,0xB3,0xDE,
+     0x7C,0xCC,0x01,0xC9,
+
+     /* order */
+     0xC3,0x02,0xF4,0x1D,0x93,0x2A,0x36,0xCD,0xA7,0xA3,
+     0x46,0x2F,0x9E,0x9E,0x91,0x6B,0x5B,0xE8,0xF1,0x02,
+     0x9A,0xC4,0xAC,0xC1 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+28*6]; }
+   _EC_brainpoolP224r1 = {
+   { NID_X9_62_prime_field, 0,28,1 },
+   { /* no seed */
+     /* p */
+     0xD7,0xC1,0x34,0xAA,0x26,0x43,0x66,0x86,0x2A,0x18,    
+     0x30,0x25,0x75,0xD1,0xD7,0x87,0xB0,0x9F,0x07,0x57,
+     0x97,0xDA,0x89,0xF5,0x7E,0xC8,0xC0,0xFF,
+
+     /* a */
+     0x68,0xA5,0xE6,0x2C,0xA9,0xCE,0x6C,0x1C,0x29,0x98,    
+     0x03,0xA6,0xC1,0x53,0x0B,0x51,0x4E,0x18,0x2A,0xD8,
+     0xB0,0x04,0x2A,0x59,0xCA,0xD2,0x9F,0x43,
+
+     /* b */
+     0x25,0x80,0xF6,0x3C,0xCF,0xE4,0x41,0x38,0x87,0x07,    
+     0x13,0xB1,0xA9,0x23,0x69,0xE3,0x3E,0x21,0x35,0xD2,
+     0x66,0xDB,0xB3,0x72,0x38,0x6C,0x40,0x0B,
+
+     /* x */
+     0x0D,0x90,0x29,0xAD,0x2C,0x7E,0x5C,0xF4,0x34,0x08,    
+     0x23,0xB2,0xA8,0x7D,0xC6,0x8C,0x9E,0x4C,0xE3,0x17,
+     0x4C,0x1E,0x6E,0xFD,0xEE,0x12,0xC0,0x7D,
+
+     /* y */
+     0x58,0xAA,0x56,0xF7,0x72,0xC0,0x72,0x6F,0x24,0xC6,    
+     0xB8,0x9E,0x4E,0xCD,0xAC,0x24,0x35,0x4B,0x9E,0x99,
+     0xCA,0xA3,0xF6,0xD3,0x76,0x14,0x02,0xCD,
+
+     /* order */
+     0xD7,0xC1,0x34,0xAA,0x26,0x43,0x66,0x86,0x2A,0x18,    
+     0x30,0x25,0x75,0xD0,0xFB,0x98,0xD1,0x16,0xBC,0x4B,
+     0x6D,0xDE,0xBC,0xA3,0xA5,0xA7,0x93,0x9F }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+28*6]; }
+   _EC_brainpoolP224t1 = {
+   { NID_X9_62_prime_field, 0,28,1 },
+   { /* no seed */
+     /* p */
+     0xD7,0xC1,0x34,0xAA,0x26,0x43,0x66,0x86,0x2A,0x18,
+     0x30,0x25,0x75,0xD1,0xD7,0x87,0xB0,0x9F,0x07,0x57,
+     0x97,0xDA,0x89,0xF5,0x7E,0xC8,0xC0,0xFF,
+     
+     /* a */
+     0xD7,0xC1,0x34,0xAA,0x26,0x43,0x66,0x86,0x2A,0x18,
+     0x30,0x25,0x75,0xD1,0xD7,0x87,0xB0,0x9F,0x07,0x57,
+     0x97,0xDA,0x89,0xF5,0x7E,0xC8,0xC0,0xFC,
+     
+     /* b */
+     0x4B,0x33,0x7D,0x93,0x41,0x04,0xCD,0x7B,0xEF,0x27,
+     0x1B,0xF6,0x0C,0xED,0x1E,0xD2,0x0D,0xA1,0x4C,0x08,
+     0xB3,0xBB,0x64,0xF1,0x8A,0x60,0x88,0x8D,
+     
+     /* x */
+     0x6A,0xB1,0xE3,0x44,0xCE,0x25,0xFF,0x38,0x96,0x42,
+     0x4E,0x7F,0xFE,0x14,0x76,0x2E,0xCB,0x49,0xF8,0x92,
+     0x8A,0xC0,0xC7,0x60,0x29,0xB4,0xD5,0x80,
+     
+     /* y */
+     0x03,0x74,0xE9,0xF5,0x14,0x3E,0x56,0x8C,0xD2,0x3F,
+     0x3F,0x4D,0x7C,0x0D,0x4B,0x1E,0x41,0xC8,0xCC,0x0D,
+     0x1C,0x6A,0xBD,0x5F,0x1A,0x46,0xDB,0x4C,
+     
+     /* order */
+     0xD7,0xC1,0x34,0xAA,0x26,0x43,0x66,0x86,0x2A,0x18,
+     0x30,0x25,0x75,0xD0,0xFB,0x98,0xD1,0x16,0xBC,0x4B,
+     0x6D,0xDE,0xBC,0xA3,0xA5,0xA7,0x93,0x9F }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+32*6]; }
+   _EC_brainpoolP256r1 = {
+   { NID_X9_62_prime_field, 0,32,1 },
+   { /* no seed */
+     /* p */
+     0xA9,0xFB,0x57,0xDB,0xA1,0xEE,0xA9,0xBC,0x3E,0x66,
+     0x0A,0x90,0x9D,0x83,0x8D,0x72,0x6E,0x3B,0xF6,0x23,
+     0xD5,0x26,0x20,0x28,0x20,0x13,0x48,0x1D,0x1F,0x6E,
+     0x53,0x77,
+
+     /* a */
+     0x7D,0x5A,0x09,0x75,0xFC,0x2C,0x30,0x57,0xEE,0xF6,
+     0x75,0x30,0x41,0x7A,0xFF,0xE7,0xFB,0x80,0x55,0xC1,
+     0x26,0xDC,0x5C,0x6C,0xE9,0x4A,0x4B,0x44,0xF3,0x30,
+     0xB5,0xD9,
+
+     /* b */
+     0x26,0xDC,0x5C,0x6C,0xE9,0x4A,0x4B,0x44,0xF3,0x30,
+     0xB5,0xD9,0xBB,0xD7,0x7C,0xBF,0x95,0x84,0x16,0x29,
+     0x5C,0xF7,0xE1,0xCE,0x6B,0xCC,0xDC,0x18,0xFF,0x8C,
+     0x07,0xB6,
+
+     /* x */
+     0x8B,0xD2,0xAE,0xB9,0xCB,0x7E,0x57,0xCB,0x2C,0x4B,
+     0x48,0x2F,0xFC,0x81,0xB7,0xAF,0xB9,0xDE,0x27,0xE1,
+     0xE3,0xBD,0x23,0xC2,0x3A,0x44,0x53,0xBD,0x9A,0xCE,
+     0x32,0x62,
+
+     /* y */
+     0x54,0x7E,0xF8,0x35,0xC3,0xDA,0xC4,0xFD,0x97,0xF8,
+     0x46,0x1A,0x14,0x61,0x1D,0xC9,0xC2,0x77,0x45,0x13,
+     0x2D,0xED,0x8E,0x54,0x5C,0x1D,0x54,0xC7,0x2F,0x04,
+     0x69,0x97,
+
+     /* order */
+     0xA9,0xFB,0x57,0xDB,0xA1,0xEE,0xA9,0xBC,0x3E,0x66,
+     0x0A,0x90,0x9D,0x83,0x8D,0x71,0x8C,0x39,0x7A,0xA3,
+     0xB5,0x61,0xA6,0xF7,0x90,0x1E,0x0E,0x82,0x97,0x48,
+     0x56,0xA7 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+32*6]; }
+   _EC_brainpoolP256t1 = {
+   { NID_X9_62_prime_field, 0,32,1 },
+   { /* no seed */
+     /* p */
+     0xA9,0xFB,0x57,0xDB,0xA1,0xEE,0xA9,0xBC,0x3E,0x66,
+     0x0A,0x90,0x9D,0x83,0x8D,0x72,0x6E,0x3B,0xF6,0x23,
+     0xD5,0x26,0x20,0x28,0x20,0x13,0x48,0x1D,0x1F,0x6E,
+     0x53,0x77,
+
+     /* a */
+     0xA9,0xFB,0x57,0xDB,0xA1,0xEE,0xA9,0xBC,0x3E,0x66,
+     0x0A,0x90,0x9D,0x83,0x8D,0x72,0x6E,0x3B,0xF6,0x23,
+     0xD5,0x26,0x20,0x28,0x20,0x13,0x48,0x1D,0x1F,0x6E,
+     0x53,0x74,
+
+     /* b */
+     0x66,0x2C,0x61,0xC4,0x30,0xD8,0x4E,0xA4,0xFE,0x66,
+     0xA7,0x73,0x3D,0x0B,0x76,0xB7,0xBF,0x93,0xEB,0xC4,
+     0xAF,0x2F,0x49,0x25,0x6A,0xE5,0x81,0x01,0xFE,0xE9,
+     0x2B,0x04,
+
+     /* x */
+     0xA3,0xE8,0xEB,0x3C,0xC1,0xCF,0xE7,0xB7,0x73,0x22,
+     0x13,0xB2,0x3A,0x65,0x61,0x49,0xAF,0xA1,0x42,0xC4,
+     0x7A,0xAF,0xBC,0x2B,0x79,0xA1,0x91,0x56,0x2E,0x13,
+     0x05,0xF4,
+
+     /* y */
+     0x2D,0x99,0x6C,0x82,0x34,0x39,0xC5,0x6D,0x7F,0x7B,
+     0x22,0xE1,0x46,0x44,0x41,0x7E,0x69,0xBC,0xB6,0xDE,
+     0x39,0xD0,0x27,0x00,0x1D,0xAB,0xE8,0xF3,0x5B,0x25,
+     0xC9,0xBE,
+
+     /* order */
+     0xA9,0xFB,0x57,0xDB,0xA1,0xEE,0xA9,0xBC,0x3E,0x66,
+     0x0A,0x90,0x9D,0x83,0x8D,0x71,0x8C,0x39,0x7A,0xA3,
+     0xB5,0x61,0xA6,0xF7,0x90,0x1E,0x0E,0x82,0x97,0x48,
+     0x56,0xA7 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+40*6]; }
+   _EC_brainpoolP320r1 = {
+   { NID_X9_62_prime_field, 0,40,1 },
+   { /* no seed */
+     /* p */
+     0xD3,0x5E,0x47,0x20,0x36,0xBC,0x4F,0xB7,0xE1,0x3C,
+     0x78,0x5E,0xD2,0x01,0xE0,0x65,0xF9,0x8F,0xCF,0xA6,
+     0xF6,0xF4,0x0D,0xEF,0x4F,0x92,0xB9,0xEC,0x78,0x93,
+     0xEC,0x28,0xFC,0xD4,0x12,0xB1,0xF1,0xB3,0x2E,0x27,
+
+     /* a */
+     0x3E,0xE3,0x0B,0x56,0x8F,0xBA,0xB0,0xF8,0x83,0xCC,
+     0xEB,0xD4,0x6D,0x3F,0x3B,0xB8,0xA2,0xA7,0x35,0x13,
+     0xF5,0xEB,0x79,0xDA,0x66,0x19,0x0E,0xB0,0x85,0xFF,
+     0xA9,0xF4,0x92,0xF3,0x75,0xA9,0x7D,0x86,0x0E,0xB4,
+
+     /* b */
+     0x52,0x08,0x83,0x94,0x9D,0xFD,0xBC,0x42,0xD3,0xAD,
+     0x19,0x86,0x40,0x68,0x8A,0x6F,0xE1,0x3F,0x41,0x34,
+     0x95,0x54,0xB4,0x9A,0xCC,0x31,0xDC,0xCD,0x88,0x45,
+     0x39,0x81,0x6F,0x5E,0xB4,0xAC,0x8F,0xB1,0xF1,0xA6,
+
+     /* x */
+     0x43,0xBD,0x7E,0x9A,0xFB,0x53,0xD8,0xB8,0x52,0x89,
+     0xBC,0xC4,0x8E,0xE5,0xBF,0xE6,0xF2,0x01,0x37,0xD1,
+     0x0A,0x08,0x7E,0xB6,0xE7,0x87,0x1E,0x2A,0x10,0xA5,
+     0x99,0xC7,0x10,0xAF,0x8D,0x0D,0x39,0xE2,0x06,0x11,
+
+     /* y */
+     0x14,0xFD,0xD0,0x55,0x45,0xEC,0x1C,0xC8,0xAB,0x40,
+     0x93,0x24,0x7F,0x77,0x27,0x5E,0x07,0x43,0xFF,0xED,
+     0x11,0x71,0x82,0xEA,0xA9,0xC7,0x78,0x77,0xAA,0xAC,
+     0x6A,0xC7,0xD3,0x52,0x45,0xD1,0x69,0x2E,0x8E,0xE1,
+
+     /* order */
+     0xD3,0x5E,0x47,0x20,0x36,0xBC,0x4F,0xB7,0xE1,0x3C,
+     0x78,0x5E,0xD2,0x01,0xE0,0x65,0xF9,0x8F,0xCF,0xA5,
+     0xB6,0x8F,0x12,0xA3,0x2D,0x48,0x2E,0xC7,0xEE,0x86,
+     0x58,0xE9,0x86,0x91,0x55,0x5B,0x44,0xC5,0x93,0x11 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+40*6]; }
+   _EC_brainpoolP320t1 = {
+   { NID_X9_62_prime_field, 0,40,1 },
+   { /* no seed */
+     /* p */
+     0xD3,0x5E,0x47,0x20,0x36,0xBC,0x4F,0xB7,0xE1,0x3C,
+     0x78,0x5E,0xD2,0x01,0xE0,0x65,0xF9,0x8F,0xCF,0xA6,
+     0xF6,0xF4,0x0D,0xEF,0x4F,0x92,0xB9,0xEC,0x78,0x93,
+     0xEC,0x28,0xFC,0xD4,0x12,0xB1,0xF1,0xB3,0x2E,0x27,
+
+     /* a */
+     0xD3,0x5E,0x47,0x20,0x36,0xBC,0x4F,0xB7,0xE1,0x3C,
+     0x78,0x5E,0xD2,0x01,0xE0,0x65,0xF9,0x8F,0xCF,0xA6,
+     0xF6,0xF4,0x0D,0xEF,0x4F,0x92,0xB9,0xEC,0x78,0x93,
+     0xEC,0x28,0xFC,0xD4,0x12,0xB1,0xF1,0xB3,0x2E,0x24,
+
+     /* b */
+     0xA7,0xF5,0x61,0xE0,0x38,0xEB,0x1E,0xD5,0x60,0xB3,
+     0xD1,0x47,0xDB,0x78,0x20,0x13,0x06,0x4C,0x19,0xF2,
+     0x7E,0xD2,0x7C,0x67,0x80,0xAA,0xF7,0x7F,0xB8,0xA5,
+     0x47,0xCE,0xB5,0xB4,0xFE,0xF4,0x22,0x34,0x03,0x53,
+
+     /* x */
+     0x92,0x5B,0xE9,0xFB,0x01,0xAF,0xC6,0xFB,0x4D,0x3E,
+     0x7D,0x49,0x90,0x01,0x0F,0x81,0x34,0x08,0xAB,0x10,
+     0x6C,0x4F,0x09,0xCB,0x7E,0xE0,0x78,0x68,0xCC,0x13,
+     0x6F,0xFF,0x33,0x57,0xF6,0x24,0xA2,0x1B,0xED,0x52,
+
+     /* y */
+     0x63,0xBA,0x3A,0x7A,0x27,0x48,0x3E,0xBF,0x66,0x71,
+     0xDB,0xEF,0x7A,0xBB,0x30,0xEB,0xEE,0x08,0x4E,0x58,
+     0xA0,0xB0,0x77,0xAD,0x42,0xA5,0xA0,0x98,0x9D,0x1E,
+     0xE7,0x1B,0x1B,0x9B,0xC0,0x45,0x5F,0xB0,0xD2,0xC3,
+
+     /* order */
+     0xD3,0x5E,0x47,0x20,0x36,0xBC,0x4F,0xB7,0xE1,0x3C,
+     0x78,0x5E,0xD2,0x01,0xE0,0x65,0xF9,0x8F,0xCF,0xA5,
+     0xB6,0x8F,0x12,0xA3,0x2D,0x48,0x2E,0xC7,0xEE,0x86,
+     0x58,0xE9,0x86,0x91,0x55,0x5B,0x44,0xC5,0x93,0x11 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+48*6]; }
+   _EC_brainpoolP384r1 = {
+   { NID_X9_62_prime_field, 0,48,1 },
+   { /* no seed */
+     /* p */
+     0x8C,0xB9,0x1E,0x82,0xA3,0x38,0x6D,0x28,0x0F,0x5D,
+     0x6F,0x7E,0x50,0xE6,0x41,0xDF,0x15,0x2F,0x71,0x09,
+     0xED,0x54,0x56,0xB4,0x12,0xB1,0xDA,0x19,0x7F,0xB7,
+     0x11,0x23,0xAC,0xD3,0xA7,0x29,0x90,0x1D,0x1A,0x71,
+     0x87,0x47,0x00,0x13,0x31,0x07,0xEC,0x53,
+
+     /* a */
+     0x7B,0xC3,0x82,0xC6,0x3D,0x8C,0x15,0x0C,0x3C,0x72,
+     0x08,0x0A,0xCE,0x05,0xAF,0xA0,0xC2,0xBE,0xA2,0x8E,
+     0x4F,0xB2,0x27,0x87,0x13,0x91,0x65,0xEF,0xBA,0x91,
+     0xF9,0x0F,0x8A,0xA5,0x81,0x4A,0x50,0x3A,0xD4,0xEB,
+     0x04,0xA8,0xC7,0xDD,0x22,0xCE,0x28,0x26,
+
+     /* b */
+     0x04,0xA8,0xC7,0xDD,0x22,0xCE,0x28,0x26,0x8B,0x39,
+     0xB5,0x54,0x16,0xF0,0x44,0x7C,0x2F,0xB7,0x7D,0xE1,
+     0x07,0xDC,0xD2,0xA6,0x2E,0x88,0x0E,0xA5,0x3E,0xEB,
+     0x62,0xD5,0x7C,0xB4,0x39,0x02,0x95,0xDB,0xC9,0x94,
+     0x3A,0xB7,0x86,0x96,0xFA,0x50,0x4C,0x11,
+
+     /* x */
+     0x1D,0x1C,0x64,0xF0,0x68,0xCF,0x45,0xFF,0xA2,0xA6,
+     0x3A,0x81,0xB7,0xC1,0x3F,0x6B,0x88,0x47,0xA3,0xE7,
+     0x7E,0xF1,0x4F,0xE3,0xDB,0x7F,0xCA,0xFE,0x0C,0xBD,
+     0x10,0xE8,0xE8,0x26,0xE0,0x34,0x36,0xD6,0x46,0xAA,
+     0xEF,0x87,0xB2,0xE2,0x47,0xD4,0xAF,0x1E,
+
+     /* y */
+     0x8A,0xBE,0x1D,0x75,0x20,0xF9,0xC2,0xA4,0x5C,0xB1,
+     0xEB,0x8E,0x95,0xCF,0xD5,0x52,0x62,0xB7,0x0B,0x29,
+     0xFE,0xEC,0x58,0x64,0xE1,0x9C,0x05,0x4F,0xF9,0x91,
+     0x29,0x28,0x0E,0x46,0x46,0x21,0x77,0x91,0x81,0x11,
+     0x42,0x82,0x03,0x41,0x26,0x3C,0x53,0x15,
+
+     /* order */
+     0x8C,0xB9,0x1E,0x82,0xA3,0x38,0x6D,0x28,0x0F,0x5D,
+     0x6F,0x7E,0x50,0xE6,0x41,0xDF,0x15,0x2F,0x71,0x09,
+     0xED,0x54,0x56,0xB3,0x1F,0x16,0x6E,0x6C,0xAC,0x04,
+     0x25,0xA7,0xCF,0x3A,0xB6,0xAF,0x6B,0x7F,0xC3,0x10,
+     0x3B,0x88,0x32,0x02,0xE9,0x04,0x65,0x65 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+48*6]; }
+   _EC_brainpoolP384t1 = {
+   { NID_X9_62_prime_field, 0,48,1 },
+   { /* no seed */
+     /* p */
+     0x8C,0xB9,0x1E,0x82,0xA3,0x38,0x6D,0x28,0x0F,0x5D,
+     0x6F,0x7E,0x50,0xE6,0x41,0xDF,0x15,0x2F,0x71,0x09,
+     0xED,0x54,0x56,0xB4,0x12,0xB1,0xDA,0x19,0x7F,0xB7,
+     0x11,0x23,0xAC,0xD3,0xA7,0x29,0x90,0x1D,0x1A,0x71,
+     0x87,0x47,0x00,0x13,0x31,0x07,0xEC,0x53,
+
+     /* a */
+     0x8C,0xB9,0x1E,0x82,0xA3,0x38,0x6D,0x28,0x0F,0x5D,
+     0x6F,0x7E,0x50,0xE6,0x41,0xDF,0x15,0x2F,0x71,0x09,
+     0xED,0x54,0x56,0xB4,0x12,0xB1,0xDA,0x19,0x7F,0xB7,
+     0x11,0x23,0xAC,0xD3,0xA7,0x29,0x90,0x1D,0x1A,0x71,
+     0x87,0x47,0x00,0x13,0x31,0x07,0xEC,0x50,
+
+     /* b */
+     0x7F,0x51,0x9E,0xAD,0xA7,0xBD,0xA8,0x1B,0xD8,0x26,
+     0xDB,0xA6,0x47,0x91,0x0F,0x8C,0x4B,0x93,0x46,0xED,
+     0x8C,0xCD,0xC6,0x4E,0x4B,0x1A,0xBD,0x11,0x75,0x6D,
+     0xCE,0x1D,0x20,0x74,0xAA,0x26,0x3B,0x88,0x80,0x5C,
+     0xED,0x70,0x35,0x5A,0x33,0xB4,0x71,0xEE,
+
+     /* x */
+     0x18,0xDE,0x98,0xB0,0x2D,0xB9,0xA3,0x06,0xF2,0xAF,
+     0xCD,0x72,0x35,0xF7,0x2A,0x81,0x9B,0x80,0xAB,0x12,
+     0xEB,0xD6,0x53,0x17,0x24,0x76,0xFE,0xCD,0x46,0x2A,
+     0xAB,0xFF,0xC4,0xFF,0x19,0x1B,0x94,0x6A,0x5F,0x54,
+     0xD8,0xD0,0xAA,0x2F,0x41,0x88,0x08,0xCC,
+
+     /* y */
+     0x25,0xAB,0x05,0x69,0x62,0xD3,0x06,0x51,0xA1,0x14,
+     0xAF,0xD2,0x75,0x5A,0xD3,0x36,0x74,0x7F,0x93,0x47,
+     0x5B,0x7A,0x1F,0xCA,0x3B,0x88,0xF2,0xB6,0xA2,0x08,
+     0xCC,0xFE,0x46,0x94,0x08,0x58,0x4D,0xC2,0xB2,0x91,
+     0x26,0x75,0xBF,0x5B,0x9E,0x58,0x29,0x28,
+
+     /* order */
+     0x8C,0xB9,0x1E,0x82,0xA3,0x38,0x6D,0x28,0x0F,0x5D,
+     0x6F,0x7E,0x50,0xE6,0x41,0xDF,0x15,0x2F,0x71,0x09,
+     0xED,0x54,0x56,0xB3,0x1F,0x16,0x6E,0x6C,0xAC,0x04,
+     0x25,0xA7,0xCF,0x3A,0xB6,0xAF,0x6B,0x7F,0xC3,0x10,
+     0x3B,0x88,0x32,0x02,0xE9,0x04,0x65,0x65 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+64*6]; }
+   _EC_brainpoolP512r1 = {
+   { NID_X9_62_prime_field, 0,64,1 },
+   { /* no seed */
+     /* p */
+     0xAA,0xDD,0x9D,0xB8,0xDB,0xE9,0xC4,0x8B,0x3F,0xD4,
+     0xE6,0xAE,0x33,0xC9,0xFC,0x07,0xCB,0x30,0x8D,0xB3,
+     0xB3,0xC9,0xD2,0x0E,0xD6,0x63,0x9C,0xCA,0x70,0x33,
+     0x08,0x71,0x7D,0x4D,0x9B,0x00,0x9B,0xC6,0x68,0x42,
+     0xAE,0xCD,0xA1,0x2A,0xE6,0xA3,0x80,0xE6,0x28,0x81,
+     0xFF,0x2F,0x2D,0x82,0xC6,0x85,0x28,0xAA,0x60,0x56,
+     0x58,0x3A,0x48,0xF3,
+
+     /* a */
+     0x78,0x30,0xA3,0x31,0x8B,0x60,0x3B,0x89,0xE2,0x32,
+     0x71,0x45,0xAC,0x23,0x4C,0xC5,0x94,0xCB,0xDD,0x8D,
+     0x3D,0xF9,0x16,0x10,0xA8,0x34,0x41,0xCA,0xEA,0x98,
+     0x63,0xBC,0x2D,0xED,0x5D,0x5A,0xA8,0x25,0x3A,0xA1,
+     0x0A,0x2E,0xF1,0xC9,0x8B,0x9A,0xC8,0xB5,0x7F,0x11,
+     0x17,0xA7,0x2B,0xF2,0xC7,0xB9,0xE7,0xC1,0xAC,0x4D,
+     0x77,0xFC,0x94,0xCA,
+
+     /* b */
+     0x3D,0xF9,0x16,0x10,0xA8,0x34,0x41,0xCA,0xEA,0x98,
+     0x63,0xBC,0x2D,0xED,0x5D,0x5A,0xA8,0x25,0x3A,0xA1,
+     0x0A,0x2E,0xF1,0xC9,0x8B,0x9A,0xC8,0xB5,0x7F,0x11,
+     0x17,0xA7,0x2B,0xF2,0xC7,0xB9,0xE7,0xC1,0xAC,0x4D,
+     0x77,0xFC,0x94,0xCA,0xDC,0x08,0x3E,0x67,0x98,0x40,
+     0x50,0xB7,0x5E,0xBA,0xE5,0xDD,0x28,0x09,0xBD,0x63,
+     0x80,0x16,0xF7,0x23,
+
+     /* x */
+     0x81,0xAE,0xE4,0xBD,0xD8,0x2E,0xD9,0x64,0x5A,0x21,
+     0x32,0x2E,0x9C,0x4C,0x6A,0x93,0x85,0xED,0x9F,0x70,
+     0xB5,0xD9,0x16,0xC1,0xB4,0x3B,0x62,0xEE,0xF4,0xD0,
+     0x09,0x8E,0xFF,0x3B,0x1F,0x78,0xE2,0xD0,0xD4,0x8D,
+     0x50,0xD1,0x68,0x7B,0x93,0xB9,0x7D,0x5F,0x7C,0x6D,
+     0x50,0x47,0x40,0x6A,0x5E,0x68,0x8B,0x35,0x22,0x09,
+     0xBC,0xB9,0xF8,0x22,
+
+     /* y */
+     0x7D,0xDE,0x38,0x5D,0x56,0x63,0x32,0xEC,0xC0,0xEA,
+     0xBF,0xA9,0xCF,0x78,0x22,0xFD,0xF2,0x09,0xF7,0x00,
+     0x24,0xA5,0x7B,0x1A,0xA0,0x00,0xC5,0x5B,0x88,0x1F,
+     0x81,0x11,0xB2,0xDC,0xDE,0x49,0x4A,0x5F,0x48,0x5E,
+     0x5B,0xCA,0x4B,0xD8,0x8A,0x27,0x63,0xAE,0xD1,0xCA,
+     0x2B,0x2F,0xA8,0xF0,0x54,0x06,0x78,0xCD,0x1E,0x0F,
+     0x3A,0xD8,0x08,0x92,
+
+     /* order */
+     0xAA,0xDD,0x9D,0xB8,0xDB,0xE9,0xC4,0x8B,0x3F,0xD4,
+     0xE6,0xAE,0x33,0xC9,0xFC,0x07,0xCB,0x30,0x8D,0xB3,
+     0xB3,0xC9,0xD2,0x0E,0xD6,0x63,0x9C,0xCA,0x70,0x33,
+     0x08,0x70,0x55,0x3E,0x5C,0x41,0x4C,0xA9,0x26,0x19,
+     0x41,0x86,0x61,0x19,0x7F,0xAC,0x10,0x47,0x1D,0xB1,
+     0xD3,0x81,0x08,0x5D,0xDA,0xDD,0xB5,0x87,0x96,0x82,
+     0x9C,0xA9,0x00,0x69 }
+   };
+
+static const struct { EC_CURVE_DATA h; unsigned char data[0+64*6]; }
+   _EC_brainpoolP512t1 = {
+    { NID_X9_62_prime_field, 0,64,1 },
+    { /* no seed */
+      /* p */
+      0xAA,0xDD,0x9D,0xB8,0xDB,0xE9,0xC4,0x8B,0x3F,0xD4,
+      0xE6,0xAE,0x33,0xC9,0xFC,0x07,0xCB,0x30,0x8D,0xB3,
+      0xB3,0xC9,0xD2,0x0E,0xD6,0x63,0x9C,0xCA,0x70,0x33,
+      0x08,0x71,0x7D,0x4D,0x9B,0x00,0x9B,0xC6,0x68,0x42,
+      0xAE,0xCD,0xA1,0x2A,0xE6,0xA3,0x80,0xE6,0x28,0x81,
+      0xFF,0x2F,0x2D,0x82,0xC6,0x85,0x28,0xAA,0x60,0x56,
+      0x58,0x3A,0x48,0xF3,
+
+      /* a */
+      0xAA,0xDD,0x9D,0xB8,0xDB,0xE9,0xC4,0x8B,0x3F,0xD4,
+      0xE6,0xAE,0x33,0xC9,0xFC,0x07,0xCB,0x30,0x8D,0xB3,
+      0xB3,0xC9,0xD2,0x0E,0xD6,0x63,0x9C,0xCA,0x70,0x33,
+      0x08,0x71,0x7D,0x4D,0x9B,0x00,0x9B,0xC6,0x68,0x42,
+      0xAE,0xCD,0xA1,0x2A,0xE6,0xA3,0x80,0xE6,0x28,0x81,
+      0xFF,0x2F,0x2D,0x82,0xC6,0x85,0x28,0xAA,0x60,0x56,
+      0x58,0x3A,0x48,0xF0,
+
+      /* b */
+      0x7C,0xBB,0xBC,0xF9,0x44,0x1C,0xFA,0xB7,0x6E,0x18,
+      0x90,0xE4,0x68,0x84,0xEA,0xE3,0x21,0xF7,0x0C,0x0B,
+      0xCB,0x49,0x81,0x52,0x78,0x97,0x50,0x4B,0xEC,0x3E,
+      0x36,0xA6,0x2B,0xCD,0xFA,0x23,0x04,0x97,0x65,0x40,
+      0xF6,0x45,0x00,0x85,0xF2,0xDA,0xE1,0x45,0xC2,0x25,
+      0x53,0xB4,0x65,0x76,0x36,0x89,0x18,0x0E,0xA2,0x57,
+      0x18,0x67,0x42,0x3E,
+
+      /* x */
+      0x64,0x0E,0xCE,0x5C,0x12,0x78,0x87,0x17,0xB9,0xC1,
+      0xBA,0x06,0xCB,0xC2,0xA6,0xFE,0xBA,0x85,0x84,0x24,
+      0x58,0xC5,0x6D,0xDE,0x9D,0xB1,0x75,0x8D,0x39,0xC0,
+      0x31,0x3D,0x82,0xBA,0x51,0x73,0x5C,0xDB,0x3E,0xA4,
+      0x99,0xAA,0x77,0xA7,0xD6,0x94,0x3A,0x64,0xF7,0xA3,
+      0xF2,0x5F,0xE2,0x6F,0x06,0xB5,0x1B,0xAA,0x26,0x96,
+      0xFA,0x90,0x35,0xDA,
+
+      /* y */
+      0x5B,0x53,0x4B,0xD5,0x95,0xF5,0xAF,0x0F,0xA2,0xC8,
+      0x92,0x37,0x6C,0x84,0xAC,0xE1,0xBB,0x4E,0x30,0x19,
+      0xB7,0x16,0x34,0xC0,0x11,0x31,0x15,0x9C,0xAE,0x03,
+      0xCE,0xE9,0xD9,0x93,0x21,0x84,0xBE,0xEF,0x21,0x6B,
+      0xD7,0x1D,0xF2,0xDA,0xDF,0x86,0xA6,0x27,0x30,0x6E,
+      0xCF,0xF9,0x6D,0xBB,0x8B,0xAC,0xE1,0x98,0xB6,0x1E,
+      0x00,0xF8,0xB3,0x32,
+
+      /* order */
+      0xAA,0xDD,0x9D,0xB8,0xDB,0xE9,0xC4,0x8B,0x3F,0xD4,
+      0xE6,0xAE,0x33,0xC9,0xFC,0x07,0xCB,0x30,0x8D,0xB3,
+      0xB3,0xC9,0xD2,0x0E,0xD6,0x63,0x9C,0xCA,0x70,0x33,
+      0x08,0x70,0x55,0x3E,0x5C,0x41,0x4C,0xA9,0x26,0x19,
+      0x41,0x86,0x61,0x19,0x7F,0xAC,0x10,0x47,0x1D,0xB1,
+      0xD3,0x81,0x08,0x5D,0xDA,0xDD,0xB5,0x87,0x96,0x82,
+      0x9C,0xA9,0x00,0x69 }
+    };
+
 typedef struct _ec_list_element_st {
        int     nid;
        const EC_CURVE_DATA *data;
+       const EC_METHOD *(*meth)(void);
+       const char *comment;
        } ec_list_element;
 
 static const ec_list_element curve_list[] = {
-       /* prime field curves */        
+       /* prime field curves */
        /* secg curves */
-       { NID_secp112r1, &_EC_SECG_PRIME_112R1},
-       { NID_secp112r2, &_EC_SECG_PRIME_112R2},
-       { NID_secp128r1, &_EC_SECG_PRIME_128R1},
-       { NID_secp128r2, &_EC_SECG_PRIME_128R2},
-       { NID_secp160k1, &_EC_SECG_PRIME_160K1},
-       { NID_secp160r1, &_EC_SECG_PRIME_160R1},
-       { NID_secp160r2, &_EC_SECG_PRIME_160R2},
+       { NID_secp112r1, &_EC_SECG_PRIME_112R1.h, 0, "SECG/WTLS curve over a 112 bit prime field" },
+       { NID_secp112r2, &_EC_SECG_PRIME_112R2.h, 0, "SECG curve over a 112 bit prime field" },
+       { NID_secp128r1, &_EC_SECG_PRIME_128R1.h, 0, "SECG curve over a 128 bit prime field" },
+       { NID_secp128r2, &_EC_SECG_PRIME_128R2.h, 0, "SECG curve over a 128 bit prime field" },
+       { NID_secp160k1, &_EC_SECG_PRIME_160K1.h, 0, "SECG curve over a 160 bit prime field" },
+       { NID_secp160r1, &_EC_SECG_PRIME_160R1.h, 0, "SECG curve over a 160 bit prime field" },
+       { NID_secp160r2, &_EC_SECG_PRIME_160R2.h, 0, "SECG/WTLS curve over a 160 bit prime field" },
        /* SECG secp192r1 is the same as X9.62 prime192v1 and hence omitted */
-       { NID_secp192k1, &_EC_SECG_PRIME_192K1},
-       { NID_secp224k1, &_EC_SECG_PRIME_224K1},
-       { NID_secp224r1, &_EC_NIST_PRIME_224},
-       { NID_secp256k1, &_EC_SECG_PRIME_256K1},
+       { NID_secp192k1, &_EC_SECG_PRIME_192K1.h, 0, "SECG curve over a 192 bit prime field" },
+       { NID_secp224k1, &_EC_SECG_PRIME_224K1.h, 0, "SECG curve over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+       { NID_secp224r1, &_EC_NIST_PRIME_224.h, EC_GFp_nistp224_method, "NIST/SECG curve over a 224 bit prime field" },
+#else
+       { NID_secp224r1, &_EC_NIST_PRIME_224.h, 0, "NIST/SECG curve over a 224 bit prime field" },
+#endif
+       { NID_secp256k1, &_EC_SECG_PRIME_256K1.h, 0, "SECG curve over a 256 bit prime field" },
        /* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
-       { NID_secp384r1, &_EC_NIST_PRIME_384},
-       { NID_secp521r1, &_EC_NIST_PRIME_521},
+       { NID_secp384r1, &_EC_NIST_PRIME_384.h, 0, "NIST/SECG curve over a 384 bit prime field" },
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+       { NID_secp521r1, &_EC_NIST_PRIME_521.h, EC_GFp_nistp521_method, "NIST/SECG curve over a 521 bit prime field" },
+#else
+       { NID_secp521r1, &_EC_NIST_PRIME_521.h, 0, "NIST/SECG curve over a 521 bit prime field" },
+#endif
        /* X9.62 curves */
-       { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192},
-       { NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2},
-       { NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3},
-       { NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1},
-       { NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2},
-       { NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3},
-       { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1},
+       { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0, "NIST/X9.62/SECG curve over a 192 bit prime field" },
+       { NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2.h, 0, "X9.62 curve over a 192 bit prime field" },
+       { NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3.h, 0, "X9.62 curve over a 192 bit prime field" },
+       { NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1.h, 0, "X9.62 curve over a 239 bit prime field" },
+       { NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2.h, 0, "X9.62 curve over a 239 bit prime field" },
+       { NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3.h, 0, "X9.62 curve over a 239 bit prime field" },
+       { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
+#if defined(ECP_NISTZ256_ASM)
+               EC_GFp_nistz256_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+               EC_GFp_nistp256_method,
+#else
+               0,
+#endif
+               "X9.62/SECG curve over a 256 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
        /* characteristic two field curves */
-       /* secg curves */
-       { NID_sect113r1, &_EC_SECG_CHAR2_113R1},
-       { NID_sect113r2, &_EC_SECG_CHAR2_113R2},
-       { NID_sect131r1, &_EC_SECG_CHAR2_131R1},
-       { NID_sect131r2, &_EC_SECG_CHAR2_131R2},
-       { NID_sect163k1, &_EC_SECG_CHAR2_163K1},
-       { NID_sect163r1, &_EC_SECG_CHAR2_163R1},
-       { NID_sect163r2, &_EC_SECG_CHAR2_163R2},
-       { NID_sect193r1, &_EC_SECG_CHAR2_193R1},
-       { NID_sect193r2, &_EC_SECG_CHAR2_193R2},
-       { NID_sect233k1, &_EC_SECG_CHAR2_233K1},
-       { NID_sect233r1, &_EC_SECG_CHAR2_233R1},
-       { NID_sect239k1, &_EC_SECG_CHAR2_239K1},
-       { NID_sect283k1, &_EC_SECG_CHAR2_283K1},
-       { NID_sect283r1, &_EC_SECG_CHAR2_283R1},
-       { NID_sect409k1, &_EC_SECG_CHAR2_409K1},
-       { NID_sect409r1, &_EC_SECG_CHAR2_409R1},
-       { NID_sect571k1, &_EC_SECG_CHAR2_571K1},
-       { NID_sect571r1, &_EC_SECG_CHAR2_571R1},
+       /* NIST/SECG curves */
+       { NID_sect113r1, &_EC_SECG_CHAR2_113R1.h, 0, "SECG curve over a 113 bit binary field" },
+       { NID_sect113r2, &_EC_SECG_CHAR2_113R2.h, 0, "SECG curve over a 113 bit binary field" },
+       { NID_sect131r1, &_EC_SECG_CHAR2_131R1.h, 0, "SECG/WTLS curve over a 131 bit binary field" },
+       { NID_sect131r2, &_EC_SECG_CHAR2_131R2.h, 0, "SECG curve over a 131 bit binary field" },
+       { NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0, "NIST/SECG/WTLS curve over a 163 bit binary field" },
+       { NID_sect163r1, &_EC_SECG_CHAR2_163R1.h, 0, "SECG curve over a 163 bit binary field" },
+       { NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0, "NIST/SECG curve over a 163 bit binary field" },
+       { NID_sect193r1, &_EC_SECG_CHAR2_193R1.h, 0, "SECG curve over a 193 bit binary field" },
+       { NID_sect193r2, &_EC_SECG_CHAR2_193R2.h, 0, "SECG curve over a 193 bit binary field" },
+       { NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0, "NIST/SECG/WTLS curve over a 233 bit binary field" },
+       { NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0, "NIST/SECG/WTLS curve over a 233 bit binary field" },
+       { NID_sect239k1, &_EC_SECG_CHAR2_239K1.h, 0, "SECG curve over a 239 bit binary field" },
+       { NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0, "NIST/SECG curve over a 283 bit binary field" },
+       { NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0, "NIST/SECG curve over a 283 bit binary field" },
+       { NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0, "NIST/SECG curve over a 409 bit binary field" },
+       { NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0, "NIST/SECG curve over a 409 bit binary field" },
+       { NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0, "NIST/SECG curve over a 571 bit binary field" },
+       { NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0, "NIST/SECG curve over a 571 bit binary field" },
        /* X9.62 curves */
-       { NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1},
-       { NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2},
-       { NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3},
-       { NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1},
-       { NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1},
-       { NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2},
-       { NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3},
-       { NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1},
-       { NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1},
-       { NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2},
-       { NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3},
-       { NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1},
-       { NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1},
-       { NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1},
-       { NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1},
-       { NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1},
-       /* the WAP/WTLS curves */
-       { NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1},
-       { NID_wap_wsg_idm_ecid_wtls3, &_EC_SECG_CHAR2_163K1},
-       { NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1},
-       { NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1},
-       { NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1},
-       { NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2},
-       { NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8},
-       { NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9 },
-       { NID_wap_wsg_idm_ecid_wtls10, &_EC_SECG_CHAR2_233K1},
-       { NID_wap_wsg_idm_ecid_wtls11, &_EC_SECG_CHAR2_233R1},
-       { NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12},
+       { NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1.h, 0, "X9.62 curve over a 163 bit binary field" },
+       { NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2.h, 0, "X9.62 curve over a 163 bit binary field" },
+       { NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3.h, 0, "X9.62 curve over a 163 bit binary field" },
+       { NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1.h, 0, "X9.62 curve over a 176 bit binary field" },
+       { NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1.h, 0, "X9.62 curve over a 191 bit binary field" },
+       { NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2.h, 0, "X9.62 curve over a 191 bit binary field" },
+       { NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3.h, 0, "X9.62 curve over a 191 bit binary field" },
+       { NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1.h, 0, "X9.62 curve over a 208 bit binary field" },
+       { NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1.h, 0, "X9.62 curve over a 239 bit binary field" },
+       { NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2.h, 0, "X9.62 curve over a 239 bit binary field" },
+       { NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3.h, 0, "X9.62 curve over a 239 bit binary field" },
+       { NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1.h, 0, "X9.62 curve over a 272 bit binary field" },
+       { NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1.h, 0, "X9.62 curve over a 304 bit binary field" },
+       { NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1.h, 0, "X9.62 curve over a 359 bit binary field" },
+       { NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1.h, 0, "X9.62 curve over a 368 bit binary field" },
+       { NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1.h, 0, "X9.62 curve over a 431 bit binary field" },
+       /* the WAP/WTLS curves
+        * [unlike SECG, spec has its own OIDs for curves from X9.62] */
+       { NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1.h, 0, "WTLS curve over a 113 bit binary field" },
+       { NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K.h, 0, "NIST/SECG/WTLS curve over a 163 bit binary field" },
+       { NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1.h, 0, "SECG curve over a 113 bit binary field" },
+       { NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1.h, 0, "X9.62 curve over a 163 bit binary field" },
+#endif
+       { NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1.h, 0, "SECG/WTLS curve over a 112 bit prime field" },
+       { NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2.h, 0, "SECG/WTLS curve over a 160 bit prime field" },
+       { NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8.h, 0, "WTLS curve over a 112 bit prime field" },
+       { NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9.h, 0, "WTLS curve over a 160 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
+       { NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K.h, 0, "NIST/SECG/WTLS curve over a 233 bit binary field" },
+       { NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B.h, 0, "NIST/SECG/WTLS curve over a 233 bit binary field" },
+#endif
+       { NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0, "WTLS curvs over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
+       /* IPSec curves */
+       { NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0, "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
+         "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+       { NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0, "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
+         "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+#endif
+    /* brainpool curves */
+    { NID_brainpoolP160r1, &_EC_brainpoolP160r1.h, 0, "RFC 5639 curve over a 160 bit prime field"},
+    { NID_brainpoolP160t1, &_EC_brainpoolP160t1.h, 0, "RFC 5639 curve over a 160 bit prime field"},
+    { NID_brainpoolP192r1, &_EC_brainpoolP192r1.h, 0, "RFC 5639 curve over a 192 bit prime field"},
+    { NID_brainpoolP192t1, &_EC_brainpoolP192t1.h, 0, "RFC 5639 curve over a 192 bit prime field"},
+    { NID_brainpoolP224r1, &_EC_brainpoolP224r1.h, 0, "RFC 5639 curve over a 224 bit prime field"},
+    { NID_brainpoolP224t1, &_EC_brainpoolP224t1.h, 0, "RFC 5639 curve over a 224 bit prime field"},
+    { NID_brainpoolP256r1, &_EC_brainpoolP256r1.h, 0, "RFC 5639 curve over a 256 bit prime field"},
+    { NID_brainpoolP256t1, &_EC_brainpoolP256t1.h, 0, "RFC 5639 curve over a 256 bit prime field"},
+    { NID_brainpoolP320r1, &_EC_brainpoolP320r1.h, 0, "RFC 5639 curve over a 320 bit prime field"},
+    { NID_brainpoolP320t1, &_EC_brainpoolP320t1.h, 0, "RFC 5639 curve over a 320 bit prime field"},
+    { NID_brainpoolP384r1, &_EC_brainpoolP384r1.h, 0, "RFC 5639 curve over a 384 bit prime field"},
+    { NID_brainpoolP384t1, &_EC_brainpoolP384t1.h, 0, "RFC 5639 curve over a 384 bit prime field"},
+    { NID_brainpoolP512r1, &_EC_brainpoolP512r1.h, 0, "RFC 5639 curve over a 512 bit prime field"},
+    { NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0, "RFC 5639 curve over a 512 bit prime field"},
 };
 
-static size_t curve_list_length = sizeof(curve_list)/sizeof(ec_list_element);
+#define curve_list_length (sizeof(curve_list)/sizeof(ec_list_element))
 
-static EC_GROUP *ec_group_new_from_data(const EC_CURVE_DATA *data)
+static EC_GROUP *ec_group_new_from_data(const ec_list_element curve)
        {
        EC_GROUP *group=NULL;
        EC_POINT *P=NULL;
        BN_CTX   *ctx=NULL;
-       BIGNUM   *p=NULL, *a=NULL, *b=NULL, *x=NULL, *y=NULL, *order=NULL;
+       BIGNUM   *p=NULL, *a=NULL, *b=NULL, *x=NULL, *y=NULL, *order=NULL;
        int      ok=0;
+       int      seed_len,param_len;
+       const EC_METHOD *meth;
+       const EC_CURVE_DATA *data;
+       const unsigned char *params;
 
        if ((ctx = BN_CTX_new()) == NULL)
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_MALLOC_FAILURE);
                goto err;
                }
-       if ((p = BN_new()) == NULL || (a = BN_new()) == NULL || 
-               (b = BN_new()) == NULL || (x = BN_new()) == NULL ||
-               (y = BN_new()) == NULL || (order = BN_new()) == NULL)
-               {
-               ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-       
-       if (!BN_hex2bn(&p, data->p) || !BN_hex2bn(&a, data->a)
-               || !BN_hex2bn(&b, data->b))
+
+       data = curve.data;
+       seed_len  = data->seed_len;
+       param_len = data->param_len;
+       params    = (const unsigned char *)(data+1);    /* skip header */
+       params   += seed_len;                           /* skip seed   */
+
+       if (!(p = BN_bin2bn(params+0*param_len, param_len, NULL))
+               || !(a = BN_bin2bn(params+1*param_len, param_len, NULL))
+               || !(b = BN_bin2bn(params+2*param_len, param_len, NULL)))
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
                goto err;
                }
 
-       if (data->field_type == NID_X9_62_prime_field)
+       if (curve.meth != 0)
+               {
+               meth = curve.meth();
+               if (((group = EC_GROUP_new(meth)) == NULL) ||
+                       (!(group->meth->group_set_curve(group, p, a, b, ctx))))
+                       {
+                       ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                       goto err;
+                       }
+               }
+       else if (data->field_type == NID_X9_62_prime_field)
                {
                if ((group = EC_GROUP_new_curve_GFp(p, a, b, ctx)) == NULL)
                        {
@@ -1101,32 +3285,36 @@ static EC_GROUP *ec_group_new_from_data(const EC_CURVE_DATA *data)
                        goto err;
                        }
                }
-               else
-               { /* field_type == NID_X9_62_characteristic_two_field */
+#ifndef OPENSSL_NO_EC2M
+       else    /* field_type == NID_X9_62_characteristic_two_field */
+               {
                if ((group = EC_GROUP_new_curve_GF2m(p, a, b, ctx)) == NULL)
                        {
                        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
                        goto err;
                        }
                }
+#endif
 
        if ((P = EC_POINT_new(group)) == NULL)
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
                goto err;
                }
-       
-       if (!BN_hex2bn(&x, data->x) || !BN_hex2bn(&y, data->y))
+
+       if (!(x = BN_bin2bn(params+3*param_len, param_len, NULL))
+               || !(y = BN_bin2bn(params+4*param_len, param_len, NULL)))
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
                goto err;
                }
-       if (!EC_POINT_set_affine_coordinates_GF2m(group, P, x, y, ctx))
+       if (!EC_POINT_set_affine_coordinates_GFp(group, P, x, y, ctx))
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
                goto err;
                }
-       if (!BN_hex2bn(&order, data->order) || !BN_set_word(x, data->cofactor))
+       if (!(order = BN_bin2bn(params+5*param_len, param_len, NULL))
+               || !BN_set_word(x, (BN_ULONG)data->cofactor))
                {
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
                goto err;
@@ -1136,9 +3324,9 @@ static EC_GROUP *ec_group_new_from_data(const EC_CURVE_DATA *data)
                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
                goto err;
                }
-       if (data->seed)
+       if (seed_len)
                {
-               if (!EC_GROUP_set_seed(group, data->seed, data->seed_len))
+               if (!EC_GROUP_set_seed(group, params-seed_len, seed_len))
                        {
                        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
                        goto err;
@@ -1170,7 +3358,7 @@ err:
        return group;
        }
 
-EC_GROUP *EC_GROUP_new_by_nid(int nid)
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid)
        {
        size_t i;
        EC_GROUP *ret = NULL;
@@ -1181,17 +3369,17 @@ EC_GROUP *EC_GROUP_new_by_nid(int nid)
        for (i=0; i<curve_list_length; i++)
                if (curve_list[i].nid == nid)
                        {
-                       ret = ec_group_new_from_data(curve_list[i].data);
+                       ret = ec_group_new_from_data(curve_list[i]);
                        break;
                        }
 
        if (ret == NULL)
                {
-               ECerr(EC_F_EC_GROUP_NEW_BY_NID, EC_R_UNKNOWN_GROUP);
+               ECerr(EC_F_EC_GROUP_NEW_BY_CURVE_NAME, EC_R_UNKNOWN_GROUP);
                return NULL;
                }
 
-       EC_GROUP_set_nid(ret, nid);
+       EC_GROUP_set_curve_name(ret, nid);
 
        return ret;
        }
@@ -1208,8 +3396,56 @@ size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems)
        for (i = 0; i < min; i++)
                {
                r[i].nid = curve_list[i].nid;
-               r[i].comment = curve_list[i].data->comment;
+               r[i].comment = curve_list[i].comment;
                }
 
        return curve_list_length;
        }
+
+/* Functions to translate between common NIST curve names and NIDs */
+
+typedef struct {
+       const char *name;       /* NIST Name of curve */
+       int     nid;            /* Curve NID */
+} EC_NIST_NAME;
+
+static EC_NIST_NAME nist_curves[] = {
+       {"B-163", NID_sect163r2},
+       {"B-233", NID_sect233r1},
+       {"B-283", NID_sect283r1},
+       {"B-409", NID_sect409r1},
+       {"B-571", NID_sect571r1},
+       {"K-163", NID_sect163k1},
+       {"K-233", NID_sect233k1},
+       {"K-283", NID_sect283k1},
+       {"K-409", NID_sect409k1},
+       {"K-571", NID_sect571k1},
+       {"P-192", NID_X9_62_prime192v1},
+       {"P-224", NID_secp224r1},
+       {"P-256", NID_X9_62_prime256v1},
+       {"P-384", NID_secp384r1},
+       {"P-521", NID_secp521r1}
+};
+
+const char *EC_curve_nid2nist(int nid)
+       {
+       size_t i;
+       for (i = 0; i < sizeof(nist_curves)/sizeof(EC_NIST_NAME); i++)
+               {
+               if (nist_curves[i].nid == nid)
+                       return nist_curves[i].name;
+               }
+       return NULL;
+       }
+
+int EC_curve_nist2nid(const char *name)
+       {
+       size_t i;
+       for (i = 0; i < sizeof(nist_curves)/sizeof(EC_NIST_NAME); i++)
+               {
+               if (!strcmp(nist_curves[i].name, name))
+                       return nist_curves[i].nid;
+               }
+       return NID_undef;
+       }
+