Update defs.

diff --git a/util/libeay.num b/util/libeay.num
index 62664f3c37457168a47a36f2f314111228e7ce49..a9ff5079c5954f5ad0a10d8a02f36b211a2260da 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2804,12 +2804,12 @@ OPENSSL_cleanse                         3245    EXIST::FUNCTION:
 ENGINE_setup_bsd_cryptodev              3246   EXIST:__FreeBSD__:FUNCTION:ENGINE
 ERR_release_err_state_table             3247   EXIST::FUNCTION:LHASH
 EVP_aes_128_cfb8                        3248   EXIST::FUNCTION:AES
-FIPS_corrupt_rsa                        3249   NOEXIST::FUNCTION:
-FIPS_selftest_des                       3250   NOEXIST::FUNCTION:
+FIPS_corrupt_rsa                        3249   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_des                       3250   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_aes_128_cfb1                        3251   EXIST::FUNCTION:AES
 EVP_aes_192_cfb8                        3252   EXIST::FUNCTION:AES
-FIPS_mode_set                           3253   NOEXIST::FUNCTION:
-FIPS_selftest_dsa                       3254   NOEXIST::FUNCTION:
+FIPS_mode_set                           3253   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_dsa                       3254   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_aes_256_cfb8                        3255   EXIST::FUNCTION:AES
 FIPS_allow_md5                          3256   NOEXIST::FUNCTION:
 DES_ede3_cfb_encrypt                    3257   EXIST::FUNCTION:DES
@@ -2817,44 +2817,44 @@ EVP_des_ede3_cfb8                       3258    EXIST::FUNCTION:DES
 FIPS_rand_seeded                        3259   NOEXIST::FUNCTION:
 AES_cfbr_encrypt_block                  3260   EXIST::FUNCTION:AES
 AES_cfb8_encrypt                        3261   EXIST::FUNCTION:AES
-FIPS_rand_seed                          3262   NOEXIST::FUNCTION:
-FIPS_corrupt_des                        3263   NOEXIST::FUNCTION:
+FIPS_rand_seed                          3262   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_des                        3263   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_aes_192_cfb1                        3264   EXIST::FUNCTION:AES
-FIPS_selftest_aes                       3265   NOEXIST::FUNCTION:
+FIPS_selftest_aes                       3265   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_set_prng_key                       3266   NOEXIST::FUNCTION:
 EVP_des_cfb8                            3267   EXIST::FUNCTION:DES
-FIPS_corrupt_dsa                        3268   NOEXIST::FUNCTION:
+FIPS_corrupt_dsa                        3268   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_test_mode                          3269   NOEXIST::FUNCTION:
-FIPS_rand_method                        3270   NOEXIST::FUNCTION:
+FIPS_rand_method                        3270   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_aes_256_cfb1                        3271   EXIST::FUNCTION:AES
-ERR_load_FIPS_strings                   3272   NOEXIST::FUNCTION:
-FIPS_corrupt_aes                        3273   NOEXIST::FUNCTION:
-FIPS_selftest_sha1                      3274   NOEXIST::FUNCTION:
-FIPS_selftest_rsa                       3275   NOEXIST::FUNCTION:
-FIPS_corrupt_sha1                       3276   NOEXIST::FUNCTION:
+ERR_load_FIPS_strings                   3272   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_aes                        3273   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_sha1                      3274   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_rsa                       3275   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_sha1                       3276   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_des_cfb1                            3277   EXIST::FUNCTION:DES
 FIPS_dsa_check                          3278   NOEXIST::FUNCTION:
 AES_cfb1_encrypt                        3279   EXIST::FUNCTION:AES
 EVP_des_ede3_cfb1                       3280   EXIST::FUNCTION:DES
-FIPS_rand_check                         3281   NOEXIST::FUNCTION:
+FIPS_rand_check                         3281   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_md5_allowed                        3282   NOEXIST::FUNCTION:
-FIPS_mode                               3283   NOEXIST::FUNCTION:
-FIPS_selftest_failed                    3284   NOEXIST::FUNCTION:
+FIPS_mode                               3283   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_selftest_failed                    3284   EXIST:OPENSSL_FIPS:FUNCTION:
 sk_is_sorted                            3285   EXIST::FUNCTION:
 X509_check_ca                           3286   EXIST::FUNCTION:
