Simplify handling of named curves: get rid of EC_GROUP_new_by_name(),

EC_GROUP_new_by_nid() should be enough.  This avoids a lot of
redundancy.

Submitted by: Nils Larsch

1 files changed, 75 insertions, 159 deletions

diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 17083f23a2..4eb4ad678c 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -182,94 +182,15 @@ int EC_GROUP_check_discriminant(const EC_GROUP *, BN_CTX *);
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 
-/* EC_GROUP_new_by_nid() and EC_GROUP_new_by_name() also set
- * generator and order */
+/* EC_GROUP_new_by_nid() creates a EC_GROUP structure specified by a NID */
 EC_GROUP *EC_GROUP_new_by_nid(int nid);
-EC_GROUP *EC_GROUP_new_by_name(int name);
-/* Currently valid arguments to EC_GROUP_new_by_name() */
-#define EC_GROUP_NO_CURVE		0
-#define EC_GROUP_NIST_PRIME_192		NID_X9_62_prime192v1
-#define EC_GROUP_NIST_PRIME_224		NID_secp224r1
-#define EC_GROUP_NIST_PRIME_256		NID_X9_62_prime256v1
-#define EC_GROUP_NIST_PRIME_384		NID_secp384r1
-#define EC_GROUP_NIST_PRIME_521		NID_secp521r1
-#define EC_GROUP_X9_62_PRIME_192V1	NID_X9_62_prime192v1
-#define EC_GROUP_X9_62_PRIME_192V2	NID_X9_62_prime192v2
-#define EC_GROUP_X9_62_PRIME_192V3	NID_X9_62_prime192v3
-#define EC_GROUP_X9_62_PRIME_239V1	NID_X9_62_prime239v1
-#define EC_GROUP_X9_62_PRIME_239V2	NID_X9_62_prime239v2
-#define EC_GROUP_X9_62_PRIME_239V3	NID_X9_62_prime239v3
-#define EC_GROUP_X9_62_PRIME_256V1	NID_X9_62_prime256v1
-#define EC_GROUP_SECG_PRIME_112R1	NID_secp112r1
-#define EC_GROUP_SECG_PRIME_112R2	NID_secp112r2
-#define EC_GROUP_SECG_PRIME_128R1	NID_secp128r1
-#define EC_GROUP_SECG_PRIME_128R2	NID_secp128r2
-#define EC_GROUP_SECG_PRIME_160K1	NID_secp160k1
-#define EC_GROUP_SECG_PRIME_160R1	NID_secp160r1
-#define EC_GROUP_SECG_PRIME_160R2	NID_secp160r2
-#define EC_GROUP_SECG_PRIME_192K1	NID_secp192k1
-#define EC_GROUP_SECG_PRIME_192R1	NID_X9_62_prime192v1
-#define EC_GROUP_SECG_PRIME_224K1	NID_secp224k1
-#define EC_GROUP_SECG_PRIME_224R1	NID_secp224r1
-#define EC_GROUP_SECG_PRIME_256K1	NID_secp256k1
-#define EC_GROUP_SECG_PRIME_256R1	NID_X9_62_prime256v1
-#define EC_GROUP_SECG_PRIME_384R1	NID_secp384r1
-#define EC_GROUP_SECG_PRIME_521R1	NID_secp521r1
-#define EC_GROUP_WTLS_6			NID_wap_wsg_idm_ecid_wtls6
-#define EC_GROUP_WTLS_7			NID_wap_wsg_idm_ecid_wtls7
-#define EC_GROUP_WTLS_8			NID_wap_wsg_idm_ecid_wtls8
-#define EC_GROUP_WTLS_9			NID_wap_wsg_idm_ecid_wtls9
-#define EC_GROUP_WTLS_12		NID_wap_wsg_idm_ecid_wtls12
-#define EC_GROUP_NIST_CHAR2_K163	NID_sect163k1
-#define EC_GROUP_NIST_CHAR2_B163	NID_sect163r2
-#define EC_GROUP_NIST_CHAR2_K233	NID_sect233k1
-#define EC_GROUP_NIST_CHAR2_B233	NID_sect233r1
-#define EC_GROUP_NIST_CHAR2_K283	NID_sect283k1
-#define EC_GROUP_NIST_CHAR2_B283	NID_sect283r1
-#define EC_GROUP_NIST_CHAR2_K409	NID_sect409k1
-#define EC_GROUP_NIST_CHAR2_B409	NID_sect409r1
-#define EC_GROUP_NIST_CHAR2_K571	NID_sect571k1
-#define EC_GROUP_NIST_CHAR2_B571	NID_sect571r1
-#define EC_GROUP_X9_62_CHAR2_163V1	NID_X9_62_c2pnb163v1
-#define EC_GROUP_X9_62_CHAR2_163V2	NID_X9_62_c2pnb163v2
-#define EC_GROUP_X9_62_CHAR2_163V3	NID_X9_62_c2pnb163v3
-#define EC_GROUP_X9_62_CHAR2_176V1	NID_X9_62_c2pnb176v1
-#define EC_GROUP_X9_62_CHAR2_191V1	NID_X9_62_c2tnb191v1
-#define EC_GROUP_X9_62_CHAR2_191V2	NID_X9_62_c2tnb191v2
-#define EC_GROUP_X9_62_CHAR2_191V3	NID_X9_62_c2tnb191v3
-#define EC_GROUP_X9_62_CHAR2_208W1	NID_X9_62_c2pnb208w1
-#define EC_GROUP_X9_62_CHAR2_239V1	NID_X9_62_c2tnb239v1
-#define EC_GROUP_X9_62_CHAR2_239V2	NID_X9_62_c2tnb239v2
-#define EC_GROUP_X9_62_CHAR2_239V3	NID_X9_62_c2tnb239v3
-#define EC_GROUP_X9_62_CHAR2_272W1	NID_X9_62_c2pnb272w1
-#define EC_GROUP_X9_62_CHAR2_304W1	NID_X9_62_c2pnb304w1
-#define EC_GROUP_X9_62_CHAR2_359V1	NID_X9_62_c2tnb359v1
-#define EC_GROUP_X9_62_CHAR2_368W1	NID_X9_62_c2pnb368w1
-#define EC_GROUP_X9_62_CHAR2_431R1	NID_X9_62_c2tnb431r1
-#define EC_GROUP_SECG_CHAR2_113R1	NID_sect113r1
-#define EC_GROUP_SECG_CHAR2_113R2	NID_sect113r2
-#define EC_GROUP_SECG_CHAR2_131R1	NID_sect131r1
-#define EC_GROUP_SECG_CHAR2_131R2	NID_sect131r2
-#define EC_GROUP_SECG_CHAR2_163K1	NID_sect163k1
-#define EC_GROUP_SECG_CHAR2_163R1	NID_sect163r1
-#define EC_GROUP_SECG_CHAR2_163R2	NID_sect163r2
-#define EC_GROUP_SECG_CHAR2_193R1	NID_sect193r1
-#define EC_GROUP_SECG_CHAR2_193R2	NID_sect193r2
-#define EC_GROUP_SECG_CHAR2_233K1	NID_sect233k1
-#define EC_GROUP_SECG_CHAR2_233R1	NID_sect233r1
-#define EC_GROUP_SECG_CHAR2_239K1	NID_sect239k1
-#define EC_GROUP_SECG_CHAR2_283K1	NID_sect283k1
-#define EC_GROUP_SECG_CHAR2_283R1	NID_sect283r1
-#define EC_GROUP_SECG_CHAR2_409K1	NID_sect409k1
-#define EC_GROUP_SECG_CHAR2_409R1	NID_sect409r1
-#define EC_GROUP_SECG_CHAR2_571K1	NID_sect571k1
-#define EC_GROUP_SECG_CHAR2_571R1	NID_sect571r1
-#define EC_GROUP_WTLS_1			NID_wap_wsg_idm_ecid_wtls1
-#define EC_GROUP_WTLS_3			NID_wap_wsg_idm_ecid_wtls3
-#define EC_GROUP_WTLS_4			NID_wap_wsg_idm_ecid_wtls4
-#define EC_GROUP_WTLS_5			NID_wap_wsg_idm_ecid_wtls5
-#define EC_GROUP_WTLS_10		NID_wap_wsg_idm_ecid_wtls10
-#define EC_GROUP_WTLS_11		NID_wap_wsg_idm_ecid_wtls11
+/* EC_GROUP_get0_comment() returns a pointer to the 'comment' field of 
+ * ec_curve_data_st structure */
+const char *EC_GROUP_get0_comment(int nid);
+/* internal function : ec_group_index2nid() returns the NID of curve
+ * with the given index i from the internal curve list */
+int ec_group_index2nid(int i);
+
 
 EC_POINT *EC_POINT_new(const EC_GROUP *);
 void EC_POINT_free(EC_POINT *);
@@ -426,111 +347,109 @@ void ERR_load_EC_strings(void);
 
 /* Function codes. */
 #define EC_F_COMPUTE_WNAF				 143
-#define EC_F_D2I_ECPARAMETERS				 155
-#define EC_F_D2I_ECPKPARAMETERS				 161
-#define EC_F_D2I_ECPRIVATEKEY				 168
-#define EC_F_ECPARAMETERS_PRINT				 173
-#define EC_F_ECPARAMETERS_PRINT_FP			 174
-#define EC_F_ECPKPARAMETERS_PRINT			 166
-#define EC_F_ECPKPARAMETERS_PRINT_FP			 167
-#define EC_F_ECPUBLICKEY_GET_OCTET			 170
-#define EC_F_ECPUBLICKEY_SET_OCTET			 171
-#define EC_F_EC_ASN1_GROUP2CURVE			 159
-#define EC_F_EC_ASN1_GROUP2FIELDID			 156
-#define EC_F_EC_ASN1_GROUP2PARAMETERS			 160
-#define EC_F_EC_ASN1_GROUP2PKPARAMETERS			 162
+#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_ECPUBLICKEY_GET_OCTET			 151
+#define EC_F_ECPUBLICKEY_SET_OCTET			 152
+#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			 163
-#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 168
-#define EC_F_EC_GF2M_SIMPLE_OCT2POINT			 169
-#define EC_F_EC_GF2M_SIMPLE_POINT2OCT			 170
-#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 171
-#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 172
-#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES	 182
+#define EC_F_EC_ASN1_PKPARAMETERS2GROUP			 158
+#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT	 159
+#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_SQR			 132
-#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT	 152
-#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE		 100
+#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	 105
-#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES	 128
-#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES	 129
-#define EC_F_EC_GROUP_CHECK				 150
-#define EC_F_EC_GROUP_CHECK_DISCRIMINANT		 153
+#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_GFP 128
+#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			 173
+#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			 174
+#define EC_F_EC_GROUP_GET_DEGREE			 173
 #define EC_F_EC_GROUP_GET_EXTRA_DATA			 107
 #define EC_F_EC_GROUP_GET_ORDER				 141
 #define EC_F_EC_GROUP_GROUP2NID				 147
 #define EC_F_EC_GROUP_NEW				 108
-#define EC_F_EC_GROUP_NEW_BY_NAME			 144
-#define EC_F_EC_GROUP_NEW_BY_NID			 146
-#define EC_F_EC_GROUP_NEW_GF2M_FROM_HEX			 175
-#define EC_F_EC_GROUP_NEW_GFP_FROM_HEX			 148
+#define EC_F_EC_GROUP_NEW_BY_NID			 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				 184
-#define EC_F_EC_KEY_COPY				 186
-#define EC_F_EC_KEY_GENERATE_KEY			 185
-#define EC_F_EC_KEY_PRINT				 175
-#define EC_F_EC_KEY_PRINT_FP				 176
-#define EC_F_EC_NEW					 172
+#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_PRINT				 180
+#define EC_F_EC_KEY_PRINT_FP				 181
+#define EC_F_EC_NEW					 182
 #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	 177
+#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_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				 179
+#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	 180
+#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	 181
+#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_WNAF_MUL				 183
-#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 178
-#define EC_F_GFP_MONT_GROUP_SET_CURVE			 135
-#define EC_F_I2D_ECDSAPARAMETERS			 158
-#define EC_F_I2D_ECPARAMETERS				 164
-#define EC_F_I2D_ECPKPARAMETERS				 165
-#define EC_F_I2D_ECPRIVATEKEY				 169
+#define EC_F_EC_WNAF_MUL				 187
+#define EC_F_EC_WNAF_PRECOMPUTE_MULT			 188
+#define EC_F_GFP_MONT_GROUP_SET_CURVE			 189
+#define EC_F_GFP_MONT_GROUP_SET_CURVE_GFP		 135
+#define EC_F_I2D_ECPARAMETERS				 190
+#define EC_F_I2D_ECPKPARAMETERS				 191
+#define EC_F_I2D_ECPRIVATEKEY				 192
 
 /* Reason codes. */
-#define EC_R_ASN1_ERROR					 130
-#define EC_R_ASN1_UNKNOWN_FIELD				 131
+#define EC_R_ASN1_ERROR					 115
+#define EC_R_ASN1_UNKNOWN_FIELD				 116
 #define EC_R_BUFFER_TOO_SMALL				 100
-#define EC_R_D2I_ECPARAMETERS_FAILURE			 132
-#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 133
-#define EC_R_D2I_EC_PARAMETERS_FAILURE			 123
+#define EC_R_D2I_ECPKPARAMETERS_FAILURE			 117
 #define EC_R_DISCRIMINANT_IS_ZERO			 118
-#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 124
-#define EC_R_GROUP2PARAMETERS_FAILURE			 125
-#define EC_R_GROUP2PKPARAMETERS_FAILURE			 134
-#define EC_R_I2D_ECPKPARAMETERS_FAILURE			 135
-#define EC_R_I2D_EC_PARAMETERS_FAILURE			 126
+#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE		 119
+#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
@@ -538,25 +457,22 @@ void ERR_load_EC_strings(void);
 #define EC_R_INVALID_ENCODING				 102
 #define EC_R_INVALID_FIELD				 103
 #define EC_R_INVALID_FORM				 104
-#define EC_R_INVALID_GROUP_ORDER			 119
-#define EC_R_INVALID_PRIVATE_KEY			 139
-#define EC_R_MISSING_PARAMETERS				 127
-#define EC_R_MISSING_PRIVATE_KEY			 138
-#define EC_R_NOT_IMPLEMENTED				 136
+#define EC_R_INVALID_GROUP_ORDER			 122
+#define EC_R_INVALID_PRIVATE_KEY			 123
+#define EC_R_MISSING_PARAMETERS				 124
+#define EC_R_MISSING_PRIVATE_KEY			 125
+#define EC_R_NOT_IMPLEMENTED				 126
 #define EC_R_NOT_INITIALIZED				 111
 #define EC_R_NO_SUCH_EXTRA_DATA				 105
-#define EC_R_PARAMETERS2GROUP_FAILURE			 128
-#define EC_R_PKPARAMETERS2GROUP_FAILURE			 137
+#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				 122
-#define EC_R_UNKNOWN_GROUP				 116
-#define EC_R_UNKNOWN_NID				 117
+#define EC_R_UNDEFINED_ORDER				 128
+#define EC_R_UNKNOWN_GROUP				 129
 #define EC_R_UNKNOWN_ORDER				 114
-#define EC_R_UNKNOWN_PARAMETERS_TYPE			 129
-#define EC_R_WRONG_ORDER				 140
+#define EC_R_WRONG_ORDER				 130
 
 #ifdef  __cplusplus
 }