use a generic EC_KEY structure (EC keys are not ECDSA specific)

Submitted by: Nils Larsch

1 files changed, 96 insertions, 58 deletions

diff --git a/util/libeay.num b/util/libeay.num
index 6c46aab337..6622821ae1 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2784,69 +2784,69 @@ CONF_modules_free                       3226	EXIST::FUNCTION:
 NCONF_default                           3227	EXIST::FUNCTION:
 OPENSSL_no_config                       3228	EXIST::FUNCTION:
 NCONF_WIN32                             3229	EXIST::FUNCTION:
-ECDSA_set_conversion_form               3230	EXIST::FUNCTION:ECDSA
+ECDSA_set_conversion_form               3230	NOEXIST::FUNCTION:
 EC_GROUP_new_by_name                    3231	EXIST::FUNCTION:EC
-d2i_ECDSA_PUBKEY                        3232	EXIST::FUNCTION:ECDSA
-PEM_read_bio_ECDSAPrivateKey            3233	EXIST::FUNCTION:ECDSA
+d2i_ECDSA_PUBKEY                        3232	NOEXIST::FUNCTION:
+PEM_read_bio_ECDSAPrivateKey            3233	NOEXIST::FUNCTION:
 EC_GROUP_get_asn1_flag                  3234	EXIST::FUNCTION:EC
 ECDSA_SIG_new                           3235	EXIST::FUNCTION:ECDSA
 ECDSA_verify                            3236	EXIST::FUNCTION:ECDSA
 EC_POINT_point2hex                      3237	EXIST::FUNCTION:EC
-i2d_ECDSAParameters                     3238	EXIST::FUNCTION:ECDSA
-i2d_ECDSAPrivateKey_bio                 3239	EXIST::FUNCTION:BIO,ECDSA
-EC_ASN1_group2pkparameters              3240	EXIST::FUNCTION:EC
+i2d_ECDSAParameters                     3238	NOEXIST::FUNCTION:
+i2d_ECDSAPrivateKey_bio                 3239	NOEXIST::FUNCTION:
+EC_ASN1_group2pkparameters              3240	NOEXIST::FUNCTION:
 PEM_write_bio_ECDSAParameters           3241	NOEXIST::FUNCTION:
-ECDSAParameters_print_fp                3242	EXIST::FUNCTION:ECDSA,FP_API
+ECDSAParameters_print_fp                3242	NOEXIST::FUNCTION:
 EC_GROUP_check                          3243	EXIST::FUNCTION:EC
 ENGINE_set_default_ECDSA                3244	EXIST::FUNCTION:
-PEM_read_bio_ECDSA_PUBKEY               3245	EXIST::FUNCTION:ECDSA
-ECDSA_check_key                         3246	EXIST::FUNCTION:ECDSA
-ECDSA_new_method                        3247	EXIST::FUNCTION:ECDSA
-d2i_ECPARAMETERS                        3248	EXIST::FUNCTION:EC
-d2i_ECDSAPrivateKey_bio                 3249	EXIST::FUNCTION:BIO,ECDSA
-i2d_ECDSA_PUBKEY                        3250	EXIST::FUNCTION:ECDSA
+PEM_read_bio_ECDSA_PUBKEY               3245	NOEXIST::FUNCTION:
+ECDSA_check_key                         3246	NOEXIST::FUNCTION:
+ECDSA_new_method                        3247	NOEXIST::FUNCTION:
+d2i_ECPARAMETERS                        3248	NOEXIST::FUNCTION:
+d2i_ECDSAPrivateKey_bio                 3249	NOEXIST::FUNCTION:
+i2d_ECDSA_PUBKEY                        3250	NOEXIST::FUNCTION:
 EC_POINT_hex2point                      3251	EXIST::FUNCTION:EC
-i2d_ECDSA_PUBKEY_fp                     3252	EXIST::FUNCTION:ECDSA,FP_API
+i2d_ECDSA_PUBKEY_fp                     3252	NOEXIST::FUNCTION:
 ENGINE_unregister_ECDSA                 3253	EXIST::FUNCTION:
-ECDSA_free                              3254	EXIST::FUNCTION:ECDSA
-ECDSAParameters_print                   3255	EXIST::FUNCTION:BIO,ECDSA
+ECDSA_free                              3254	NOEXIST::FUNCTION:
+ECDSAParameters_print                   3255	NOEXIST::FUNCTION:
 EC_POINT_bn2point                       3256	EXIST::FUNCTION:EC
-PEM_write_bio_ECDSA_PUBKEY              3257	EXIST::FUNCTION:ECDSA
+PEM_write_bio_ECDSA_PUBKEY              3257	NOEXIST::FUNCTION:
 ECDSA_set_method                        3258	EXIST::FUNCTION:ECDSA
-ECDSA_print                             3259	EXIST::FUNCTION:BIO,ECDSA
-i2d_ECPARAMETERS                        3260	EXIST::FUNCTION:EC
-d2i_ECPKPARAMETERS                      3261	EXIST::FUNCTION:EC
-EVP_PKEY_get1_ECDSA                     3262	EXIST::FUNCTION:ECDSA
+ECDSA_print                             3259	NOEXIST::FUNCTION:
+i2d_ECPARAMETERS                        3260	NOEXIST::FUNCTION:
+d2i_ECPKPARAMETERS                      3261	NOEXIST::FUNCTION:
+EVP_PKEY_get1_ECDSA                     3262	NOEXIST::FUNCTION:
 ECDSA_SIG_free                          3263	EXIST::FUNCTION:ECDSA
 ENGINE_get_default_ECDSA                3264	EXIST::FUNCTION:
-PEM_write_ECDSAPrivateKey               3265	EXIST:!WIN16:FUNCTION:ECDSA
+PEM_write_ECDSAPrivateKey               3265	NOEXIST::FUNCTION:
 ECDSA_sign_setup                        3266	EXIST::FUNCTION:ECDSA
 ENGINE_get_ECDSA                        3267	EXIST::FUNCTION:
 ECDSA_get_default_method                3268	EXIST::FUNCTION:ECDSA
-d2i_ECDSA_PUBKEY_bio                    3269	EXIST::FUNCTION:BIO,ECDSA
+d2i_ECDSA_PUBKEY_bio                    3269	NOEXIST::FUNCTION:
 ECDSA_sign                              3270	EXIST::FUNCTION:ECDSA
 ENGINE_register_ECDSA                   3271	EXIST::FUNCTION:
-d2i_ECDSAPrivateKey_fp                  3272	EXIST::FUNCTION:ECDSA,FP_API
+d2i_ECDSAPrivateKey_fp                  3272	NOEXIST::FUNCTION:
 EC_GROUP_set_asn1_flag                  3273	EXIST::FUNCTION:EC
-ECPKPARAMETERS_it                       3274	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC
-ECPKPARAMETERS_it                       3274	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC
-ECDSA_print_fp                          3275	EXIST::FUNCTION:ECDSA,FP_API
-i2d_ECDSAPrivateKey                     3276	EXIST::FUNCTION:ECDSA
-d2i_ECDSAParameters                     3277	EXIST::FUNCTION:ECDSA
-PEM_write_bio_ECDSAPrivateKey           3278	EXIST::FUNCTION:ECDSA
+ECPKPARAMETERS_it                       3274	NOEXIST::FUNCTION:
+ECPKPARAMETERS_it                       3274	NOEXIST::FUNCTION:
+ECDSA_print_fp                          3275	NOEXIST::FUNCTION:
+i2d_ECDSAPrivateKey                     3276	NOEXIST::FUNCTION:
+d2i_ECDSAParameters                     3277	NOEXIST::FUNCTION:
+PEM_write_bio_ECDSAPrivateKey           3278	NOEXIST::FUNCTION:
 ERR_load_ECDSA_strings                  3279	EXIST::FUNCTION:ECDSA
 d2i_ECParameters                        3280	EXIST::FUNCTION:EC
 d2i_ECDSA_SIG                           3281	EXIST::FUNCTION:ECDSA
 ECDSA_size                              3282	EXIST::FUNCTION:ECDSA
 EC_GROUP_set_nid                        3283	EXIST::FUNCTION:EC
-EVP_PKEY_set1_ECDSA                     3284	EXIST::FUNCTION:ECDSA
+EVP_PKEY_set1_ECDSA                     3284	NOEXIST::FUNCTION:
 EC_GROUP_get_nid                        3285	EXIST::FUNCTION:EC
-d2i_ECDSA_PUBKEY_fp                     3286	EXIST::FUNCTION:ECDSA,FP_API
+d2i_ECDSA_PUBKEY_fp                     3286	NOEXIST::FUNCTION:
 EC_METHOD_get_field_type                3287	EXIST::FUNCTION:EC
 EC_GROUP_get_point_conversion_form      3288	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_get_point_conv_form            3288	EXIST:VMS:FUNCTION:EC
 ECDSA_OpenSSL                           3289	EXIST::FUNCTION:ECDSA
-i2d_ECPKPARAMETERS                      3290	EXIST::FUNCTION:EC
+i2d_ECPKPARAMETERS                      3290	NOEXIST::FUNCTION:
 PEM_read_ECDSAParameters                3291	NOEXIST::FUNCTION:
 ECDSA_get_ex_data                       3292	EXIST::FUNCTION:ECDSA
 ECDSA_do_verify                         3293	EXIST::FUNCTION:ECDSA
@@ -2856,35 +2856,35 @@ i2d_ECParameters                        3296	EXIST::FUNCTION:EC
 d2i_ECPKParameters                      3297	EXIST::FUNCTION:EC
 i2d_ECDSA_SIG                           3298	EXIST::FUNCTION:ECDSA
 PEM_read_bio_ECDSAParameters            3299	NOEXIST::FUNCTION:
-ECDSAPublicKey_get_octet_string         3300	EXIST::FUNCTION:ECDSA
-ECDSA_new                               3301	EXIST::FUNCTION:ECDSA
+ECDSAPublicKey_get_octet_string         3300	NOEXIST::FUNCTION:
+ECDSA_new                               3301	NOEXIST::FUNCTION:
 EVP_ecdsa                               3302	EXIST::FUNCTION:SHA
-ECPARAMETERS_it                         3303	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC
-ECPARAMETERS_it                         3303	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC
+ECPARAMETERS_it                         3303	NOEXIST::FUNCTION:
+ECPARAMETERS_it                         3303	NOEXIST::FUNCTION:
 ECDSA_set_default_method                3304	EXIST::FUNCTION:ECDSA
 ENGINE_set_ECDSA                        3305	EXIST::FUNCTION:
 ECDSA_get_ex_new_index                  3306	EXIST::FUNCTION:ECDSA
 EC_GROUP_set_point_conversion_form      3307	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_set_point_conv_form            3307	EXIST:VMS:FUNCTION:EC
-PEM_write_ECDSA_PUBKEY                  3308	EXIST:!WIN16:FUNCTION:ECDSA
+PEM_write_ECDSA_PUBKEY                  3308	NOEXIST::FUNCTION:
 EC_GROUP_check_discriminant             3309	EXIST::FUNCTION:EC
-ECDSA_set_default_conversion_form       3310	EXIST::FUNCTION:ECDSA
+ECDSA_set_default_conversion_form       3310	NOEXIST::FUNCTION:
 ECDSA_set_ex_data                       3311	EXIST::FUNCTION:ECDSA
-ECDSA_get_default_conversion_form       3312	EXIST::FUNCTION:ECDSA
-i2d_ECDSA_PUBKEY_bio                    3313	EXIST::FUNCTION:BIO,ECDSA
-EC_ASN1_pkparameters2group              3314	EXIST::FUNCTION:EC
-d2i_ECDSAPrivateKey                     3315	EXIST::FUNCTION:ECDSA
+ECDSA_get_default_conversion_form       3312	NOEXIST::FUNCTION:
+i2d_ECDSA_PUBKEY_bio                    3313	NOEXIST::FUNCTION:
+EC_ASN1_pkparameters2group              3314	NOEXIST::FUNCTION:
+d2i_ECDSAPrivateKey                     3315	NOEXIST::FUNCTION:
 EC_GROUP_new_by_nid                     3316	EXIST::FUNCTION:EC
-PEM_read_ECDSA_PUBKEY                   3317	EXIST:!WIN16:FUNCTION:ECDSA
-ECDSA_up_ref                            3318	EXIST::FUNCTION:ECDSA
+PEM_read_ECDSA_PUBKEY                   3317	NOEXIST::FUNCTION:
+ECDSA_up_ref                            3318	NOEXIST::FUNCTION:
 ENGINE_register_all_ECDSA               3319	EXIST::FUNCTION:
-ECDSA_get_conversion_form               3320	EXIST::FUNCTION:ECDSA
+ECDSA_get_conversion_form               3320	NOEXIST::FUNCTION:
 i2d_ECPKParameters                      3321	EXIST::FUNCTION:EC
-ECDSA_generate_key                      3322	EXIST::FUNCTION:ECDSA
+ECDSA_generate_key                      3322	NOEXIST::FUNCTION:
 PEM_write_ECDSAParameters               3323	NOEXIST::FUNCTION:
-i2d_ECDSAPrivateKey_fp                  3324	EXIST::FUNCTION:ECDSA,FP_API
-PEM_read_ECDSAPrivateKey                3325	EXIST:!WIN16:FUNCTION:ECDSA
-ECDSAPublicKey_set_octet_string         3326	EXIST::FUNCTION:ECDSA
+i2d_ECDSAPrivateKey_fp                  3324	NOEXIST::FUNCTION:
+PEM_read_ECDSAPrivateKey                3325	NOEXIST::FUNCTION:
+ECDSAPublicKey_set_octet_string         3326	NOEXIST::FUNCTION:
 ECPKParameters_print_fp                 3327	EXIST::FUNCTION:EC,FP_API
 EVP_des_ede3_ecb                        3328	EXIST::FUNCTION:DES
 EC_GROUP_set_seed                       3329	EXIST::FUNCTION:EC
@@ -2902,15 +2902,15 @@ EVP_des_ede_ecb                         3339	EXIST::FUNCTION:DES
 d2i_ASN1_UNIVERSALSTRING                3340	EXIST::FUNCTION:
 PEM_read_bio_ECPKParameters             3341	EXIST::FUNCTION:EC
 ASN1_UNIVERSALSTRING_new                3342	EXIST::FUNCTION:
-EC_PRIVATEKEY_new                       3343	EXIST::FUNCTION:EC
-EC_PRIVATEKEY_it                        3344	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC
-EC_PRIVATEKEY_it                        3344	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC
+EC_PRIVATEKEY_new                       3343	NOEXIST::FUNCTION:
+EC_PRIVATEKEY_it                        3344	NOEXIST::FUNCTION:
+EC_PRIVATEKEY_it                        3344	NOEXIST::FUNCTION:
 DSO_merge                               3345	EXIST::FUNCTION:
-d2i_EC_PRIVATEKEY                       3346	EXIST::FUNCTION:EC
-ECDSA_get_enc_flag                      3347	EXIST::FUNCTION:ECDSA
-ECDSA_set_enc_flag                      3348	EXIST::FUNCTION:ECDSA
-i2d_EC_PRIVATEKEY                       3349	EXIST::FUNCTION:EC
-EC_PRIVATEKEY_free                      3350	EXIST::FUNCTION:EC
+d2i_EC_PRIVATEKEY                       3346	NOEXIST::FUNCTION:
+ECDSA_get_enc_flag                      3347	NOEXIST::FUNCTION:
+ECDSA_set_enc_flag                      3348	NOEXIST::FUNCTION:
+i2d_EC_PRIVATEKEY                       3349	NOEXIST::FUNCTION:
+EC_PRIVATEKEY_free                      3350	NOEXIST::FUNCTION:
 EC_POINT_get_affine_coordinates_GF2m    3351	EXIST::FUNCTION:EC
 BN_GF2m_mod_sqr_arr                     3352	EXIST::FUNCTION:
 EC_GROUP_new_curve_GF2m                 3353	EXIST::FUNCTION:EC
@@ -2940,3 +2940,41 @@ BN_GF2m_mod_exp_arr                     3376	EXIST::FUNCTION:
 BN_GF2m_poly2arr                        3377	EXIST::FUNCTION:
 EC_POINT_dup                            3378	EXIST::FUNCTION:EC
 EC_POINT_set_affine_coordinates_GF2m    3379	EXIST::FUNCTION:EC
+i2d_EC_PUBKEY                           3380	EXIST::FUNCTION:EC
+i2d_ECPrivateKey                        3381	EXIST::FUNCTION:EC
+EC_KEY_free                             3382	EXIST::FUNCTION:EC
+PEM_write_bio_ECPrivateKey              3383	EXIST::FUNCTION:EC
+ECDSA_DATA_new_method                   3384	EXIST::FUNCTION:ECDSA
+i2d_ECPrivateKey_bio                    3385	EXIST::FUNCTION:BIO,EC
+d2i_ECPrivateKey_fp                     3386	EXIST::FUNCTION:EC,FP_API
+EVP_PKEY_get1_EC_KEY                    3387	EXIST::FUNCTION:EC
+ECPublicKey_set_octet_string            3388	EXIST::FUNCTION:EC
+PEM_write_EC_PUBKEY                     3389	EXIST:!WIN16:FUNCTION:EC
+EC_KEY_print_fp                         3390	EXIST::FUNCTION:EC,FP_API
+EC_KEY_new                              3391	EXIST::FUNCTION:EC
+i2d_EC_PUBKEY_bio                       3392	EXIST::FUNCTION:BIO,EC
+ECDSA_DATA_new                          3393	EXIST::FUNCTION:ECDSA
+EVP_PKEY_set1_EC_KEY                    3394	EXIST::FUNCTION:EC
+ECDSA_DATA_free                         3395	EXIST::FUNCTION:ECDSA
+EC_KEY_print                            3396	EXIST::FUNCTION:BIO,EC
+PEM_write_bio_EC_PUBKEY                 3397	EXIST::FUNCTION:EC
+ECParameters_print                      3398	EXIST::FUNCTION:BIO,EC
+d2i_EC_PUBKEY_fp                        3399	EXIST::FUNCTION:EC,FP_API
+PEM_write_ECPrivateKey                  3400	EXIST:!WIN16:FUNCTION:EC
+ecdsa_check                             3401	EXIST::FUNCTION:ECDSA
+PEM_read_ECPrivateKey                   3402	EXIST:!WIN16:FUNCTION:EC
+d2i_ECPrivateKey_bio                    3403	EXIST::FUNCTION:BIO,EC
+ECParameters_print_fp                   3404	EXIST::FUNCTION:EC,FP_API
+i2d_EC_PUBKEY_fp                        3405	EXIST::FUNCTION:EC,FP_API
+i2d_ECPrivateKey_fp                     3406	EXIST::FUNCTION:EC,FP_API
+d2i_EC_PUBKEY                           3407	EXIST::FUNCTION:EC
+d2i_ECPrivateKey                        3408	EXIST::FUNCTION:EC
+d2i_EC_PUBKEY_bio                       3409	EXIST::FUNCTION:BIO,EC
+ECPublicKey_get_octet_string            3410	EXIST::FUNCTION:EC
+PEM_read_EC_PUBKEY                      3411	EXIST:!WIN16:FUNCTION:EC
+PEM_read_bio_EC_PUBKEY                  3412	EXIST::FUNCTION:EC
+PEM_read_bio_ECPrivateKey               3413	EXIST::FUNCTION:EC
+EC_KEY_dup                              3414	EXIST::FUNCTION:EC
+EC_KEY_check_key                        3415	EXIST::FUNCTION:EC
+EC_KEY_generate_key                     3416	EXIST::FUNCTION:EC
+EC_KEY_copy                             3417	EXIST::FUNCTION:EC