[openssl-commits] [openssl] master update

Dr. Stephen Henson steve at openssl.org
Sun Mar 15 15:56:53 UTC 2015


The branch master has been updated
       via  eef53ee50bc6f0a6e74b27b6cfa07df44513074f (commit)
      from  2c3823491d8812560922a58677e3ad2db4b2ec8d (commit)


- Log -----------------------------------------------------------------
commit eef53ee50bc6f0a6e74b27b6cfa07df44513074f
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Mar 14 22:42:55 2015 +0000

    Update ordinals, fix error message.
    
    Update error messages to say "EC is disabled" these can then be picked up
    by mkdef.pl.
    
    Update ordinals.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/ecdh/ecdh.h   |  2 +-
 crypto/ecdsa/ecdsa.h |  2 +-
 util/libeay.num      | 78 ++++++++++++++++++++++++++--------------------------
 util/ssleay.num      |  9 ++++--
 4 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h
index 25ccdc9..8a48b12 100644
--- a/crypto/ecdh/ecdh.h
+++ b/crypto/ecdh/ecdh.h
@@ -72,7 +72,7 @@
 # include <openssl/opensslconf.h>
 
 # ifdef OPENSSL_NO_EC
-#  error ECDH is disabled.
+#  error EC is disabled.
 # endif
 
 # include <openssl/ec.h>
diff --git a/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
index 3876004..f60c229 100644
--- a/crypto/ecdsa/ecdsa.h
+++ b/crypto/ecdsa/ecdsa.h
@@ -62,7 +62,7 @@
 # include <openssl/opensslconf.h>
 
 # ifdef OPENSSL_NO_EC
-#  error ECDSA is disabled.
+#  error EC is disabled.
 # endif
 
 # include <openssl/ec.h>
diff --git a/util/libeay.num b/util/libeay.num
index a991d77..3ad7e1d 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2913,7 +2913,7 @@ STORE_set_method                        3348	NOEXIST::FUNCTION:
 GENERAL_SUBTREE_free                    3349	EXIST::FUNCTION:
 NAME_CONSTRAINTS_it                     3350	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 NAME_CONSTRAINTS_it                     3350	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ECDH_get_default_method                 3351	EXIST::FUNCTION:ECDH
+ECDH_get_default_method                 3351	EXIST::FUNCTION:EC
 PKCS12_add_safe                         3352	EXIST::FUNCTION:
 EC_KEY_new_by_curve_name                3353	EXIST::FUNCTION:EC
 STORE_meth_get_update_store_fn          3354	NOEXIST::FUNCTION:
@@ -2961,7 +2961,7 @@ STORE_get_public_key                    3391	NOEXIST::FUNCTION:
 STORE_modify_arbitrary                  3392	NOEXIST::FUNCTION:
 ENGINE_get_static_state                 3393	EXIST::FUNCTION:ENGINE
 pqueue_iterator                         3394	EXIST::FUNCTION:
-ECDSA_SIG_new                           3395	EXIST::FUNCTION:ECDSA
+ECDSA_SIG_new                           3395	EXIST::FUNCTION:EC
 OPENSSL_DIR_end                         3396	EXIST::FUNCTION:
 BN_GF2m_mod_sqr                         3397	EXIST::FUNCTION:EC2M
 EC_POINT_bn2point                       3398	EXIST::FUNCTION:EC
@@ -2969,7 +2969,7 @@ X509_VERIFY_PARAM_set_depth             3399	EXIST::FUNCTION:
 EC_KEY_set_asn1_flag                    3400	EXIST::FUNCTION:EC
 STORE_get_method                        3401	NOEXIST::FUNCTION:
 EC_KEY_get_key_method_data              3402	EXIST::FUNCTION:EC
-ECDSA_sign_ex                           3403	EXIST::FUNCTION:ECDSA
+ECDSA_sign_ex                           3403	EXIST::FUNCTION:EC
 STORE_parse_attrs_end                   3404	NOEXIST::FUNCTION:
 EC_GROUP_get_point_conversion_form      3405	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_get_point_conv_form            3405	EXIST:VMS:FUNCTION:EC
@@ -2983,7 +2983,7 @@ X509_VERIFY_PARAM_set1_policies         3412	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_name             3413	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_purpose           3414	EXIST::FUNCTION:
 STORE_get_number                        3415	NOEXIST::FUNCTION:
-ECDSA_sign_setup                        3416	EXIST::FUNCTION:ECDSA
+ECDSA_sign_setup                        3416	EXIST::FUNCTION:EC
 BN_GF2m_mod_solve_quad_arr              3417	EXIST::FUNCTION:EC2M
 EC_KEY_up_ref                           3418	EXIST::FUNCTION:EC
 POLICY_MAPPING_free                     3419	EXIST::FUNCTION:
@@ -3008,11 +3008,11 @@ X509_policy_level_node_count            3434	EXIST::FUNCTION:
 STORE_new_engine                        3435	NOEXIST::FUNCTION:
 STORE_list_public_key_start             3436	NOEXIST::FUNCTION:
 X509_VERIFY_PARAM_new                   3437	EXIST::FUNCTION:
-ECDH_get_ex_data                        3438	EXIST::FUNCTION:ECDH
+ECDH_get_ex_data                        3438	EXIST::FUNCTION:EC
 EVP_PKEY_get_attr                       3439	EXIST::FUNCTION:
-ECDSA_do_sign                           3440	EXIST::FUNCTION:ECDSA
+ECDSA_do_sign                           3440	EXIST::FUNCTION:EC
 ENGINE_unregister_ECDH                  3441	EXIST::FUNCTION:ENGINE
-ECDH_OpenSSL                            3442	EXIST::FUNCTION:ECDH
+ECDH_OpenSSL                            3442	EXIST::FUNCTION:EC
 EC_KEY_set_conv_form                    3443	EXIST::FUNCTION:EC
 EC_POINT_dup                            3444	EXIST::FUNCTION:EC
 GENERAL_SUBTREE_new                     3445	EXIST::FUNCTION:
@@ -3026,7 +3026,7 @@ BN_GF2m_mod_sqrt_arr                    3451	EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452	EXIST::FUNCTION:EC
 ECPKParameters_print_fp                 3453	EXIST::FUNCTION:EC,STDIO
 pqueue_find                             3454	EXIST::FUNCTION:
-ECDSA_SIG_free                          3455	EXIST::FUNCTION:ECDSA
+ECDSA_SIG_free                          3455	EXIST::FUNCTION:EC
 PEM_write_bio_ECPKParameters            3456	EXIST::FUNCTION:EC
 STORE_method_set_ctrl_function          3457	NOEXIST::FUNCTION:
 STORE_list_public_key_end               3458	NOEXIST::FUNCTION:
@@ -3084,7 +3084,7 @@ X509_STORE_CTX_get0_param               3505	EXIST::FUNCTION:
 STORE_delete_arbitrary                  3506	NOEXIST::FUNCTION:
 PEM_read_X509_CERT_PAIR                 3507	NOEXIST::FUNCTION:
 X509_STORE_set_depth                    3508	EXIST::FUNCTION:
-ECDSA_get_ex_data                       3509	EXIST::FUNCTION:ECDSA
+ECDSA_get_ex_data                       3509	EXIST::FUNCTION:EC
 SHA224                                  3510	EXIST::FUNCTION:
 BIO_dump_indent_fp                      3511	EXIST::FUNCTION:STDIO
 EC_KEY_set_group                        3512	EXIST::FUNCTION:EC
@@ -3097,7 +3097,7 @@ ERR_load_STORE_strings                  3518	NOEXIST::FUNCTION:
 PEM_read_bio_EC_PUBKEY                  3519	EXIST::FUNCTION:EC
 STORE_list_private_key_end              3520	NOEXIST::FUNCTION:
 i2d_EC_PUBKEY                           3521	EXIST::FUNCTION:EC
-ECDSA_get_default_method                3522	EXIST::FUNCTION:ECDSA
+ECDSA_get_default_method                3522	EXIST::FUNCTION:EC
 ASN1_put_eoc                            3523	EXIST::FUNCTION:
 X509_STORE_CTX_get_explicit_policy      3524	EXIST:!VMS:FUNCTION:
 X509_STORE_CTX_get_expl_policy          3524	EXIST:VMS:FUNCTION:
@@ -3128,7 +3128,7 @@ EC_GROUP_set_curve_GF2m                 3545	EXIST::FUNCTION:EC,EC2M
 ENGINE_set_default_ECDSA                3546	EXIST::FUNCTION:ENGINE
 POLICY_CONSTRAINTS_new                  3547	EXIST::FUNCTION:
 BN_GF2m_mod_sqrt                        3548	EXIST::FUNCTION:EC2M
-ECDH_set_default_method                 3549	EXIST::FUNCTION:ECDH
+ECDH_set_default_method                 3549	EXIST::FUNCTION:EC
 EC_KEY_generate_key                     3550	EXIST::FUNCTION:EC
 SHA384_Update                           3551	EXIST:!VMSVAX:FUNCTION:
 BN_GF2m_arr2poly                        3552	EXIST::FUNCTION:EC2M
@@ -3173,7 +3173,7 @@ BIO_dgram_non_fatal_error               3586	EXIST::FUNCTION:
 EC_GROUP_get_asn1_flag                  3587	EXIST::FUNCTION:EC
 STORE_ATTR_INFO_in_ex                   3588	NOEXIST::FUNCTION:
 STORE_list_crl_start                    3589	NOEXIST::FUNCTION:
-ECDH_get_ex_new_index                   3590	EXIST::FUNCTION:ECDH
+ECDH_get_ex_new_index                   3590	EXIST::FUNCTION:EC
 STORE_meth_get_modify_fn                3591	NOEXIST::FUNCTION:
 STORE_method_get_modify_function        3591	NOEXIST::FUNCTION:
 v2i_ASN1_BIT_STRING                     3592	EXIST::FUNCTION:
@@ -3197,22 +3197,22 @@ ECPKParameters_print                    3607	EXIST::FUNCTION:EC
 EC_KEY_get0_private_key                 3608	EXIST::FUNCTION:EC
 PEM_write_EC_PUBKEY                     3609	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_set1                  3610	EXIST::FUNCTION:
-ECDH_set_method                         3611	EXIST::FUNCTION:ECDH
+ECDH_set_method                         3611	EXIST::FUNCTION:EC
 v2i_GENERAL_NAME_ex                     3612	EXIST::FUNCTION:
-ECDH_set_ex_data                        3613	EXIST::FUNCTION:ECDH
+ECDH_set_ex_data                        3613	EXIST::FUNCTION:EC
 STORE_generate_key                      3614	NOEXIST::FUNCTION:
 BN_nist_mod_521                         3615	EXIST::FUNCTION:
 X509_policy_tree_get0_level             3616	EXIST::FUNCTION:
 EC_GROUP_set_point_conversion_form      3617	EXIST:!VMS:FUNCTION:EC
 EC_GROUP_set_point_conv_form            3617	EXIST:VMS:FUNCTION:EC
 PEM_read_EC_PUBKEY                      3618	EXIST::FUNCTION:EC
-i2d_ECDSA_SIG                           3619	EXIST::FUNCTION:ECDSA
-ECDSA_OpenSSL                           3620	EXIST::FUNCTION:ECDSA
+i2d_ECDSA_SIG                           3619	EXIST::FUNCTION:EC
+ECDSA_OpenSSL                           3620	EXIST::FUNCTION:EC
 STORE_delete_crl                        3621	NOEXIST::FUNCTION:
 EC_KEY_get_enc_flags                    3622	EXIST::FUNCTION:EC
 ASN1_const_check_infinite_end           3623	EXIST::FUNCTION:
 EVP_PKEY_delete_attr                    3624	EXIST::FUNCTION:
-ECDSA_set_default_method                3625	EXIST::FUNCTION:ECDSA
+ECDSA_set_default_method                3625	EXIST::FUNCTION:EC
 EC_POINT_set_compressed_coordinates_GF2m 3626	EXIST:!VMS:FUNCTION:EC,EC2M
 EC_POINT_set_compr_coords_GF2m          3626	EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_cmp                            3627	EXIST::FUNCTION:EC
@@ -3225,7 +3225,7 @@ PEM_read_ECPrivateKey                   3632	EXIST::FUNCTION:EC
 SHA512_Init                             3633	EXIST:!VMSVAX:FUNCTION:
 STORE_parse_attrs_endp                  3634	NOEXIST::FUNCTION:
 BN_set_negative                         3635	EXIST::FUNCTION:
-ERR_load_ECDSA_strings                  3636	EXIST::FUNCTION:ECDSA
+ERR_load_ECDSA_strings                  3636	EXIST::FUNCTION:EC
 EC_GROUP_get_basis_type                 3637	EXIST::FUNCTION:EC
 STORE_list_public_key_next              3638	NOEXIST::FUNCTION:
 i2v_ASN1_BIT_STRING                     3639	EXIST::FUNCTION:
@@ -3233,7 +3233,7 @@ STORE_OBJECT_free                       3640	NOEXIST::FUNCTION:
 BN_nist_mod_384                         3641	EXIST::FUNCTION:
 i2d_X509_CERT_PAIR                      3642	NOEXIST::FUNCTION:
 PEM_write_ECPKParameters                3643	EXIST::FUNCTION:EC
-ECDH_compute_key                        3644	EXIST::FUNCTION:ECDH
+ECDH_compute_key                        3644	EXIST::FUNCTION:EC
 STORE_ATTR_INFO_get0_sha1str            3645	NOEXIST::FUNCTION:
 ENGINE_register_all_ECDH                3646	EXIST::FUNCTION:ENGINE
 pqueue_pop                              3647	EXIST::FUNCTION:
@@ -3258,13 +3258,13 @@ ENGINE_get_default_ECDSA                3662	EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3663	EXIST::FUNCTION:EC
 SHA256_Transform                        3664	EXIST::FUNCTION:
 EC_KEY_set_enc_flags                    3665	EXIST::FUNCTION:EC
-ECDSA_verify                            3666	EXIST::FUNCTION:ECDSA
+ECDSA_verify                            3666	EXIST::FUNCTION:EC
 EC_POINT_point2hex                      3667	EXIST::FUNCTION:EC
 ENGINE_get_STORE                        3668	EXIST::FUNCTION:ENGINE
 SHA512                                  3669	EXIST:!VMSVAX:FUNCTION:
 STORE_get_certificate                   3670	NOEXIST::FUNCTION:
-ECDSA_do_sign_ex                        3671	EXIST::FUNCTION:ECDSA
-ECDSA_do_verify                         3672	EXIST::FUNCTION:ECDSA
+ECDSA_do_sign_ex                        3671	EXIST::FUNCTION:EC
+ECDSA_do_verify                         3672	EXIST::FUNCTION:EC
 d2i_ECPrivateKey_fp                     3673	EXIST::FUNCTION:EC,STDIO
 STORE_delete_certificate                3674	NOEXIST::FUNCTION:
 SHA512_Transform                        3675	EXIST:!VMSVAX:FUNCTION:
@@ -3301,7 +3301,7 @@ BN_nist_mod_256                         3702	EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_table            3703	EXIST::FUNCTION:
 pqueue_free                             3704	EXIST::FUNCTION:
 BN_BLINDING_create_param                3705	EXIST::FUNCTION:
-ECDSA_size                              3706	EXIST::FUNCTION:ECDSA
+ECDSA_size                              3706	EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_bio                       3707	EXIST::FUNCTION:EC
 BN_get0_nist_prime_521                  3708	EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_sha1str          3709	NOEXIST::FUNCTION:
@@ -3313,9 +3313,9 @@ PEM_read_bio_ECPrivateKey               3714	EXIST::FUNCTION:EC
 STORE_meth_get_cleanup_fn               3715	NOEXIST::FUNCTION:
 STORE_method_get_cleanup_function       3715	NOEXIST::FUNCTION:
 ENGINE_get_ECDH                         3716	EXIST::FUNCTION:ENGINE
-d2i_ECDSA_SIG                           3717	EXIST::FUNCTION:ECDSA
+d2i_ECDSA_SIG                           3717	EXIST::FUNCTION:EC
 BN_is_prime_fasttest_ex                 3718	EXIST::FUNCTION:
-ECDSA_sign                              3719	EXIST::FUNCTION:ECDSA
+ECDSA_sign                              3719	EXIST::FUNCTION:EC
 X509_policy_check                       3720	EXIST::FUNCTION:
 EVP_PKEY_get_attr_by_NID                3721	EXIST::FUNCTION:
 STORE_set_ex_data                       3722	NOEXIST::FUNCTION:
@@ -3324,10 +3324,10 @@ EVP_ecdsa                               3724	EXIST::FUNCTION:
 BN_BLINDING_get_flags                   3725	EXIST::FUNCTION:
 PKCS12_add_cert                         3726	EXIST::FUNCTION:
 STORE_OBJECT_new                        3727	NOEXIST::FUNCTION:
-ERR_load_ECDH_strings                   3728	EXIST::FUNCTION:ECDH
+ERR_load_ECDH_strings                   3728	EXIST::FUNCTION:EC
 EC_KEY_dup                              3729	EXIST::FUNCTION:EC
 EVP_CIPHER_CTX_rand_key                 3730	EXIST::FUNCTION:
-ECDSA_set_method                        3731	EXIST::FUNCTION:ECDSA
+ECDSA_set_method                        3731	EXIST::FUNCTION:EC
 a2i_IPADDRESS_NC                        3732	EXIST::FUNCTION:
 d2i_ECParameters                        3733	EXIST::FUNCTION:EC
 STORE_list_certificate_end              3734	NOEXIST::FUNCTION:
@@ -3335,13 +3335,13 @@ STORE_get_crl                           3735	NOEXIST::FUNCTION:
 X509_POLICY_NODE_print                  3736	EXIST::FUNCTION:
 SHA384_Init                             3737	EXIST:!VMSVAX:FUNCTION:
 EC_GF2m_simple_method                   3738	EXIST::FUNCTION:EC,EC2M
-ECDSA_set_ex_data                       3739	EXIST::FUNCTION:ECDSA
+ECDSA_set_ex_data                       3739	EXIST::FUNCTION:EC
 SHA384_Final                            3740	EXIST:!VMSVAX:FUNCTION:
 PKCS7_set_digest                        3741	EXIST::FUNCTION:
 EC_KEY_print                            3742	EXIST::FUNCTION:EC
 STORE_meth_set_lock_store_fn            3743	NOEXIST::FUNCTION:
 STORE_method_set_lock_store_function    3743	NOEXIST::FUNCTION:
-ECDSA_get_ex_new_index                  3744	EXIST::FUNCTION:ECDSA
+ECDSA_get_ex_new_index                  3744	EXIST::FUNCTION:EC
 SHA384                                  3745	EXIST:!VMSVAX:FUNCTION:
 POLICY_MAPPING_new                      3746	EXIST::FUNCTION:
 STORE_list_certificate_endp             3747	NOEXIST::FUNCTION:
@@ -4354,18 +4354,18 @@ EVP_aes_256_wrap                        4719	EXIST::FUNCTION:AES
 CRYPTO_128_wrap                         4720	EXIST::FUNCTION:
 RSA_OAEP_PARAMS_new                     4721	EXIST::FUNCTION:RSA
 CRYPTO_128_unwrap                       4722	EXIST::FUNCTION:
-ECDSA_METHOD_set_name                   4723	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_name                   4723	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_decrypt          4724	EXIST::FUNCTION:CMS
 CMS_SignerInfo_get0_pkey_ctx            4725	EXIST::FUNCTION:CMS
-ECDSA_METHOD_set_flags                  4726	EXIST::FUNCTION:ECDSA
-ECDSA_METHOD_set_sign_setup             4727	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_flags                  4726	EXIST::FUNCTION:EC
+ECDSA_METHOD_set_sign_setup             4727	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_orig_id_cmp      4728	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_orig_id_cmp          4728	EXIST:VMS:FUNCTION:CMS
 CMS_RecipientInfo_kari_get0_alg         4729	EXIST::FUNCTION:CMS
 EVP_aes_192_wrap                        4730	EXIST::FUNCTION:AES
 EVP_aes_128_cbc_hmac_sha256             4731	EXIST::FUNCTION:AES
 DH_compute_key_padded                   4732	EXIST::FUNCTION:DH
-ECDSA_METHOD_set_sign                   4733	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_sign                   4733	EXIST::FUNCTION:EC
 CMS_RecipientEncryptedKey_cert_cmp      4734	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipEncryptedKey_cert_cmp          4734	EXIST:VMS:FUNCTION:CMS
 DH_KDF_X9_42                            4735	EXIST::FUNCTION:DH
@@ -4385,21 +4385,21 @@ CMS_RecipientInfo_kari_set0_pkey        4746	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_set0_pkey            4746	EXIST:VMS:FUNCTION:CMS
 i2d_RSA_OAEP_PARAMS                     4747	EXIST::FUNCTION:RSA
 d2i_RSA_OAEP_PARAMS                     4748	EXIST::FUNCTION:RSA
-ECDH_KDF_X9_62                          4749	EXIST::FUNCTION:ECDH
+ECDH_KDF_X9_62                          4749	EXIST::FUNCTION:EC
 CMS_RecipientInfo_kari_get0_ctx         4750	EXIST::FUNCTION:CMS
-ECDSA_METHOD_new                        4751	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_new                        4751	EXIST::FUNCTION:EC
 CMS_RecipientInfo_get0_pkey_ctx         4752	EXIST::FUNCTION:CMS
 CMS_RecipientEncryptedKey_get0_id       4753	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipEncryptedKey_get0_id           4753	EXIST:VMS:FUNCTION:CMS
 RSA_pad_check_PKCS1_OAEP_mgf1           4754	NOEXIST::FUNCTION:
 RSA_padding_check_PKCS1_OAEP_mgf1       4754	EXIST:!VMS:FUNCTION:RSA
 RSA_padding_chk_PKCS1_OAEP_mgf1         4754	EXIST:VMS:FUNCTION:RSA
-ECDSA_METHOD_set_verify                 4755	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_verify                 4755	EXIST::FUNCTION:EC
 CMS_SharedInfo_encode                   4756	EXIST::FUNCTION:CMS
 RSA_padding_add_PKCS1_OAEP_mgf1         4757	EXIST::FUNCTION:RSA
 CMS_RecipientInfo_kari_get0_orig_id     4758	EXIST:!VMS:FUNCTION:CMS
 CMS_RecipInfo_kari_get0_orig_id         4758	EXIST:VMS:FUNCTION:CMS
-ECDSA_METHOD_free                       4759	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_free                       4759	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_get_count             4760	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0_name             4761	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0                  4762	EXIST::FUNCTION:
@@ -4408,9 +4408,9 @@ BIO_hex_string                          4764	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_hostflags         4765	EXIST::FUNCTION:
 BUF_strnlen                             4766	EXIST::FUNCTION:
 X509_VERIFY_PARAM_get0_peername         4767	EXIST::FUNCTION:
-ECDSA_METHOD_set_app_data               4768	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_set_app_data               4768	EXIST::FUNCTION:EC
 sk_deep_copy                            4769	EXIST::FUNCTION:
-ECDSA_METHOD_get_app_data               4770	EXIST::FUNCTION:ECDSA
+ECDSA_METHOD_get_app_data               4770	EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_add1_host             4771	EXIST::FUNCTION:
 EC_GROUP_get_mont_data                  4772	EXIST::FUNCTION:EC
 i2d_re_X509_tbs                         4773	EXIST::FUNCTION:
diff --git a/util/ssleay.num b/util/ssleay.num
index 916318a..7ea4a8a 100755
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -217,8 +217,8 @@ SSL_renegotiate_pending                 265	EXIST::FUNCTION:
 SSL_CTX_set_msg_callback                266	EXIST::FUNCTION:
 SSL_set_msg_callback                    267	EXIST::FUNCTION:
 DTLSv1_client_method                    268	EXIST::FUNCTION:
-SSL_CTX_set_tmp_ecdh_callback           269	EXIST::FUNCTION:ECDH
-SSL_set_tmp_ecdh_callback               270	EXIST::FUNCTION:ECDH
+SSL_CTX_set_tmp_ecdh_callback           269	EXIST::FUNCTION:EC
+SSL_set_tmp_ecdh_callback               270	EXIST::FUNCTION:EC
 SSL_COMP_get_name                       271	EXIST::FUNCTION:COMP
 SSL_get_current_compression             272	EXIST::FUNCTION:COMP
 DTLSv1_method                           273	EXIST::FUNCTION:
@@ -388,3 +388,8 @@ SSL_CTX_set0_security_ex_data           422	EXIST::FUNCTION:
 SSL_set_security_callback               423	EXIST::FUNCTION:
 SSL_CTX_get_security_level              424	EXIST::FUNCTION:
 SSL_CTX_get0_security_ex_data           425	EXIST::FUNCTION:
+SSL_SESSION_has_ticket                  426	EXIST::FUNCTION:
+SSL_set_wbio                            427	EXIST::FUNCTION:
+SSL_SESSION_get0_ticket                 428	EXIST::FUNCTION:
+SSL_SESSION_get_ticket_lifetime_hint    429	EXIST::FUNCTION:
+SSL_set_rbio                            430	EXIST::FUNCTION:


More information about the openssl-commits mailing list