-private_idea_set_encrypt_key            3287   NOEXIST::FUNCTION:
+private_idea_set_encrypt_key            3287   EXIST:OPENSSL_FIPS:FUNCTION:IDEA
 HMAC_CTX_set_flags                      3288   EXIST::FUNCTION:HMAC
-private_SHA_Init                        3289   NOEXIST::FUNCTION:
-private_CAST_set_key                    3290   NOEXIST::FUNCTION:
-private_RIPEMD160_Init                  3291   NOEXIST::FUNCTION:
-private_RC5_32_set_key                  3292   NOEXIST::FUNCTION:
-private_MD5_Init                        3293   NOEXIST::FUNCTION:
-private_RC4_set_key                     3294   NOEXIST::FUNCTION:
-private_MDC2_Init                       3295   NOEXIST::FUNCTION:
-private_RC2_set_key                     3296   NOEXIST::FUNCTION:
-private_MD4_Init                        3297   NOEXIST::FUNCTION:
-private_BF_set_key                      3298   NOEXIST::FUNCTION:
-private_MD2_Init                        3299   NOEXIST::FUNCTION:
+private_SHA_Init                        3289   EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
+private_CAST_set_key                    3290   EXIST:OPENSSL_FIPS:FUNCTION:CAST
+private_RIPEMD160_Init                  3291   EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
+private_RC5_32_set_key                  3292   EXIST:OPENSSL_FIPS:FUNCTION:RC5
+private_MD5_Init                        3293   EXIST:OPENSSL_FIPS:FUNCTION:MD5
+private_RC4_set_key                     3294   EXIST:OPENSSL_FIPS:FUNCTION:RC4
+private_MDC2_Init                       3295   EXIST:OPENSSL_FIPS:FUNCTION:MDC2
+private_RC2_set_key                     3296   EXIST:OPENSSL_FIPS:FUNCTION:RC2
+private_MD4_Init                        3297   EXIST:OPENSSL_FIPS:FUNCTION:MD4
+private_BF_set_key                      3298   EXIST:OPENSSL_FIPS:FUNCTION:BF
+private_MD2_Init                        3299   EXIST:OPENSSL_FIPS:FUNCTION:MD2
 d2i_PROXY_CERT_INFO_EXTENSION           3300   EXIST::FUNCTION:
 PROXY_POLICY_it                         3301   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PROXY_POLICY_it                         3301   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2868,13 +2868,13 @@ PROXY_CERT_INFO_EXTENSION_it            3307    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 PROXY_POLICY_free                       3308   EXIST::FUNCTION:
 PROXY_POLICY_new                        3309   EXIST::FUNCTION:
 BN_MONT_CTX_set_locked                  3310   EXIST::FUNCTION:
-FIPS_selftest_rng                       3311   NOEXIST::FUNCTION:
+FIPS_selftest_rng                       3311   EXIST:OPENSSL_FIPS:FUNCTION:
 EVP_sha384                              3312   EXIST::FUNCTION:SHA,SHA512
 EVP_sha512                              3313   EXIST::FUNCTION:SHA,SHA512
 EVP_sha224                              3314   EXIST::FUNCTION:SHA,SHA256
 EVP_sha256                              3315   EXIST::FUNCTION:SHA,SHA256
-FIPS_selftest_hmac                      3316   NOEXIST::FUNCTION:
-FIPS_corrupt_rng                        3317   NOEXIST::FUNCTION:
+FIPS_selftest_hmac                      3316   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_corrupt_rng                        3317   EXIST:OPENSSL_FIPS:FUNCTION:
 BN_mod_exp_mont_consttime               3318   EXIST::FUNCTION:
 RSA_X931_hash_id                        3319   EXIST::FUNCTION:RSA
 RSA_padding_check_X931                  3320   EXIST::FUNCTION:RSA
