*Merge.

--HG--
branch : trunk

1 files changed, 189 insertions, 189 deletions

diff --git a/dep/include/openssl/ec.h b/dep/include/openssl/ec.h
index 3c96fbd0d86..d068a42cb8b 100644
--- a/dep/include/openssl/ec.h
+++ b/dep/include/openssl/ec.h
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -58,13 +58,13 @@
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
- * Portions of the attached software ("Contribution") are developed by 
+ * Portions of the attached software ("Contribution") are developed by
  * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
  *
  * The Contribution is licensed pursuant to the OpenSSL open source
  * license provided above.
  *
- * The elliptic curve binary polynomial software is originally written by 
+ * The elliptic curve binary polynomial software is originally written by
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
  *
  */
@@ -98,25 +98,25 @@ extern "C" {
 #endif
 
 typedef enum {
-	/* values as defined in X9.62 (ECDSA) and elsewhere */
-	POINT_CONVERSION_COMPRESSED = 2,
-	POINT_CONVERSION_UNCOMPRESSED = 4,
-	POINT_CONVERSION_HYBRID = 6
+    /* values as defined in X9.62 (ECDSA) and elsewhere */
+    POINT_CONVERSION_COMPRESSED = 2,
+    POINT_CONVERSION_UNCOMPRESSED = 4,
+    POINT_CONVERSION_HYBRID = 6
 } point_conversion_form_t;
 
 
 typedef struct ec_method_st EC_METHOD;
 
 typedef struct ec_group_st
-	/*
-	 EC_METHOD *meth;
-	 -- field definition
-	 -- curve coefficients
-	 -- optional generator with associated information (order, cofactor)
-	 -- optional extra data (precomputed table for fast computation of multiples of generator)
-	 -- ASN1 stuff
-	*/
-	EC_GROUP;
+    /*
+     EC_METHOD *meth;
+     -- field definition
+     -- curve coefficients
+     -- optional generator with associated information (order, cofactor)
+     -- optional extra data (precomputed table for fast computation of multiples of generator)
+     -- ASN1 stuff
+    */
+    EC_GROUP;
 
 typedef struct ec_point_st EC_POINT;
 
@@ -186,13 +186,13 @@ EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM
  * specified by a curve name (in form of a NID) */
 EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
 /* handling of internal curves */
-typedef struct { 
-	int nid;
-	const char *comment;
-	} EC_builtin_curve;
-/* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number 
- * of all available curves or zero if a error occurred. 
- * In case r ist not zero nitems EC_builtin_curve structures 
+typedef struct {
+    int nid;
+    const char *comment;
+    } EC_builtin_curve;
+/* EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number
+ * of all available curves or zero if a error occurred.
+ * In case r ist not zero nitems EC_builtin_curve structures
  * are filled with the data of the first nitems internal groups */
 size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
 
@@ -204,27 +204,27 @@ void EC_POINT_free(EC_POINT *);
 void EC_POINT_clear_free(EC_POINT *);
 int EC_POINT_copy(EC_POINT *, const EC_POINT *);
 EC_POINT *EC_POINT_dup(const EC_POINT *, const EC_GROUP *);
- 
+
 const EC_METHOD *EC_POINT_method_of(const EC_POINT *);
 
 int EC_POINT_set_to_infinity(const EC_GROUP *, EC_POINT *);
 int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
+    const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *);
 int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
+    BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *);
 int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
+    const BIGNUM *x, const BIGNUM *y, BN_CTX *);
 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BN_CTX *);
+    BIGNUM *x, BIGNUM *y, BN_CTX *);
 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
+    const BIGNUM *x, int y_bit, BN_CTX *);
 
 int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *);
+    const BIGNUM *x, const BIGNUM *y, BN_CTX *);
 int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *, const EC_POINT *,
-	BIGNUM *x, BIGNUM *y, BN_CTX *);
+    BIGNUM *x, BIGNUM *y, BN_CTX *);
 int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *, EC_POINT *,
-	const BIGNUM *x, int y_bit, BN_CTX *);
+    const BIGNUM *x, int y_bit, BN_CTX *);
 
 size_t EC_POINT_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form,
         unsigned char *buf, size_t len, BN_CTX *);
@@ -233,13 +233,13 @@ int EC_POINT_oct2point(const EC_GROUP *, EC_POINT *,
 
 /* other interfaces to point2oct/oct2point: */
 BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BIGNUM *, BN_CTX *);
+    point_conversion_form_t form, BIGNUM *, BN_CTX *);
 EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-	EC_POINT *, BN_CTX *);
+    EC_POINT *, BN_CTX *);
 char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-	point_conversion_form_t form, BN_CTX *);
+    point_conversion_form_t form, BN_CTX *);
 EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-	EC_POINT *, BN_CTX *);
+    EC_POINT *, BN_CTX *);
 
 int EC_POINT_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *);
 int EC_POINT_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
@@ -269,10 +269,10 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *);
  * used to represent the field elements */
 int EC_GROUP_get_basis_type(const EC_GROUP *);
 int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, 
-	unsigned int *k2, unsigned int *k3);
+int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
+    unsigned int *k2, unsigned int *k3);
 
-#define OPENSSL_EC_NAMED_CURVE	0x001
+#define OPENSSL_EC_NAMED_CURVE  0x001
 
 typedef struct ecpk_parameters_st ECPKPARAMETERS;
 
@@ -284,7 +284,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
 #define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
                 (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
 #define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-		(unsigned char *)(x))
+        (unsigned char *)(x))
 
 #ifndef OPENSSL_NO_BIO
 int     ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
@@ -297,8 +297,8 @@ int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
 typedef struct ec_key_st EC_KEY;
 
 /* some values for the encoding_flag */
-#define EC_PKEY_NO_PARAMETERS	0x001
-#define EC_PKEY_NO_PUBKEY	0x002
+#define EC_PKEY_NO_PARAMETERS   0x001
+#define EC_PKEY_NO_PUBKEY   0x002
 
 EC_KEY *EC_KEY_new(void);
 EC_KEY *EC_KEY_new_by_curve_name(int nid);
@@ -319,10 +319,10 @@ void EC_KEY_set_enc_flags(EC_KEY *, unsigned int);
 point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
 void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
 /* functions to set/get method specific data  */
-void *EC_KEY_get_key_method_data(EC_KEY *, 
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
+void *EC_KEY_get_key_method_data(EC_KEY *,
+    void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
 void EC_KEY_insert_key_method_data(EC_KEY *, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
+    void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));
 /* wrapper functions for the underlying EC_GROUP object */
 void EC_KEY_set_asn1_flag(EC_KEY *, int);
 int EC_KEY_precompute_mult(EC_KEY *, BN_CTX *ctx);
@@ -344,12 +344,12 @@ EC_KEY *o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len);
 int i2o_ECPublicKey(EC_KEY *a, unsigned char **out);
 
 #ifndef OPENSSL_NO_BIO
-int	ECParameters_print(BIO *bp, const EC_KEY *x);
-int	EC_KEY_print(BIO *bp, const EC_KEY *x, int off);
+int ECParameters_print(BIO *bp, const EC_KEY *x);
+int EC_KEY_print(BIO *bp, const EC_KEY *x, int off);
 #endif
 #ifndef OPENSSL_NO_FP_API
-int	ECParameters_print_fp(FILE *fp, const EC_KEY *x);
-int	EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off);
+int ECParameters_print_fp(FILE *fp, const EC_KEY *x);
+int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off);
 #endif
 
 #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
@@ -371,153 +371,153 @@ void ERR_load_EC_strings(void);
 /* Error codes for the EC functions. */
 
 /* Function codes. */
-#define EC_F_COMPUTE_WNAF				 143
-#define EC_F_D2I_ECPARAMETERS				 144
-#define EC_F_D2I_ECPKPARAMETERS				 145
-#define EC_F_D2I_ECPRIVATEKEY				 146
-#define EC_F_ECPARAMETERS_PRINT				 147
-#define EC_F_ECPARAMETERS_PRINT_FP			 148
-#define EC_F_ECPKPARAMETERS_PRINT			 149
-#define EC_F_ECPKPARAMETERS_PRINT_FP			 150
-#define EC_F_ECP_NIST_MOD_192				 203
-#define EC_F_ECP_NIST_MOD_224				 204
-#define EC_F_ECP_NIST_MOD_256				 205
-#define EC_F_ECP_NIST_MOD_521				 206
-#define EC_F_EC_ASN1_GROUP2CURVE			 153
-#define EC_F_EC_ASN1_GROUP2FIELDID			 154
-#define EC_F_EC_ASN1_GROUP2PARAMETERS			 155
-#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 156
-#define EC_F_EC_ASN1_PARAMETERS2GROUP			 157
-#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
-#define EC_F_EC_EX_DATA_SET_DATA			 211
-#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY		 208
-#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159
-#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE		 195
-#define EC_F_EC_GF2M_SIMPLE_OCT2POINT			 160
-#define EC_F_EC_GF2M_SIMPLE_POINT2OCT			 161
+#define EC_F_COMPUTE_WNAF                143
+#define EC_F_D2I_ECPARAMETERS                144
+#define EC_F_D2I_ECPKPARAMETERS              145
+#define EC_F_D2I_ECPRIVATEKEY                146
+#define EC_F_ECPARAMETERS_PRINT              147
+#define EC_F_ECPARAMETERS_PRINT_FP           148
+#define EC_F_ECPKPARAMETERS_PRINT            149
+#define EC_F_ECPKPARAMETERS_PRINT_FP             150
+#define EC_F_ECP_NIST_MOD_192                203
+#define EC_F_ECP_NIST_MOD_224                204
+#define EC_F_ECP_NIST_MOD_256                205
+#define EC_F_ECP_NIST_MOD_521                206
+#define EC_F_EC_ASN1_GROUP2CURVE             153
+#define EC_F_EC_ASN1_GROUP2FIELDID           154
+#define EC_F_EC_ASN1_GROUP2PARAMETERS            155
+#define EC_F_EC_ASN1_GROUP2PKPARAMETERS          156
+#define EC_F_EC_ASN1_PARAMETERS2GROUP            157
+#define EC_F_EC_ASN1_PKPARAMETERS2GROUP          158
+#define EC_F_EC_EX_DATA_SET_DATA             211
+#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY       208
+#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     159
+#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE      195
+#define EC_F_EC_GF2M_SIMPLE_OCT2POINT            160
+#define EC_F_EC_GF2M_SIMPLE_POINT2OCT            161
 #define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
 #define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES	 164
-#define EC_F_EC_GFP_MONT_FIELD_DECODE			 133
-#define EC_F_EC_GFP_MONT_FIELD_ENCODE			 134
-#define EC_F_EC_GFP_MONT_FIELD_MUL			 131
-#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE		 209
-#define EC_F_EC_GFP_MONT_FIELD_SQR			 132
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE		 189
-#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP		 135
-#define EC_F_EC_GFP_NIST_FIELD_MUL			 200
-#define EC_F_EC_GFP_NIST_FIELD_SQR			 201
-#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE		 202
-#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT	 165
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE		 166
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101
-#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102
-#define EC_F_EC_GFP_SIMPLE_OCT2POINT			 103
-#define EC_F_EC_GFP_SIMPLE_POINT2OCT			 104
-#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE		 137
-#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES	 167
+#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   164
+#define EC_F_EC_GFP_MONT_FIELD_DECODE            133
+#define EC_F_EC_GFP_MONT_FIELD_ENCODE            134
+#define EC_F_EC_GFP_MONT_FIELD_MUL           131
+#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE        209
+#define EC_F_EC_GFP_MONT_FIELD_SQR           132
+#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE         189
+#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP         135
+#define EC_F_EC_GFP_NIST_FIELD_MUL           200
+#define EC_F_EC_GFP_NIST_FIELD_SQR           201
+#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE         202
+#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT  165
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE       166
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP       100
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR       101
+#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE           102
+#define EC_F_EC_GFP_SIMPLE_OCT2POINT             103
+#define EC_F_EC_GFP_SIMPLE_POINT2OCT             104
+#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE        137
+#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES  167
 #define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 168
+#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES  168
 #define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 169
+#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES    169
 #define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-#define EC_F_EC_GROUP_CHECK				 170
-#define EC_F_EC_GROUP_CHECK_DISCRIMINANT		 171
-#define EC_F_EC_GROUP_COPY				 106
-#define EC_F_EC_GROUP_GET0_GENERATOR			 139
-#define EC_F_EC_GROUP_GET_COFACTOR			 140
-#define EC_F_EC_GROUP_GET_CURVE_GF2M			 172
-#define EC_F_EC_GROUP_GET_CURVE_GFP			 130
-#define EC_F_EC_GROUP_GET_DEGREE			 173
-#define EC_F_EC_GROUP_GET_ORDER				 141
-#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS		 193
-#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194
-#define EC_F_EC_GROUP_NEW				 108
-#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174
-#define EC_F_EC_GROUP_NEW_FROM_DATA			 175
-#define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142
-#define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
-#define EC_F_EC_GROUP_SET_CURVE_GFP			 109
-#define EC_F_EC_GROUP_SET_EXTRA_DATA			 110
-#define EC_F_EC_GROUP_SET_GENERATOR			 111
-#define EC_F_EC_KEY_CHECK_KEY				 177
-#define EC_F_EC_KEY_COPY				 178
-#define EC_F_EC_KEY_GENERATE_KEY			 179
-#define EC_F_EC_KEY_NEW					 182
-#define EC_F_EC_KEY_PRINT				 180
-#define EC_F_EC_KEY_PRINT_FP				 181
-#define EC_F_EC_POINTS_MAKE_AFFINE			 136
-#define EC_F_EC_POINTS_MUL				 138
-#define EC_F_EC_POINT_ADD				 112
-#define EC_F_EC_POINT_CMP				 113
-#define EC_F_EC_POINT_COPY				 114
-#define EC_F_EC_POINT_DBL				 115
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M	 183
-#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP	 116
-#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP	 117
-#define EC_F_EC_POINT_INVERT				 210
-#define EC_F_EC_POINT_IS_AT_INFINITY			 118
-#define EC_F_EC_POINT_IS_ON_CURVE			 119
-#define EC_F_EC_POINT_MAKE_AFFINE			 120
-#define EC_F_EC_POINT_MUL				 184
-#define EC_F_EC_POINT_NEW				 121
-#define EC_F_EC_POINT_OCT2POINT				 122
-#define EC_F_EC_POINT_POINT2OCT				 123
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M	 185
-#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP	 124
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M	 186
-#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125
-#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126
-#define EC_F_EC_POINT_SET_TO_INFINITY			 127
-#define EC_F_EC_PRE_COMP_DUP				 207
-#define EC_F_EC_WNAF_MUL				 187
-#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 188
-#define EC_F_I2D_ECPARAMETERS				 190
-#define EC_F_I2D_ECPKPARAMETERS				 191
-#define EC_F_I2D_ECPRIVATEKEY				 192
-#define EC_F_I2O_ECPUBLICKEY				 151
-#define EC_F_O2I_ECPUBLICKEY				 152
+#define EC_F_EC_GROUP_CHECK              170
+#define EC_F_EC_GROUP_CHECK_DISCRIMINANT         171
+#define EC_F_EC_GROUP_COPY               106
+#define EC_F_EC_GROUP_GET0_GENERATOR             139
+#define EC_F_EC_GROUP_GET_COFACTOR           140
+#define EC_F_EC_GROUP_GET_CURVE_GF2M             172
+#define EC_F_EC_GROUP_GET_CURVE_GFP          130
+#define EC_F_EC_GROUP_GET_DEGREE             173
+#define EC_F_EC_GROUP_GET_ORDER              141
+#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS      193
+#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS        194
+#define EC_F_EC_GROUP_NEW                108
+#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME          174
+#define EC_F_EC_GROUP_NEW_FROM_DATA          175
+#define EC_F_EC_GROUP_PRECOMPUTE_MULT            142
+#define EC_F_EC_GROUP_SET_CURVE_GF2M             176
+#define EC_F_EC_GROUP_SET_CURVE_GFP          109
+#define EC_F_EC_GROUP_SET_EXTRA_DATA             110
+#define EC_F_EC_GROUP_SET_GENERATOR          111
+#define EC_F_EC_KEY_CHECK_KEY                177
+#define EC_F_EC_KEY_COPY                 178
+#define EC_F_EC_KEY_GENERATE_KEY             179
+#define EC_F_EC_KEY_NEW                  182
+#define EC_F_EC_KEY_PRINT                180
+#define EC_F_EC_KEY_PRINT_FP                 181
+#define EC_F_EC_POINTS_MAKE_AFFINE           136
+#define EC_F_EC_POINTS_MUL               138
+#define EC_F_EC_POINT_ADD                112
+#define EC_F_EC_POINT_CMP                113
+#define EC_F_EC_POINT_COPY               114
+#define EC_F_EC_POINT_DBL                115
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M    183
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP     116
+#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP    117
+#define EC_F_EC_POINT_INVERT                 210
+#define EC_F_EC_POINT_IS_AT_INFINITY             118
+#define EC_F_EC_POINT_IS_ON_CURVE            119
+#define EC_F_EC_POINT_MAKE_AFFINE            120
+#define EC_F_EC_POINT_MUL                184
+#define EC_F_EC_POINT_NEW                121
+#define EC_F_EC_POINT_OCT2POINT              122
+#define EC_F_EC_POINT_POINT2OCT              123
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M    185
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP     124
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M    186
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP     125
+#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP    126
+#define EC_F_EC_POINT_SET_TO_INFINITY            127
+#define EC_F_EC_PRE_COMP_DUP                 207
+#define EC_F_EC_WNAF_MUL                 187
+#define EC_F_EC_WNAF_PRECOMPUTE_MULT             188
+#define EC_F_I2D_ECPARAMETERS                190
+#define EC_F_I2D_ECPKPARAMETERS              191
+#define EC_F_I2D_ECPRIVATEKEY                192
+#define EC_F_I2O_ECPUBLICKEY                 151
+#define EC_F_O2I_ECPUBLICKEY                 152
 
 /* Reason codes. */
-#define EC_R_ASN1_ERROR					 115
-#define EC_R_ASN1_UNKNOWN_FIELD				 116
-#define EC_R_BUFFER_TOO_SMALL				 100
-#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 117
-#define EC_R_DISCRIMINANT_IS_ZERO			 118
-#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 119
-#define EC_R_FIELD_TOO_LARGE				 138
-#define EC_R_GROUP2PKPARAMETERS_FAILURE			 120
-#define EC_R_I2D_ECPKPARAMETERS_FAILURE			 121
-#define EC_R_INCOMPATIBLE_OBJECTS			 101
-#define EC_R_INVALID_ARGUMENT				 112
-#define EC_R_INVALID_COMPRESSED_POINT			 110
-#define EC_R_INVALID_COMPRESSION_BIT			 109
-#define EC_R_INVALID_ENCODING				 102
-#define EC_R_INVALID_FIELD				 103
-#define EC_R_INVALID_FORM				 104
-#define EC_R_INVALID_GROUP_ORDER			 122
-#define EC_R_INVALID_PENTANOMIAL_BASIS			 132
-#define EC_R_INVALID_PRIVATE_KEY			 123
-#define EC_R_INVALID_TRINOMIAL_BASIS			 137
-#define EC_R_MISSING_PARAMETERS				 124
-#define EC_R_MISSING_PRIVATE_KEY			 125
-#define EC_R_NOT_A_NIST_PRIME				 135
-#define EC_R_NOT_A_SUPPORTED_NIST_PRIME			 136
-#define EC_R_NOT_IMPLEMENTED				 126
-#define EC_R_NOT_INITIALIZED				 111
-#define EC_R_NO_FIELD_MOD				 133
-#define EC_R_PASSED_NULL_PARAMETER			 134
-#define EC_R_PKPARAMETERS2GROUP_FAILURE			 127
-#define EC_R_POINT_AT_INFINITY				 106
-#define EC_R_POINT_IS_NOT_ON_CURVE			 107
-#define EC_R_SLOT_FULL					 108
-#define EC_R_UNDEFINED_GENERATOR			 113
-#define EC_R_UNDEFINED_ORDER				 128
-#define EC_R_UNKNOWN_GROUP				 129
-#define EC_R_UNKNOWN_ORDER				 114
-#define EC_R_UNSUPPORTED_FIELD				 131
-#define EC_R_WRONG_ORDER				 130
+#define EC_R_ASN1_ERROR                  115
+#define EC_R_ASN1_UNKNOWN_FIELD              116
+#define EC_R_BUFFER_TOO_SMALL                100
+#define EC_R_D2I_ECPKPARAMETERS_FAILURE          117
+#define EC_R_DISCRIMINANT_IS_ZERO            118
+#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE        119
+#define EC_R_FIELD_TOO_LARGE                 138
+#define EC_R_GROUP2PKPARAMETERS_FAILURE          120
+#define EC_R_I2D_ECPKPARAMETERS_FAILURE          121
+#define EC_R_INCOMPATIBLE_OBJECTS            101
+#define EC_R_INVALID_ARGUMENT                112
+#define EC_R_INVALID_COMPRESSED_POINT            110
+#define EC_R_INVALID_COMPRESSION_BIT             109
+#define EC_R_INVALID_ENCODING                102
+#define EC_R_INVALID_FIELD               103
+#define EC_R_INVALID_FORM                104
+#define EC_R_INVALID_GROUP_ORDER             122
+#define EC_R_INVALID_PENTANOMIAL_BASIS           132
+#define EC_R_INVALID_PRIVATE_KEY             123
+#define EC_R_INVALID_TRINOMIAL_BASIS             137
+#define EC_R_MISSING_PARAMETERS              124
+#define EC_R_MISSING_PRIVATE_KEY             125
+#define EC_R_NOT_A_NIST_PRIME                135
+#define EC_R_NOT_A_SUPPORTED_NIST_PRIME          136
+#define EC_R_NOT_IMPLEMENTED                 126
+#define EC_R_NOT_INITIALIZED                 111
+#define EC_R_NO_FIELD_MOD                133
+#define EC_R_PASSED_NULL_PARAMETER           134
+#define EC_R_PKPARAMETERS2GROUP_FAILURE          127
+#define EC_R_POINT_AT_INFINITY               106
+#define EC_R_POINT_IS_NOT_ON_CURVE           107
+#define EC_R_SLOT_FULL                   108
+#define EC_R_UNDEFINED_GENERATOR             113
+#define EC_R_UNDEFINED_ORDER                 128
+#define EC_R_UNKNOWN_GROUP               129
+#define EC_R_UNKNOWN_ORDER               114
+#define EC_R_UNSUPPORTED_FIELD               131
+#define EC_R_WRONG_ORDER                 130
 
 #ifdef  __cplusplus
 }