resolve conflicts

author: djm <> 2009-01-09 12:15:52 +0000
committer: djm <> 2009-01-09 12:15:52 +0000
commit: 23f8d96f0f508b8bef2602049feee9c44228d34c (patch)
tree: a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/util/libeay.num
parent: 30562050421d947c3eb3c10edde6e87730b17471 (diff)
download: openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz
openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2
openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip
1 files changed, 102 insertions, 78 deletions
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index 62664f3c37..0eb54ddc89 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/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_corrupt_rsa                        3249    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_des                       3250    NOEXIST::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_mode_set                           3253    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_dsa                       3254    NOEXIST::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_rand_seed                          3262    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_des                        3263    NOEXIST::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:
+ERR_load_FIPS_strings                   3272    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_aes                        3273    NOEXIST::FUNCTION:
+FIPS_corrupt_aes                        3273    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_sha1                      3274    NOEXIST::FUNCTION:
+FIPS_selftest_sha1                      3274    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_rsa                       3275    NOEXIST::FUNCTION:
+FIPS_selftest_rsa                       3275    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_sha1                       3276    NOEXIST::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_mode                               3283    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_selftest_failed                    3284    NOEXIST::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_SHA_Init                        3289    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
-private_CAST_set_key                    3290    NOEXIST::FUNCTION:
+private_CAST_set_key                    3290    EXIST:OPENSSL_FIPS:FUNCTION:CAST
-private_RIPEMD160_Init                  3291    NOEXIST::FUNCTION:
+private_RIPEMD160_Init                  3291    EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
-private_RC5_32_set_key                  3292    NOEXIST::FUNCTION:
+private_RC5_32_set_key                  3292    EXIST:OPENSSL_FIPS:FUNCTION:RC5
-private_MD5_Init                        3293    NOEXIST::FUNCTION:
+private_MD5_Init                        3293    EXIST:OPENSSL_FIPS:FUNCTION:MD5
-private_RC4_set_key                     3294    NOEXIST::FUNCTION:
+private_RC4_set_key                     3294    EXIST:OPENSSL_FIPS:FUNCTION:RC4
-private_MDC2_Init                       3295    NOEXIST::FUNCTION:
+private_MDC2_Init                       3295    EXIST:OPENSSL_FIPS:FUNCTION:MDC2
-private_RC2_set_key                     3296    NOEXIST::FUNCTION:
+private_RC2_set_key                     3296    EXIST:OPENSSL_FIPS:FUNCTION:RC2
-private_MD4_Init                        3297    NOEXIST::FUNCTION:
+private_MD4_Init                        3297    EXIST:OPENSSL_FIPS:FUNCTION:MD4
-private_BF_set_key                      3298    NOEXIST::FUNCTION:
+private_BF_set_key                      3298    EXIST:OPENSSL_FIPS:FUNCTION:BF
-private_MD2_Init                        3299    NOEXIST::FUNCTION:
+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_selftest_hmac                      3316    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_corrupt_rng                        3317    NOEXIST::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:
@@ -3652,51 +3652,75 @@ CMS_set1_eContentType                   4040	EXIST::FUNCTION:CMS
 CMS_ReceiptRequest_create0              4041    EXIST::FUNCTION:CMS
 CMS_add1_signer                         4042    EXIST::FUNCTION:CMS
 CMS_RecipientInfo_set0_pkey             4043    EXIST::FUNCTION:CMS
-ENGINE_set_load_ssl_client_cert_function 4044   EXIST::FUNCTION:ENGINE
+ENGINE_set_load_ssl_client_cert_function 4044   EXIST:!VMS:FUNCTION:ENGINE
-ENGINE_get_ssl_client_cert_function     4045    EXIST::FUNCTION:ENGINE
+ENGINE_set_ld_ssl_clnt_cert_fn          4044    EXIST:VMS:FUNCTION:ENGINE
+ENGINE_get_ssl_client_cert_function     4045    EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_get_ssl_client_cert_fn           4045    EXIST:VMS: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:
+FIPS_dsa_sig_decode                     4049    EXIST:OPENSSL_FIPS:FUNCTION:DSA
-EVP_CIPHER_CTX_clear_flags              4050    NOEXIST::FUNCTION:
+EVP_CIPHER_CTX_clear_flags              4050    EXIST::FUNCTION:
-FIPS_rand_status                        4051    NOEXIST::FUNCTION:
+FIPS_rand_status                        4051    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_set_key                       4052    NOEXIST::FUNCTION:
+FIPS_rand_set_key                       4052    EXIST:OPENSSL_FIPS:FUNCTION:
-CRYPTO_set_mem_info_functions           4053    NOEXIST::FUNCTION:
+CRYPTO_set_mem_info_functions           4053    EXIST::FUNCTION:
-RSA_X931_generate_key_ex                4054    NOEXIST::FUNCTION:
+RSA_X931_generate_key_ex                4054    EXIST::FUNCTION:RSA
-int_ERR_set_state_func                  4055    NOEXIST::FUNCTION:
+int_ERR_set_state_func                  4055    EXIST:OPENSSL_FIPS:FUNCTION:
-int_EVP_MD_set_engine_callbacks         4056    NOEXIST::FUNCTION:
+int_EVP_MD_set_engine_callbacks         4056    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_CRYPTO_set_do_dynlock_callback      4057    NOEXIST::FUNCTION:
+int_CRYPTO_set_do_dynlock_callback      4057    EXIST::FUNCTION:
-FIPS_rng_stick                          4058    NOEXIST::FUNCTION:
+FIPS_rng_stick                          4058    EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_CIPHER_CTX_set_flags                4059    NOEXIST::FUNCTION:
+EVP_CIPHER_CTX_set_flags                4059    EXIST::FUNCTION:
-BN_X931_generate_prime_ex               4060    NOEXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060    EXIST::FUNCTION:
-FIPS_selftest_check                     4061    NOEXIST::FUNCTION:
+FIPS_selftest_check                     4061    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_set_dt                        4062    NOEXIST::FUNCTION:
+FIPS_rand_set_dt                        4062    EXIST:OPENSSL_FIPS:FUNCTION:
-CRYPTO_dbg_pop_info                     4063    NOEXIST::FUNCTION:
+CRYPTO_dbg_pop_info                     4063    EXIST::FUNCTION:
-FIPS_dsa_free                           4064    NOEXIST::FUNCTION:
+FIPS_dsa_free                           4064    EXIST:OPENSSL_FIPS:FUNCTION:DSA
-RSA_X931_derive_ex                      4065    NOEXIST::FUNCTION:
+RSA_X931_derive_ex                      4065    EXIST::FUNCTION:RSA
-FIPS_rsa_new                            4066    NOEXIST::FUNCTION:
+FIPS_rsa_new                            4066    EXIST:OPENSSL_FIPS:FUNCTION:RSA
-FIPS_rand_bytes                         4067    NOEXIST::FUNCTION:
+FIPS_rand_bytes                         4067    EXIST:OPENSSL_FIPS:FUNCTION:
-fips_cipher_test                        4068    NOEXIST::FUNCTION:
+fips_cipher_test                        4068    EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_CIPHER_CTX_test_flags               4069    NOEXIST::FUNCTION:
+EVP_CIPHER_CTX_test_flags               4069    EXIST::FUNCTION:
-CRYPTO_malloc_debug_init                4070    NOEXIST::FUNCTION:
+CRYPTO_malloc_debug_init                4070    EXIST::FUNCTION:
-CRYPTO_dbg_push_info                    4071    NOEXIST::FUNCTION:
+CRYPTO_dbg_push_info                    4071    EXIST::FUNCTION:
-FIPS_corrupt_rsa_keygen                 4072    NOEXIST::FUNCTION:
+FIPS_corrupt_rsa_keygen                 4072    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dh_new                             4073    NOEXIST::FUNCTION:
+FIPS_dh_new                             4073    EXIST:OPENSSL_FIPS:FUNCTION:DH
-FIPS_corrupt_dsa_keygen                 4074    NOEXIST::FUNCTION:
+FIPS_corrupt_dsa_keygen                 4074    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dh_free                            4075    NOEXIST::FUNCTION:
+FIPS_dh_free                            4075    EXIST:OPENSSL_FIPS:FUNCTION:DH
-fips_pkey_signature_test                4076    NOEXIST::FUNCTION:
+fips_pkey_signature_test                4076    EXIST:OPENSSL_FIPS:FUNCTION:
-EVP_add_alg_module                      4077    NOEXIST::FUNCTION:
+EVP_add_alg_module                      4077    EXIST::FUNCTION:
-int_RAND_init_engine_callbacks          4078    NOEXIST::FUNCTION:
+int_RAND_init_engine_callbacks          4078    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_EVP_CIPHER_set_engine_callbacks     4079    NOEXIST::FUNCTION:
+int_EVP_CIPHER_set_engine_callbacks     4079    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-int_EVP_MD_init_engine_callbacks        4080    NOEXIST::FUNCTION:
+int_EVP_MD_init_engine_callbacks        4080    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-FIPS_rand_test_mode                     4081    NOEXIST::FUNCTION:
+FIPS_rand_test_mode                     4081    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_rand_reset                         4082    NOEXIST::FUNCTION:
+FIPS_rand_reset                         4082    EXIST:OPENSSL_FIPS:FUNCTION:
-FIPS_dsa_new                            4083    NOEXIST::FUNCTION:
+FIPS_dsa_new                            4083    EXIST:OPENSSL_FIPS:FUNCTION:DSA
-int_RAND_set_callbacks                  4084    NOEXIST::FUNCTION:
+int_RAND_set_callbacks                  4084    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-BN_X931_derive_prime_ex                 4085    NOEXIST::FUNCTION:
+BN_X931_derive_prime_ex                 4085    EXIST::FUNCTION:
-int_ERR_lib_init                        4086    NOEXIST::FUNCTION:
+int_ERR_lib_init                        4086    EXIST:OPENSSL_FIPS:FUNCTION:
-int_EVP_CIPHER_init_engine_callbacks    4087    NOEXIST::FUNCTION:
+int_EVP_CIPHER_init_engine_callbacks    4087    EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
-FIPS_rsa_free                           4088    NOEXIST::FUNCTION:
+FIPS_rsa_free                           4088    EXIST:OPENSSL_FIPS:FUNCTION:RSA
-FIPS_dsa_sig_encode                     4089    NOEXIST::FUNCTION:
+FIPS_dsa_sig_encode                     4089    EXIST:OPENSSL_FIPS:FUNCTION:DSA
-CRYPTO_dbg_remove_all_info              4090    NOEXIST::FUNCTION:
+CRYPTO_dbg_remove_all_info              4090    EXIST::FUNCTION:
-OPENSSL_init                            4091    NOEXIST::FUNCTION:
+OPENSSL_init                            4091    EXIST::FUNCTION:
+private_Camellia_set_key                4092    EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
+CRYPTO_strdup                           4093    EXIST::FUNCTION:
+JPAKE_STEP3A_process                    4094    EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_release                     4095    EXIST::FUNCTION:JPAKE
+JPAKE_get_shared_key                    4096    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_init                       4097    EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_generate                    4098    EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_init                        4099    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_process                    4100    EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_generate                    4101    EXIST::FUNCTION:JPAKE
+JPAKE_CTX_new                           4102    EXIST::FUNCTION:JPAKE
+JPAKE_CTX_free                          4103    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_release                    4104    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_release                    4105    EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_process                     4106    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3B_generate                   4107    EXIST::FUNCTION:JPAKE
+JPAKE_STEP1_process                     4108    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_generate                   4109    EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_release                     4110    EXIST::FUNCTION:JPAKE
+JPAKE_STEP3A_init                       4111    EXIST::FUNCTION:JPAKE
+ERR_load_JPAKE_strings                  4112    EXIST::FUNCTION:JPAKE
+JPAKE_STEP2_init                        4113    EXIST::FUNCTION:JPAKE
author	djm <>	2009-01-09 12:15:52 +0000
committer	djm <>	2009-01-09 12:15:52 +0000
commit	23f8d96f0f508b8bef2602049feee9c44228d34c (patch)
tree	a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/util/libeay.num
parent	30562050421d947c3eb3c10edde6e87730b17471 (diff)
download	openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip

diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num index 62664f3c37..0eb54ddc89 100644 --- a/src/lib/libcrypto/util/libeay.num +++ b/src/lib/libcrypto/util/libeay.num
@@ -2804,12 +2804,12 @@ OPENSSL_cleanse 3245 EXIST::FUNCTION:
2804	ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE	2804	ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE
2805	ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH	2805	ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH
2806	EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES	2806	EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES
2807	FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION:	2807	FIPS_corrupt_rsa 3249 EXIST:OPENSSL_FIPS:FUNCTION:
2808	FIPS_selftest_des 3250 NOEXIST::FUNCTION:	2808	FIPS_selftest_des 3250 EXIST:OPENSSL_FIPS:FUNCTION:
2809	EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES	2809	EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES
2810	EVP_aes_192_cfb8 3252 EXIST::FUNCTION:AES	2810	EVP_aes_192_cfb8 3252 EXIST::FUNCTION:AES
2811	FIPS_mode_set 3253 NOEXIST::FUNCTION:	2811	FIPS_mode_set 3253 EXIST:OPENSSL_FIPS:FUNCTION:
2812	FIPS_selftest_dsa 3254 NOEXIST::FUNCTION:	2812	FIPS_selftest_dsa 3254 EXIST:OPENSSL_FIPS:FUNCTION:
2813	EVP_aes_256_cfb8 3255 EXIST::FUNCTION:AES	2813	EVP_aes_256_cfb8 3255 EXIST::FUNCTION:AES
2814	FIPS_allow_md5 3256 NOEXIST::FUNCTION:	2814	FIPS_allow_md5 3256 NOEXIST::FUNCTION:
2815	DES_ede3_cfb_encrypt 3257 EXIST::FUNCTION:DES	2815	DES_ede3_cfb_encrypt 3257 EXIST::FUNCTION:DES
@@ -2817,44 +2817,44 @@ EVP_des_ede3_cfb8 3258 EXIST::FUNCTION:DES
2817	FIPS_rand_seeded 3259 NOEXIST::FUNCTION:	2817	FIPS_rand_seeded 3259 NOEXIST::FUNCTION:
2818	AES_cfbr_encrypt_block 3260 EXIST::FUNCTION:AES	2818	AES_cfbr_encrypt_block 3260 EXIST::FUNCTION:AES
2819	AES_cfb8_encrypt 3261 EXIST::FUNCTION:AES	2819	AES_cfb8_encrypt 3261 EXIST::FUNCTION:AES
2820	FIPS_rand_seed 3262 NOEXIST::FUNCTION:	2820	FIPS_rand_seed 3262 EXIST:OPENSSL_FIPS:FUNCTION:
2821	FIPS_corrupt_des 3263 NOEXIST::FUNCTION:	2821	FIPS_corrupt_des 3263 EXIST:OPENSSL_FIPS:FUNCTION:
2822	EVP_aes_192_cfb1 3264 EXIST::FUNCTION:AES	2822	EVP_aes_192_cfb1 3264 EXIST::FUNCTION:AES
2823	FIPS_selftest_aes 3265 NOEXIST::FUNCTION:	2823	FIPS_selftest_aes 3265 EXIST:OPENSSL_FIPS:FUNCTION:
2824	FIPS_set_prng_key 3266 NOEXIST::FUNCTION:	2824	FIPS_set_prng_key 3266 NOEXIST::FUNCTION:
2825	EVP_des_cfb8 3267 EXIST::FUNCTION:DES	2825	EVP_des_cfb8 3267 EXIST::FUNCTION:DES
2826	FIPS_corrupt_dsa 3268 NOEXIST::FUNCTION:	2826	FIPS_corrupt_dsa 3268 EXIST:OPENSSL_FIPS:FUNCTION:
2827	FIPS_test_mode 3269 NOEXIST::FUNCTION:	2827	FIPS_test_mode 3269 NOEXIST::FUNCTION:
2828	FIPS_rand_method 3270 NOEXIST::FUNCTION:	2828	FIPS_rand_method 3270 EXIST:OPENSSL_FIPS:FUNCTION:
2829	EVP_aes_256_cfb1 3271 EXIST::FUNCTION:AES	2829	EVP_aes_256_cfb1 3271 EXIST::FUNCTION:AES
2830	ERR_load_FIPS_strings 3272 NOEXIST::FUNCTION:	2830	ERR_load_FIPS_strings 3272 EXIST:OPENSSL_FIPS:FUNCTION:
2831	FIPS_corrupt_aes 3273 NOEXIST::FUNCTION:	2831	FIPS_corrupt_aes 3273 EXIST:OPENSSL_FIPS:FUNCTION:
2832	FIPS_selftest_sha1 3274 NOEXIST::FUNCTION:	2832	FIPS_selftest_sha1 3274 EXIST:OPENSSL_FIPS:FUNCTION:
2833	FIPS_selftest_rsa 3275 NOEXIST::FUNCTION:	2833	FIPS_selftest_rsa 3275 EXIST:OPENSSL_FIPS:FUNCTION:
2834	FIPS_corrupt_sha1 3276 NOEXIST::FUNCTION:	2834	FIPS_corrupt_sha1 3276 EXIST:OPENSSL_FIPS:FUNCTION:
2835	EVP_des_cfb1 3277 EXIST::FUNCTION:DES	2835	EVP_des_cfb1 3277 EXIST::FUNCTION:DES
2836	FIPS_dsa_check 3278 NOEXIST::FUNCTION:	2836	FIPS_dsa_check 3278 NOEXIST::FUNCTION:
2837	AES_cfb1_encrypt 3279 EXIST::FUNCTION:AES	2837	AES_cfb1_encrypt 3279 EXIST::FUNCTION:AES
2838	EVP_des_ede3_cfb1 3280 EXIST::FUNCTION:DES	2838	EVP_des_ede3_cfb1 3280 EXIST::FUNCTION:DES
2839	FIPS_rand_check 3281 NOEXIST::FUNCTION:	2839	FIPS_rand_check 3281 EXIST:OPENSSL_FIPS:FUNCTION:
2840	FIPS_md5_allowed 3282 NOEXIST::FUNCTION:	2840	FIPS_md5_allowed 3282 NOEXIST::FUNCTION:
2841	FIPS_mode 3283 NOEXIST::FUNCTION:	2841	FIPS_mode 3283 EXIST:OPENSSL_FIPS:FUNCTION:
2842	FIPS_selftest_failed 3284 NOEXIST::FUNCTION:	2842	FIPS_selftest_failed 3284 EXIST:OPENSSL_FIPS:FUNCTION:
2843	sk_is_sorted 3285 EXIST::FUNCTION:	2843	sk_is_sorted 3285 EXIST::FUNCTION:
2844	X509_check_ca 3286 EXIST::FUNCTION:	2844	X509_check_ca 3286 EXIST::FUNCTION:
2845	private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION:	2845	private_idea_set_encrypt_key 3287 EXIST:OPENSSL_FIPS:FUNCTION:IDEA
2846	HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC	2846	HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC
2847	private_SHA_Init 3289 NOEXIST::FUNCTION:	2847	private_SHA_Init 3289 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
2848	private_CAST_set_key 3290 NOEXIST::FUNCTION:	2848	private_CAST_set_key 3290 EXIST:OPENSSL_FIPS:FUNCTION:CAST
2849	private_RIPEMD160_Init 3291 NOEXIST::FUNCTION:	2849	private_RIPEMD160_Init 3291 EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
2850	private_RC5_32_set_key 3292 NOEXIST::FUNCTION:	2850	private_RC5_32_set_key 3292 EXIST:OPENSSL_FIPS:FUNCTION:RC5
2851	private_MD5_Init 3293 NOEXIST::FUNCTION:	2851	private_MD5_Init 3293 EXIST:OPENSSL_FIPS:FUNCTION:MD5
2852	private_RC4_set_key 3294 NOEXIST::FUNCTION:	2852	private_RC4_set_key 3294 EXIST:OPENSSL_FIPS:FUNCTION:RC4
2853	private_MDC2_Init 3295 NOEXIST::FUNCTION:	2853	private_MDC2_Init 3295 EXIST:OPENSSL_FIPS:FUNCTION:MDC2
2854	private_RC2_set_key 3296 NOEXIST::FUNCTION:	2854	private_RC2_set_key 3296 EXIST:OPENSSL_FIPS:FUNCTION:RC2
2855	private_MD4_Init 3297 NOEXIST::FUNCTION:	2855	private_MD4_Init 3297 EXIST:OPENSSL_FIPS:FUNCTION:MD4
2856	private_BF_set_key 3298 NOEXIST::FUNCTION:	2856	private_BF_set_key 3298 EXIST:OPENSSL_FIPS:FUNCTION:BF
2857	private_MD2_Init 3299 NOEXIST::FUNCTION:	2857	private_MD2_Init 3299 EXIST:OPENSSL_FIPS:FUNCTION:MD2
2858	d2i_PROXY_CERT_INFO_EXTENSION 3300 EXIST::FUNCTION:	2858	d2i_PROXY_CERT_INFO_EXTENSION 3300 EXIST::FUNCTION:
2859	PROXY_POLICY_it 3301 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:	2859	PROXY_POLICY_it 3301 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
2860	PROXY_POLICY_it 3301 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:	2860	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
2868	PROXY_POLICY_free 3308 EXIST::FUNCTION:	2868	PROXY_POLICY_free 3308 EXIST::FUNCTION:
2869	PROXY_POLICY_new 3309 EXIST::FUNCTION:	2869	PROXY_POLICY_new 3309 EXIST::FUNCTION:
2870	BN_MONT_CTX_set_locked 3310 EXIST::FUNCTION:	2870	BN_MONT_CTX_set_locked 3310 EXIST::FUNCTION:
2871	FIPS_selftest_rng 3311 NOEXIST::FUNCTION:	2871	FIPS_selftest_rng 3311 EXIST:OPENSSL_FIPS:FUNCTION:
2872	EVP_sha384 3312 EXIST::FUNCTION:SHA,SHA512	2872	EVP_sha384 3312 EXIST::FUNCTION:SHA,SHA512
2873	EVP_sha512 3313 EXIST::FUNCTION:SHA,SHA512	2873	EVP_sha512 3313 EXIST::FUNCTION:SHA,SHA512
2874	EVP_sha224 3314 EXIST::FUNCTION:SHA,SHA256	2874	EVP_sha224 3314 EXIST::FUNCTION:SHA,SHA256
2875	EVP_sha256 3315 EXIST::FUNCTION:SHA,SHA256	2875	EVP_sha256 3315 EXIST::FUNCTION:SHA,SHA256
2876	FIPS_selftest_hmac 3316 NOEXIST::FUNCTION:	2876	FIPS_selftest_hmac 3316 EXIST:OPENSSL_FIPS:FUNCTION:
2877	FIPS_corrupt_rng 3317 NOEXIST::FUNCTION:	2877	FIPS_corrupt_rng 3317 EXIST:OPENSSL_FIPS:FUNCTION:
2878	BN_mod_exp_mont_consttime 3318 EXIST::FUNCTION:	2878	BN_mod_exp_mont_consttime 3318 EXIST::FUNCTION:
2879	RSA_X931_hash_id 3319 EXIST::FUNCTION:RSA	2879	RSA_X931_hash_id 3319 EXIST::FUNCTION:RSA
2880	RSA_padding_check_X931 3320 EXIST::FUNCTION:RSA	2880	RSA_padding_check_X931 3320 EXIST::FUNCTION:RSA
@@ -2882,7 +2882,7 @@ RSA_verify_PKCS1_PSS 3321 EXIST::FUNCTION:RSA
2882	RSA_padding_add_X931 3322 EXIST::FUNCTION:RSA	2882	RSA_padding_add_X931 3322 EXIST::FUNCTION:RSA
2883	RSA_padding_add_PKCS1_PSS 3323 EXIST::FUNCTION:RSA	2883	RSA_padding_add_PKCS1_PSS 3323 EXIST::FUNCTION:RSA
2884	PKCS1_MGF1 3324 EXIST::FUNCTION:RSA	2884	PKCS1_MGF1 3324 EXIST::FUNCTION:RSA
2885	BN_X931_generate_Xpq 3325 NOEXIST::FUNCTION:	2885	BN_X931_generate_Xpq 3325 EXIST::FUNCTION:
2886	RSA_X931_generate_key 3326 NOEXIST::FUNCTION:	2886	RSA_X931_generate_key 3326 NOEXIST::FUNCTION:
2887	BN_X931_derive_prime 3327 NOEXIST::FUNCTION:	2887	BN_X931_derive_prime 3327 NOEXIST::FUNCTION:
2888	BN_X931_generate_prime 3328 NOEXIST::FUNCTION:	2888	BN_X931_generate_prime 3328 NOEXIST::FUNCTION:
@@ -3652,51 +3652,75 @@ CMS_set1_eContentType 4040 EXIST::FUNCTION:CMS
3652	CMS_ReceiptRequest_create0 4041 EXIST::FUNCTION:CMS	3652	CMS_ReceiptRequest_create0 4041 EXIST::FUNCTION:CMS
3653	CMS_add1_signer 4042 EXIST::FUNCTION:CMS	3653	CMS_add1_signer 4042 EXIST::FUNCTION:CMS
3654	CMS_RecipientInfo_set0_pkey 4043 EXIST::FUNCTION:CMS	3654	CMS_RecipientInfo_set0_pkey 4043 EXIST::FUNCTION:CMS
3655	ENGINE_set_load_ssl_client_cert_function 4044 EXIST::FUNCTION:ENGINE	3655	ENGINE_set_load_ssl_client_cert_function 4044 EXIST:!VMS:FUNCTION:ENGINE
3656	ENGINE_get_ssl_client_cert_function 4045 EXIST::FUNCTION:ENGINE	3656	ENGINE_set_ld_ssl_clnt_cert_fn 4044 EXIST:VMS:FUNCTION:ENGINE
		3657	ENGINE_get_ssl_client_cert_function 4045 EXIST:!VMS:FUNCTION:ENGINE
		3658	ENGINE_get_ssl_client_cert_fn 4045 EXIST:VMS:FUNCTION:ENGINE
3657	ENGINE_load_ssl_client_cert 4046 EXIST::FUNCTION:ENGINE	3659	ENGINE_load_ssl_client_cert 4046 EXIST::FUNCTION:ENGINE
3658	ENGINE_load_capi 4047 EXIST::FUNCTION:CAPIENG,ENGINE	3660	ENGINE_load_capi 4047 EXIST::FUNCTION:CAPIENG,ENGINE
3659	OPENSSL_isservice 4048 EXIST::FUNCTION:	3661	OPENSSL_isservice 4048 EXIST::FUNCTION:
3660	FIPS_dsa_sig_decode 4049 NOEXIST::FUNCTION:	3662	FIPS_dsa_sig_decode 4049 EXIST:OPENSSL_FIPS:FUNCTION:DSA
3661	EVP_CIPHER_CTX_clear_flags 4050 NOEXIST::FUNCTION:	3663	EVP_CIPHER_CTX_clear_flags 4050 EXIST::FUNCTION:
3662	FIPS_rand_status 4051 NOEXIST::FUNCTION:	3664	FIPS_rand_status 4051 EXIST:OPENSSL_FIPS:FUNCTION:
3663	FIPS_rand_set_key 4052 NOEXIST::FUNCTION:	3665	FIPS_rand_set_key 4052 EXIST:OPENSSL_FIPS:FUNCTION:
3664	CRYPTO_set_mem_info_functions 4053 NOEXIST::FUNCTION:	3666	CRYPTO_set_mem_info_functions 4053 EXIST::FUNCTION:
3665	RSA_X931_generate_key_ex 4054 NOEXIST::FUNCTION:	3667	RSA_X931_generate_key_ex 4054 EXIST::FUNCTION:RSA
3666	int_ERR_set_state_func 4055 NOEXIST::FUNCTION:	3668	int_ERR_set_state_func 4055 EXIST:OPENSSL_FIPS:FUNCTION:
3667	int_EVP_MD_set_engine_callbacks 4056 NOEXIST::FUNCTION:	3669	int_EVP_MD_set_engine_callbacks 4056 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3668	int_CRYPTO_set_do_dynlock_callback 4057 NOEXIST::FUNCTION:	3670	int_CRYPTO_set_do_dynlock_callback 4057 EXIST::FUNCTION:
3669	FIPS_rng_stick 4058 NOEXIST::FUNCTION:	3671	FIPS_rng_stick 4058 EXIST:OPENSSL_FIPS:FUNCTION:
3670	EVP_CIPHER_CTX_set_flags 4059 NOEXIST::FUNCTION:	3672	EVP_CIPHER_CTX_set_flags 4059 EXIST::FUNCTION:
3671	BN_X931_generate_prime_ex 4060 NOEXIST::FUNCTION:	3673	BN_X931_generate_prime_ex 4060 EXIST::FUNCTION:
3672	FIPS_selftest_check 4061 NOEXIST::FUNCTION:	3674	FIPS_selftest_check 4061 EXIST:OPENSSL_FIPS:FUNCTION:
3673	FIPS_rand_set_dt 4062 NOEXIST::FUNCTION:	3675	FIPS_rand_set_dt 4062 EXIST:OPENSSL_FIPS:FUNCTION:
3674	CRYPTO_dbg_pop_info 4063 NOEXIST::FUNCTION:	3676	CRYPTO_dbg_pop_info 4063 EXIST::FUNCTION:
3675	FIPS_dsa_free 4064 NOEXIST::FUNCTION:	3677	FIPS_dsa_free 4064 EXIST:OPENSSL_FIPS:FUNCTION:DSA
3676	RSA_X931_derive_ex 4065 NOEXIST::FUNCTION:	3678	RSA_X931_derive_ex 4065 EXIST::FUNCTION:RSA
3677	FIPS_rsa_new 4066 NOEXIST::FUNCTION:	3679	FIPS_rsa_new 4066 EXIST:OPENSSL_FIPS:FUNCTION:RSA
3678	FIPS_rand_bytes 4067 NOEXIST::FUNCTION:	3680	FIPS_rand_bytes 4067 EXIST:OPENSSL_FIPS:FUNCTION:
3679	fips_cipher_test 4068 NOEXIST::FUNCTION:	3681	fips_cipher_test 4068 EXIST:OPENSSL_FIPS:FUNCTION:
3680	EVP_CIPHER_CTX_test_flags 4069 NOEXIST::FUNCTION:	3682	EVP_CIPHER_CTX_test_flags 4069 EXIST::FUNCTION:
3681	CRYPTO_malloc_debug_init 4070 NOEXIST::FUNCTION:	3683	CRYPTO_malloc_debug_init 4070 EXIST::FUNCTION:
3682	CRYPTO_dbg_push_info 4071 NOEXIST::FUNCTION:	3684	CRYPTO_dbg_push_info 4071 EXIST::FUNCTION:
3683	FIPS_corrupt_rsa_keygen 4072 NOEXIST::FUNCTION:	3685	FIPS_corrupt_rsa_keygen 4072 EXIST:OPENSSL_FIPS:FUNCTION:
3684	FIPS_dh_new 4073 NOEXIST::FUNCTION:	3686	FIPS_dh_new 4073 EXIST:OPENSSL_FIPS:FUNCTION:DH
3685	FIPS_corrupt_dsa_keygen 4074 NOEXIST::FUNCTION:	3687	FIPS_corrupt_dsa_keygen 4074 EXIST:OPENSSL_FIPS:FUNCTION:
3686	FIPS_dh_free 4075 NOEXIST::FUNCTION:	3688	FIPS_dh_free 4075 EXIST:OPENSSL_FIPS:FUNCTION:DH
3687	fips_pkey_signature_test 4076 NOEXIST::FUNCTION:	3689	fips_pkey_signature_test 4076 EXIST:OPENSSL_FIPS:FUNCTION:
3688	EVP_add_alg_module 4077 NOEXIST::FUNCTION:	3690	EVP_add_alg_module 4077 EXIST::FUNCTION:
3689	int_RAND_init_engine_callbacks 4078 NOEXIST::FUNCTION:	3691	int_RAND_init_engine_callbacks 4078 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3690	int_EVP_CIPHER_set_engine_callbacks 4079 NOEXIST::FUNCTION:	3692	int_EVP_CIPHER_set_engine_callbacks 4079 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3691	int_EVP_MD_init_engine_callbacks 4080 NOEXIST::FUNCTION:	3693	int_EVP_MD_init_engine_callbacks 4080 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3692	FIPS_rand_test_mode 4081 NOEXIST::FUNCTION:	3694	FIPS_rand_test_mode 4081 EXIST:OPENSSL_FIPS:FUNCTION:
3693	FIPS_rand_reset 4082 NOEXIST::FUNCTION:	3695	FIPS_rand_reset 4082 EXIST:OPENSSL_FIPS:FUNCTION:
3694	FIPS_dsa_new 4083 NOEXIST::FUNCTION:	3696	FIPS_dsa_new 4083 EXIST:OPENSSL_FIPS:FUNCTION:DSA
3695	int_RAND_set_callbacks 4084 NOEXIST::FUNCTION:	3697	int_RAND_set_callbacks 4084 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3696	BN_X931_derive_prime_ex 4085 NOEXIST::FUNCTION:	3698	BN_X931_derive_prime_ex 4085 EXIST::FUNCTION:
3697	int_ERR_lib_init 4086 NOEXIST::FUNCTION:	3699	int_ERR_lib_init 4086 EXIST:OPENSSL_FIPS:FUNCTION:
3698	int_EVP_CIPHER_init_engine_callbacks 4087 NOEXIST::FUNCTION:	3700	int_EVP_CIPHER_init_engine_callbacks 4087 EXIST:OPENSSL_FIPS:FUNCTION:ENGINE
3699	FIPS_rsa_free 4088 NOEXIST::FUNCTION:	3701	FIPS_rsa_free 4088 EXIST:OPENSSL_FIPS:FUNCTION:RSA
3700	FIPS_dsa_sig_encode 4089 NOEXIST::FUNCTION:	3702	FIPS_dsa_sig_encode 4089 EXIST:OPENSSL_FIPS:FUNCTION:DSA
3701	CRYPTO_dbg_remove_all_info 4090 NOEXIST::FUNCTION:	3703	CRYPTO_dbg_remove_all_info 4090 EXIST::FUNCTION:
3702	OPENSSL_init 4091 NOEXIST::FUNCTION:	3704	OPENSSL_init 4091 EXIST::FUNCTION:
		3705	private_Camellia_set_key 4092 EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
		3706	CRYPTO_strdup 4093 EXIST::FUNCTION:
		3707	JPAKE_STEP3A_process 4094 EXIST::FUNCTION:JPAKE
		3708	JPAKE_STEP1_release 4095 EXIST::FUNCTION:JPAKE
		3709	JPAKE_get_shared_key 4096 EXIST::FUNCTION:JPAKE
		3710	JPAKE_STEP3B_init 4097 EXIST::FUNCTION:JPAKE
		3711	JPAKE_STEP1_generate 4098 EXIST::FUNCTION:JPAKE
		3712	JPAKE_STEP1_init 4099 EXIST::FUNCTION:JPAKE
		3713	JPAKE_STEP3B_process 4100 EXIST::FUNCTION:JPAKE
		3714	JPAKE_STEP2_generate 4101 EXIST::FUNCTION:JPAKE
		3715	JPAKE_CTX_new 4102 EXIST::FUNCTION:JPAKE
		3716	JPAKE_CTX_free 4103 EXIST::FUNCTION:JPAKE
		3717	JPAKE_STEP3B_release 4104 EXIST::FUNCTION:JPAKE
		3718	JPAKE_STEP3A_release 4105 EXIST::FUNCTION:JPAKE
		3719	JPAKE_STEP2_process 4106 EXIST::FUNCTION:JPAKE
		3720	JPAKE_STEP3B_generate 4107 EXIST::FUNCTION:JPAKE
		3721	JPAKE_STEP1_process 4108 EXIST::FUNCTION:JPAKE
		3722	JPAKE_STEP3A_generate 4109 EXIST::FUNCTION:JPAKE
		3723	JPAKE_STEP2_release 4110 EXIST::FUNCTION:JPAKE
		3724	JPAKE_STEP3A_init 4111 EXIST::FUNCTION:JPAKE
		3725	ERR_load_JPAKE_strings 4112 EXIST::FUNCTION:JPAKE
		3726	JPAKE_STEP2_init 4113 EXIST::FUNCTION:JPAKE