@@ -2882,7 +2882,7 @@ RSA_verify_PKCS1_PSS                    3321      EXIST::FUNCTION:RSA
 RSA_padding_add_X931                    3322   EXIST::FUNCTION:RSA
 RSA_padding_add_PKCS1_PSS               3323   EXIST::FUNCTION:RSA
 PKCS1_MGF1                              3324   EXIST::FUNCTION:RSA
-BN_X931_generate_Xpq                    3325   NOEXIST::FUNCTION:
+BN_X931_generate_Xpq                    3325   EXIST::FUNCTION:
 RSA_X931_generate_key                   3326   NOEXIST::FUNCTION:
 BN_X931_derive_prime                    3327   NOEXIST::FUNCTION:
 BN_X931_generate_prime                  3328   NOEXIST::FUNCTION:
@@ -3657,46 +3657,46 @@ ENGINE_get_ssl_client_cert_function     4045    EXIST::FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046   EXIST::FUNCTION:ENGINE
 ENGINE_load_capi                        4047   EXIST::FUNCTION:CAPIENG,ENGINE
 OPENSSL_isservice                       4048   EXIST::FUNCTION:
-FIPS_dsa_sig_decode                     4049   NOEXIST::FUNCTION:
-EVP_CIPHER_CTX_clear_flags              4050   NOEXIST::FUNCTION:
-FIPS_rand_status                        4051   NOEXIST::FUNCTION:
-FIPS_rand_set_key                       4052   NOEXIST::FUNCTION:
-CRYPTO_set_mem_info_functions           4053   NOEXIST::FUNCTION:
-RSA_X931_generate_key_ex                4054   NOEXIST::FUNCTION:
-int_ERR_set_state_func                  4055   NOEXIST::FUNCTION:
-int_EVP_MD_set_engine_callbacks         4056   NOEXIST::FUNCTION:
-int_CRYPTO_set_do_dynlock_callback      4057   NOEXIST::FUNCTION:
-FIPS_rng_stick                          4058   NOEXIST::FUNCTION:
-EVP_CIPHER_CTX_set_flags                4059   NOEXIST::FUNCTION:
-BN_X931_generate_prime_ex               4060   NOEXIST::FUNCTION:
-FIPS_selftest_check                     4061   NOEXIST::FUNCTION:
-FIPS_rand_set_dt                        4062   NOEXIST::FUNCTION:
-CRYPTO_dbg_pop_info                     4063   NOEXIST::FUNCTION:
-FIPS_dsa_free                           4064   NOEXIST::FUNCTION:
-RSA_X931_derive_ex                      4065   NOEXIST::FUNCTION:
-FIPS_rsa_new                            4066   NOEXIST::FUNCTION:
-FIPS_rand_bytes                         4067   NOEXIST::FUNCTION:
-fips_cipher_test                        4068   NOEXIST::FUNCTION:
-EVP_CIPHER_CTX_test_flags               4069   NOEXIST::FUNCTION:
-CRYPTO_malloc_debug_init                4070   NOEXIST::FUNCTION:
-CRYPTO_dbg_push_info                    4071   NOEXIST::FUNCTION:
-FIPS_corrupt_rsa_keygen                 4072   NOEXIST::FUNCTION:
-FIPS_dh_new                             4073   NOEXIST::FUNCTION:
-FIPS_corrupt_dsa_keygen                 4074   NOEXIST::FUNCTION:
-FIPS_dh_free                            4075   NOEXIST::FUNCTION:
-fips_pkey_signature_test                4076   NOEXIST::FUNCTION:
-EVP_add_alg_module                      4077   NOEXIST::FUNCTION:
-int_RAND_init_engine_callbacks          4078   NOEXIST::FUNCTION:
-int_EVP_CIPHER_set_engine_callbacks     4079   NOEXIST::FUNCTION:
-int_EVP_MD_init_engine_callbacks        4080   NOEXIST::FUNCTION:
-FIPS_rand_test_mode                     4081   NOEXIST::FUNCTION:
-FIPS_rand_reset                         4082   NOEXIST::FUNCTION:
-FIPS_dsa_new                            4083   NOEXIST::FUNCTION:
-int_RAND_set_callbacks                  4084   NOEXIST::FUNCTION:
-BN_X931_derive_prime_ex                 4085   NOEXIST::FUNCTION:
-int_ERR_lib_init                        4086   NOEXIST::FUNCTION:
-int_EVP_CIPHER_init_engine_callbacks    4087   NOEXIST::FUNCTION:
-FIPS_rsa_free                           4088   NOEXIST::FUNCTION:
-FIPS_dsa_sig_encode                     4089   NOEXIST::FUNCTION:
-CRYPTO_dbg_remove_all_info              4090   NOEXIST::FUNCTION:
-OPENSSL_init                            4091   NOEXIST::FUNCTION:
+FIPS_dsa_sig_decode                     4049   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+EVP_CIPHER_CTX_clear_flags              4050   EXIST::FUNCTION:
+FIPS_rand_status                        4051   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_set_key                       4052   EXIST:OPENSSL_FIPS:FUNCTION:
+CRYPTO_set_mem_info_functions           4053   EXIST::FUNCTION:
+RSA_X931_generate_key_ex                4054   EXIST::FUNCTION:RSA
+int_ERR_set_state_func                  4055   EXIST:OPENSSL_FIPS:FUNCTION:
+int_EVP_MD_set_engine_callbacks         4056   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_CRYPTO_set_do_dynlock_callback      4057   EXIST::FUNCTION:
+FIPS_rng_stick                          4058   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_CIPHER_CTX_set_flags                4059   EXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060   EXIST::FUNCTION:
+FIPS_selftest_check                     4061   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_set_dt                        4062   EXIST:OPENSSL_FIPS:FUNCTION:
+CRYPTO_dbg_pop_info                     4063   EXIST::FUNCTION:
+FIPS_dsa_free                           4064   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+RSA_X931_derive_ex                      4065   EXIST::FUNCTION:RSA
+FIPS_rsa_new                            4066   EXIST:OPENSSL_FIPS:FUNCTION:RSA
+FIPS_rand_bytes                         4067   EXIST:OPENSSL_FIPS:FUNCTION:
+fips_cipher_test                        4068   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_CIPHER_CTX_test_flags               4069   EXIST::FUNCTION:
+CRYPTO_malloc_debug_init                4070   EXIST::FUNCTION:
+CRYPTO_dbg_push_info                    4071   EXIST::FUNCTION:
+FIPS_corrupt_rsa_keygen                 4072   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dh_new                             4073   EXIST:OPENSSL_FIPS:FUNCTION:DH
+FIPS_corrupt_dsa_keygen                 4074   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dh_free                            4075   EXIST:OPENSSL_FIPS:FUNCTION:DH
+fips_pkey_signature_test                4076   EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_add_alg_module                      4077   EXIST::FUNCTION:
+int_RAND_init_engine_callbacks          4078   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_EVP_CIPHER_set_engine_callbacks     4079   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+int_EVP_MD_init_engine_callbacks        4080   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+FIPS_rand_test_mode                     4081   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_rand_reset                         4082   EXIST:OPENSSL_FIPS:FUNCTION:
+FIPS_dsa_new                            4083   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+int_RAND_set_callbacks                  4084   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+BN_X931_derive_prime_ex                 4085   EXIST::FUNCTION:
+int_ERR_lib_init                        4086   EXIST:OPENSSL_FIPS:FUNCTION:
+int_EVP_CIPHER_init_engine_callbacks    4087   EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
+FIPS_rsa_free                           4088   EXIST:OPENSSL_FIPS:FUNCTION:RSA
+FIPS_dsa_sig_encode                     4089   EXIST:OPENSSL_FIPS:FUNCTION:DSA
+CRYPTO_dbg_remove_all_info              4090   EXIST::FUNCTION:
+OPENSSL_init                            4091   EXIST::FUNCTION: