Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC

[openssl.git] / util / libeay.num

diff --git a/util/libeay.num b/util/libeay.num
index 9920db1c77301924adc2ad62ac6c27e385c308d4..a991d77b92c8651cadf063ebc08d08415d444042 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -795,8 +795,8 @@ DES_random_key                          802 EXIST::FUNCTION:DES
 _ossl_old_des_random_seed               803    NOEXIST::FUNCTION:
 _ossl_old_des_read_2passwords           804    NOEXIST::FUNCTION:
 _ossl_old_des_read_password             805    NOEXIST::FUNCTION:
-_ossl_old_des_read_pw                   806    EXIST::FUNCTION:
-_ossl_old_des_read_pw_string            807    EXIST::FUNCTION:
+_ossl_old_des_read_pw                   806    NOEXIST::FUNCTION:
+_ossl_old_des_read_pw_string            807    NOEXIST::FUNCTION:
 DES_set_key                             808    EXIST::FUNCTION:DES
 DES_set_odd_parity                      809    EXIST::FUNCTION:DES
 DES_string_to_2keys                     810    EXIST::FUNCTION:DES
@@ -942,10 +942,10 @@ X509_load_crl_file                      958       EXIST::FUNCTION:STDIO
 EVP_rc2_40_cbc                          959    EXIST::FUNCTION:RC2
 EVP_rc4_40                              960    EXIST::FUNCTION:RC4
 EVP_CIPHER_CTX_init                     961    EXIST::FUNCTION:
-HMAC                                    962    EXIST::FUNCTION:HMAC
-HMAC_Init                               963    EXIST::FUNCTION:HMAC
-HMAC_Update                             964    EXIST::FUNCTION:HMAC
-HMAC_Final                              965    EXIST::FUNCTION:HMAC
+HMAC                                    962    EXIST::FUNCTION:
+HMAC_Init                               963    EXIST::FUNCTION:DEPRECATED
+HMAC_Update                             964    EXIST::FUNCTION:
+HMAC_Final                              965    EXIST::FUNCTION:
 ERR_get_next_error_library              966    EXIST::FUNCTION:
 EVP_PKEY_cmp_parameters                 967    EXIST::FUNCTION:
 HMAC_cleanup                            968    NOEXIST::FUNCTION:
@@ -1806,6 +1806,7 @@ d2i_ASN1_SET_OF_PKCS12_SAFEBAG          2341      NOEXIST::FUNCTION:
 ASN1_UTCTIME_get                        2350   NOEXIST::FUNCTION:
 X509_REQ_digest                         2362   EXIST::FUNCTION:
 X509_CRL_digest                         2391   EXIST::FUNCTION:
+ASN1_STRING_clear_free                  2392   EXIST::FUNCTION:
 d2i_ASN1_SET_OF_PKCS7                   2397   NOEXIST::FUNCTION:
 X509_ALGOR_cmp                          2398   EXIST::FUNCTION:
 EVP_CIPHER_CTX_set_key_length           2399   EXIST::FUNCTION:
@@ -1998,7 +1999,7 @@ EC_GROUP_method_of                      2568      EXIST::FUNCTION:EC
 i2d_KRB5_APREQ                          2569   EXIST::FUNCTION:
 _ossl_old_des_encrypt                   2570   NOEXIST::FUNCTION:
 ASN1_PRINTABLE_new                      2571   EXIST::FUNCTION:
-HMAC_Init_ex                            2572   EXIST::FUNCTION:HMAC
+HMAC_Init_ex                            2572   EXIST::FUNCTION:
 d2i_KRB5_AUTHENT                        2573   EXIST::FUNCTION:
 OCSP_archive_cutoff_new                 2574   EXIST::FUNCTION:
 EC_POINT_set_Jprojective_coordinates_GFp 2575  EXIST:!VMS:FUNCTION:EC
@@ -2206,7 +2207,7 @@ OBJ_NAME_do_all_sorted                  2743      EXIST::FUNCTION:
 i2d_OCSP_BASICRESP                      2744   EXIST::FUNCTION:
 i2d_OCSP_RESPBYTES                      2745   EXIST::FUNCTION:
 PKCS12_unpack_p7encdata                 2746   EXIST::FUNCTION:
-HMAC_CTX_init                           2747   EXIST::FUNCTION:HMAC
+HMAC_CTX_init                           2747   EXIST::FUNCTION:
 ENGINE_get_digest                       2748   EXIST::FUNCTION:ENGINE
 OCSP_RESPONSE_print                     2749   EXIST::FUNCTION:
 KRB5_TKTBODY_it                         2750   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2255,7 +2256,7 @@ CRYPTO_get_locked_mem_ex_functions      2781      EXIST:!VMS:FUNCTION:
 CRYPTO_get_locked_mem_ex_funcs          2781   EXIST:VMS:FUNCTION:
 ASN1_TIME_check                         2782   EXIST::FUNCTION:
 UI_get0_user_data                       2783   EXIST::FUNCTION:
-HMAC_CTX_cleanup                        2784   EXIST::FUNCTION:HMAC
+HMAC_CTX_cleanup                        2784   EXIST::FUNCTION:
 DSA_up_ref                              2785   EXIST::FUNCTION:DSA
 _ossl_odes_ede3_cfb64_encrypt           2786   NOEXIST::FUNCTION:
 _ossl_old_des_ede3_cfb64_encrypt        2786   NOEXIST::FUNCTION:
@@ -2844,7 +2845,7 @@ FIPS_selftest_failed                    3284      NOEXIST::FUNCTION:
 sk_is_sorted                            3285   EXIST::FUNCTION:
 X509_check_ca                           3286   EXIST::FUNCTION:
 private_idea_set_encrypt_key            3287   NOEXIST::FUNCTION:
-HMAC_CTX_set_flags                      3288   EXIST::FUNCTION:HMAC
+HMAC_CTX_set_flags                      3288   EXIST::FUNCTION:
 private_SHA_Init                        3289   NOEXIST::FUNCTION:
 private_CAST_set_key                    3290   NOEXIST::FUNCTION:
 private_RIPEMD160_Init                  3291   NOEXIST::FUNCTION:
@@ -3001,7 +3002,7 @@ pqueue_print                            3428      EXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429   EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430   EXIST::FUNCTION:EC,STDIO
 BN_GF2m_mod_arr                         3431   EXIST::FUNCTION:EC2M
-PEM_write_bio_X509_CERT_PAIR            3432   EXIST::FUNCTION:
+PEM_write_bio_X509_CERT_PAIR            3432   NOEXIST::FUNCTION:
 EVP_PKEY_cmp                            3433   EXIST::FUNCTION:
 X509_policy_level_node_count            3434   EXIST::FUNCTION:
 STORE_new_engine                        3435   NOEXIST::FUNCTION:
@@ -3081,7 +3082,7 @@ BN_is_prime_ex                          3503      EXIST::FUNCTION:
 STORE_revoke_public_key                 3504   NOEXIST::FUNCTION:
 X509_STORE_CTX_get0_param               3505   EXIST::FUNCTION:
 STORE_delete_arbitrary                  3506   NOEXIST::FUNCTION:
-PEM_read_X509_CERT_PAIR                 3507   EXIST::FUNCTION:
+PEM_read_X509_CERT_PAIR                 3507   NOEXIST::FUNCTION:
 X509_STORE_set_depth                    3508   EXIST::FUNCTION:
 ECDSA_get_ex_data                       3509   EXIST::FUNCTION:ECDSA
 SHA224                                  3510   EXIST::FUNCTION:
@@ -3110,8 +3111,8 @@ STORE_method_set_modify_function        3530      NOEXIST::FUNCTION:
 STORE_parse_attrs_next                  3531   NOEXIST::FUNCTION:
 ENGINE_load_padlock                     3532   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 EC_GROUP_set_curve_name                 3533   EXIST::FUNCTION:EC
-X509_CERT_PAIR_it                       3534   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CERT_PAIR_it                       3534   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CERT_PAIR_it                       3534   NOEXIST::FUNCTION:
+X509_CERT_PAIR_it                       3534   NOEXIST::FUNCTION:
 STORE_meth_get_revoke_fn                3535   NOEXIST::FUNCTION:
 STORE_method_get_revoke_function        3535   NOEXIST::FUNCTION:
 STORE_method_set_get_function           3536   NOEXIST::FUNCTION:
@@ -3159,7 +3160,7 @@ BN_GF2m_add                             3574      EXIST::FUNCTION:EC2M
 EC_KEY_get0_group                       3575   EXIST::FUNCTION:EC
 STORE_generate_crl                      3576   NOEXIST::FUNCTION:
 STORE_store_public_key                  3577   NOEXIST::FUNCTION:
-X509_CERT_PAIR_free                     3578   EXIST::FUNCTION:
+X509_CERT_PAIR_free                     3578   NOEXIST::FUNCTION:
 STORE_revoke_private_key                3579   NOEXIST::FUNCTION:
 BN_nist_mod_224                         3580   EXIST::FUNCTION:
 SHA512_Final                            3581   EXIST:!VMSVAX:FUNCTION:
@@ -3230,7 +3231,7 @@ STORE_list_public_key_next              3638      NOEXIST::FUNCTION:
 i2v_ASN1_BIT_STRING                     3639   EXIST::FUNCTION:
 STORE_OBJECT_free                       3640   NOEXIST::FUNCTION:
 BN_nist_mod_384                         3641   EXIST::FUNCTION:
-i2d_X509_CERT_PAIR                      3642   EXIST::FUNCTION:
+i2d_X509_CERT_PAIR                      3642   NOEXIST::FUNCTION:
 PEM_write_ECPKParameters                3643   EXIST::FUNCTION:EC
 ECDH_compute_key                        3644   EXIST::FUNCTION:ECDH
 STORE_ATTR_INFO_get0_sha1str            3645   NOEXIST::FUNCTION:
@@ -3276,7 +3277,7 @@ STORE_method_get_unlock_store_function  3680      NOEXIST::FUNCTION:
 STORE_get_ex_data                       3681   NOEXIST::FUNCTION:
 EC_KEY_set_public_key                   3682   EXIST::FUNCTION:EC
 PEM_read_ECPKParameters                 3683   EXIST::FUNCTION:EC
-X509_CERT_PAIR_new                      3684   EXIST::FUNCTION:
+X509_CERT_PAIR_new                      3684   NOEXIST::FUNCTION:
 ENGINE_register_STORE                   3685   EXIST::FUNCTION:ENGINE
 RSA_generate_key_ex                     3686   EXIST::FUNCTION:RSA
 DSA_generate_parameters_ex              3687   EXIST::FUNCTION:DSA
@@ -3290,9 +3291,9 @@ POLICY_MAPPINGS_it                      3693      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 GENERAL_SUBTREE_it                      3694   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 GENERAL_SUBTREE_it                      3694   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EC_GROUP_get_curve_name                 3695   EXIST::FUNCTION:EC
-PEM_write_X509_CERT_PAIR                3696   EXIST::FUNCTION:
+PEM_write_X509_CERT_PAIR                3696   NOEXIST::FUNCTION:
 BIO_dump_indent_cb                      3697   EXIST::FUNCTION:
-d2i_X509_CERT_PAIR                      3698   EXIST::FUNCTION:
+d2i_X509_CERT_PAIR                      3698   NOEXIST::FUNCTION:
 STORE_list_private_key_endp             3699   NOEXIST::FUNCTION:
 asn1_const_Finish                       3700   EXIST::FUNCTION:
 i2d_EC_PUBKEY_fp                        3701   EXIST::FUNCTION:EC,STDIO
@@ -3349,7 +3350,7 @@ EC_GROUP_set_asn1_flag                  3749      EXIST::FUNCTION:EC
 EC_KEY_check_key                        3750   EXIST::FUNCTION:EC
 d2i_EC_PUBKEY_fp                        3751   EXIST::FUNCTION:EC,STDIO
 PKCS7_set0_type_other                   3752   EXIST::FUNCTION:
-PEM_read_bio_X509_CERT_PAIR             3753   EXIST::FUNCTION:
+PEM_read_bio_X509_CERT_PAIR             3753   NOEXIST::FUNCTION:
 pqueue_next                             3754   EXIST::FUNCTION:
 STORE_meth_get_list_end_fn              3755   NOEXIST::FUNCTION:
 STORE_method_get_list_end_function      3755   NOEXIST::FUNCTION:
@@ -3958,7 +3959,7 @@ d2i_TS_TST_INFO_bio                     4336      EXIST::FUNCTION:
 TS_TST_INFO_get_ordering                4337   EXIST::FUNCTION:
 TS_RESP_print_bio                       4338   EXIST::FUNCTION:
 TS_TST_INFO_get_exts                    4339   EXIST::FUNCTION:
-HMAC_CTX_copy                           4340   EXIST::FUNCTION:HMAC
+HMAC_CTX_copy                           4340   EXIST::FUNCTION:
 PKCS5_pbe2_set_iv                       4341   EXIST::FUNCTION:
 ENGINE_get_pkey_asn1_meths              4342   EXIST::FUNCTION:ENGINE
 b2i_PrivateKey                          4343   EXIST::FUNCTION:
@@ -4545,3 +4546,7 @@ BN_GENCB_get_arg                        4904      EXIST::FUNCTION:
 BN_zero_ex                              4905   EXIST::FUNCTION:
 BN_is_odd                               4906   EXIST::FUNCTION:
 BN_set_flags                            4907   EXIST::FUNCTION:
+EVP_camellia_128_ctr                    4908   EXIST::FUNCTION:CAMELLIA
+EVP_camellia_256_ctr                    4909   EXIST::FUNCTION:CAMELLIA
+EVP_camellia_192_ctr                    4910   EXIST::FUNCTION:CAMELLIA
+OCSP_resp_get0_signature                4911   EXIST::FUNCTION: