resolve conflicts

1 files changed, 166 insertions, 51 deletions

diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index 1467ab6243..93f80ba0c6 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -1050,7 +1050,7 @@ ASN1_TYPE_get_octetstring               1077	EXIST::FUNCTION:
 ASN1_TYPE_set_int_octetstring           1078    EXIST::FUNCTION:
 ASN1_TYPE_set_octetstring               1079    EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 1080    EXIST::FUNCTION:
-ERR_add_error_data                      1081    EXIST::FUNCTION:BIO
+ERR_add_error_data                      1081    EXIST::FUNCTION:
 ERR_set_error_data                      1082    EXIST::FUNCTION:
 EVP_CIPHER_asn1_to_param                1083    EXIST::FUNCTION:
 EVP_CIPHER_param_to_asn1                1084    EXIST::FUNCTION:
@@ -2808,7 +2808,7 @@ FIPS_corrupt_rsa                        3249	NOEXIST::FUNCTION:
 FIPS_selftest_des                       3250    NOEXIST::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::FUNCTION:
 FIPS_selftest_dsa                       3254    NOEXIST::FUNCTION:
 EVP_aes_256_cfb8                        3255    EXIST::FUNCTION:AES
 FIPS_allow_md5                          3256    NOEXIST::FUNCTION:
@@ -2838,23 +2838,23 @@ AES_cfb1_encrypt                        3279	EXIST::FUNCTION:AES
 EVP_des_ede3_cfb1                       3280    EXIST::FUNCTION:DES
 FIPS_rand_check                         3281    NOEXIST::FUNCTION:
 FIPS_md5_allowed                        3282    NOEXIST::FUNCTION:
-FIPS_mode                               3283    NOEXIST::FUNCTION:
+FIPS_mode                               3283    EXIST::FUNCTION:
 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:
+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_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    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_MD5_Init                        3293    EXIST:OPENSSL_FIPS:FUNCTION:MD5
+private_RC4_set_key                     3294    EXIST::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:
@@ -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:
@@ -2906,7 +2906,7 @@ STORE_parse_attrs_start                 3343	NOEXIST::FUNCTION:
 POLICY_CONSTRAINTS_free                 3344    EXIST::FUNCTION:
 EVP_PKEY_add1_attr_by_NID               3345    EXIST::FUNCTION:
 BN_nist_mod_192                         3346    EXIST::FUNCTION:
-EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC
+EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC,EC2M
 STORE_set_method                        3348    NOEXIST::FUNCTION:
 GENERAL_SUBTREE_free                    3349    EXIST::FUNCTION:
 NAME_CONSTRAINTS_it                     3350    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2921,14 +2921,14 @@ SHA512_Update                           3356	EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 i2d_ECPrivateKey                        3357    EXIST::FUNCTION:EC
 BN_get0_nist_prime_192                  3358    EXIST::FUNCTION:
 STORE_modify_certificate                3359    NOEXIST::FUNCTION:
-EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC
-BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:
+EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC,EC2M
+BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:EC2M
 STORE_ATTR_INFO_modify_number           3362    NOEXIST::FUNCTION:
 X509_keyid_get0                         3363    EXIST::FUNCTION:
 ENGINE_load_gmp                         3364    EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
 pitem_new                               3365    EXIST::FUNCTION:
-BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:
+BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:EC2M
 STORE_list_public_key_endp              3367    NOEXIST::FUNCTION:
 o2i_ECPublicKey                         3368    EXIST::FUNCTION:EC
 EC_KEY_copy                             3369    EXIST::FUNCTION:EC
@@ -2945,7 +2945,7 @@ X509_VERIFY_PARAM_inherit               3378	EXIST::FUNCTION:
 EC_POINT_point2bn                       3379    EXIST::FUNCTION:EC
 STORE_ATTR_INFO_set_dn                  3380    NOEXIST::FUNCTION:
 X509_policy_tree_get0_policies          3381    EXIST::FUNCTION:
-EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC
+EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC,EC2M
 STORE_destroy_method                    3383    NOEXIST::FUNCTION:
 ENGINE_unregister_STORE                 3384    EXIST::FUNCTION:ENGINE
 EVP_PKEY_get1_EC_KEY                    3385    EXIST::FUNCTION:EC
@@ -2961,7 +2961,7 @@ ENGINE_get_static_state                 3393	EXIST::FUNCTION:ENGINE
 pqueue_iterator                         3394    EXIST::FUNCTION:
 ECDSA_SIG_new                           3395    EXIST::FUNCTION:ECDSA
 OPENSSL_DIR_end                         3396    EXIST::FUNCTION:
-BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:
+BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:EC2M
 EC_POINT_bn2point                       3398    EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_set_depth             3399    EXIST::FUNCTION:
 EC_KEY_set_asn1_flag                    3400    EXIST::FUNCTION:EC
@@ -2974,7 +2974,7 @@ EC_GROUP_get_point_conv_form            3405	EXIST:VMS:FUNCTION:EC
 STORE_method_set_store_function         3406    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_in                      3407    NOEXIST::FUNCTION:
 PEM_read_bio_ECPKParameters             3408    EXIST::FUNCTION:EC
-EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC
+EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC,EC2M
 EVP_PKEY_add1_attr_by_txt               3410    EXIST::FUNCTION:
 BN_BLINDING_set_flags                   3411    EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_policies         3412    EXIST::FUNCTION:
@@ -2982,10 +2982,10 @@ 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
-BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:EC2M
 EC_KEY_up_ref                           3418    EXIST::FUNCTION:EC
 POLICY_MAPPING_free                     3419    EXIST::FUNCTION:
-BN_GF2m_mod_div                         3420    EXIST::FUNCTION:
+BN_GF2m_mod_div                         3420    EXIST::FUNCTION:EC2M
 X509_VERIFY_PARAM_set_flags             3421    EXIST::FUNCTION:
 EC_KEY_free                             3422    EXIST::FUNCTION:EC
 STORE_meth_set_list_next_fn             3423    NOEXIST::FUNCTION:
@@ -2999,7 +2999,7 @@ STORE_method_set_list_end_function      3427	NOEXIST::FUNCTION:
 pqueue_print                            3428    EXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429    EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430    EXIST::FUNCTION:EC,FP_API
-BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:
+BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:EC2M
 PEM_write_bio_X509_CERT_PAIR            3432    EXIST::FUNCTION:
 EVP_PKEY_cmp                            3433    EXIST::FUNCTION:
 X509_policy_level_node_count            3434    EXIST::FUNCTION:
@@ -3020,7 +3020,7 @@ X509_policy_node_get0_qualifiers        3448	EXIST:!VMS:FUNCTION:
 X509_pcy_node_get0_qualifiers           3448    EXIST:VMS:FUNCTION:
 STORE_list_crl_end                      3449    NOEXIST::FUNCTION:
 EVP_PKEY_set1_EC_KEY                    3450    EXIST::FUNCTION:EC
-BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:
+BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452    EXIST::FUNCTION:BIO,EC
 ECPKParameters_print_fp                 3453    EXIST::FUNCTION:EC,FP_API
 pqueue_find                             3454    EXIST::FUNCTION:
@@ -3037,7 +3037,7 @@ PKCS12_add_safes                        3464	EXIST::FUNCTION:
 BN_BLINDING_convert_ex                  3465    EXIST::FUNCTION:
 X509_policy_tree_free                   3466    EXIST::FUNCTION:
 OPENSSL_ia32cap_loc                     3467    EXIST::FUNCTION:
-BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:
+BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:EC2M
 STORE_ctrl                              3469    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_compare                 3470    NOEXIST::FUNCTION:
 BN_get0_nist_prime_224                  3471    EXIST::FUNCTION:
@@ -3061,7 +3061,7 @@ STORE_method_set_delete_function        3486	NOEXIST::FUNCTION:
 STORE_list_certificate_next             3487    NOEXIST::FUNCTION:
 ASN1_generate_nconf                     3488    EXIST::FUNCTION:
 BUF_memdup                              3489    EXIST::FUNCTION:
-BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:
+BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:EC2M
 STORE_meth_get_list_next_fn             3491    NOEXIST::FUNCTION:
 STORE_method_get_list_next_function     3491    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_get0_dn                 3492    NOEXIST::FUNCTION:
@@ -3072,7 +3072,7 @@ STORE_ATTR_INFO_free                    3496	NOEXIST::FUNCTION:
 STORE_get_private_key                   3497    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_count                 3498    EXIST::FUNCTION:
 STORE_ATTR_INFO_new                     3499    NOEXIST::FUNCTION:
-EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC
+EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC,EC2M
 STORE_meth_set_revoke_fn                3501    NOEXIST::FUNCTION:
 STORE_method_set_revoke_function        3501    NOEXIST::FUNCTION:
 STORE_store_number                      3502    NOEXIST::FUNCTION:
@@ -3088,7 +3088,7 @@ BIO_dump_indent_fp                      3511	EXIST::FUNCTION:FP_API
 EC_KEY_set_group                        3512    EXIST::FUNCTION:EC
 BUF_strndup                             3513    EXIST::FUNCTION:
 STORE_list_certificate_start            3514    NOEXIST::FUNCTION:
-BN_GF2m_mod                             3515    EXIST::FUNCTION:
+BN_GF2m_mod                             3515    EXIST::FUNCTION:EC2M
 X509_REQ_check_private_key              3516    EXIST::FUNCTION:
 EC_GROUP_get_seed_len                   3517    EXIST::FUNCTION:EC
 ERR_load_STORE_strings                  3518    NOEXIST::FUNCTION:
@@ -3117,19 +3117,19 @@ STORE_method_set_get_function           3536	NOEXIST::FUNCTION:
 STORE_modify_number                     3537    NOEXIST::FUNCTION:
 STORE_method_get_store_function         3538    NOEXIST::FUNCTION:
 STORE_store_private_key                 3539    NOEXIST::FUNCTION:
-BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:
+BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:EC2M
 RSA_setup_blinding                      3541    EXIST::FUNCTION:RSA
 BIO_s_datagram                          3542    EXIST::FUNCTION:DGRAM
 STORE_Memory                            3543    NOEXIST::FUNCTION:
 sk_find_ex                              3544    EXIST::FUNCTION:
-EC_GROUP_set_curve_GF2m                 3545    EXIST::FUNCTION:EC
+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:
+BN_GF2m_mod_sqrt                        3548    EXIST::FUNCTION:EC2M
 ECDH_set_default_method                 3549    EXIST::FUNCTION:ECDH
 EC_KEY_generate_key                     3550    EXIST::FUNCTION:EC
 SHA384_Update                           3551    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:
+BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:EC2M
 STORE_method_get_get_function           3553    NOEXIST::FUNCTION:
 STORE_meth_set_cleanup_fn               3554    NOEXIST::FUNCTION:
 STORE_method_set_cleanup_function       3554    NOEXIST::FUNCTION:
@@ -3154,7 +3154,7 @@ EC_GROUP_get_degree                     3570	EXIST::FUNCTION:EC
 ASN1_generate_v3                        3571    EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_cstr             3572    NOEXIST::FUNCTION:
 X509_policy_tree_level_count            3573    EXIST::FUNCTION:
-BN_GF2m_add                             3574    EXIST::FUNCTION:
+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:
@@ -3179,8 +3179,8 @@ STORE_store_certificate                 3593	NOEXIST::FUNCTION:
 OBJ_bsearch_ex                          3594    NOEXIST::FUNCTION:
 X509_STORE_CTX_set_default              3595    EXIST::FUNCTION:
 STORE_ATTR_INFO_set_sha1str             3596    NOEXIST::FUNCTION:
-BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:
-BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:
+BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:EC2M
+BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:EC2M
 STORE_modify_public_key                 3599    NOEXIST::FUNCTION:
 STORE_meth_get_list_start_fn            3600    NOEXIST::FUNCTION:
 STORE_method_get_list_start_function    3600    NOEXIST::FUNCTION:
@@ -3188,7 +3188,7 @@ EC_GROUP_get0_seed                      3601	EXIST::FUNCTION:EC
 STORE_store_arbitrary                   3602    NOEXIST::FUNCTION:
 STORE_meth_set_unlock_store_fn          3603    NOEXIST::FUNCTION:
 STORE_method_set_unlock_store_function  3603    NOEXIST::FUNCTION:
-BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:
+BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:EC2M
 ENGINE_set_ECDSA                        3605    EXIST::FUNCTION:ENGINE
 STORE_create_method                     3606    NOEXIST::FUNCTION:
 ECPKParameters_print                    3607    EXIST::FUNCTION:BIO,EC
@@ -3211,8 +3211,8 @@ 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
-EC_POINT_set_compressed_coordinates_GF2m 3626   EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_compr_coords_GF2m          3626    EXIST:VMS: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
 STORE_revoke_certificate                3628    NOEXIST::FUNCTION:
 BN_get0_nist_prime_256                  3629    EXIST::FUNCTION:
@@ -3241,7 +3241,7 @@ POLICY_CONSTRAINTS_it                   3649	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 STORE_get_ex_new_index                  3650    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_by_OBJ                3651    EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_policy           3652    EXIST::FUNCTION:
-BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:EC2M
 SHA256                                  3654    EXIST::FUNCTION:SHA,SHA256
 i2d_ECPrivateKey_fp                     3655    EXIST::FUNCTION:EC,FP_API
 X509_policy_tree_get0_user_policies     3656    EXIST:!VMS:FUNCTION:
@@ -3249,8 +3249,8 @@ X509_pcy_tree_get0_usr_policies         3656	EXIST:VMS:FUNCTION:
 OPENSSL_DIR_read                        3657    EXIST::FUNCTION:
 ENGINE_register_all_ECDSA               3658    EXIST::FUNCTION:ENGINE
 X509_VERIFY_PARAM_lookup                3659    EXIST::FUNCTION:
-EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC
-EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC
+EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_dup                            3661    EXIST::FUNCTION:EC
 ENGINE_get_default_ECDSA                3662    EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3663    EXIST::FUNCTION:EC
@@ -3332,7 +3332,7 @@ STORE_list_certificate_end              3734	NOEXIST::FUNCTION:
 STORE_get_crl                           3735    NOEXIST::FUNCTION:
 X509_POLICY_NODE_print                  3736    EXIST::FUNCTION:
 SHA384_Init                             3737    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC
+EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC,EC2M
 ECDSA_set_ex_data                       3739    EXIST::FUNCTION:ECDSA
 SHA384_Final                            3740    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 PKCS7_set_digest                        3741    EXIST::FUNCTION:
@@ -3364,7 +3364,7 @@ BIO_dump_cb                             3764	EXIST::FUNCTION:
 SHA256_Update                           3765    EXIST::FUNCTION:SHA,SHA256
 pqueue_insert                           3766    EXIST::FUNCTION:
 pitem_free                              3767    EXIST::FUNCTION:
-BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:
+BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:EC2M
 ENGINE_unregister_ECDSA                 3769    EXIST::FUNCTION:ENGINE
 BN_BLINDING_set_thread_id               3770    EXIST::FUNCTION:DEPRECATED
 get_rfc3526_prime_8192                  3771    EXIST::FUNCTION:
@@ -3670,7 +3670,7 @@ 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    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_rand_set_dt                        4062    NOEXIST::FUNCTION:
 CRYPTO_dbg_pop_info                     4063    NOEXIST::FUNCTION:
@@ -3695,14 +3695,14 @@ 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:
+BN_X931_derive_prime_ex                 4085    EXIST::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:
-private_Camellia_set_key                4092    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
@@ -4194,4 +4194,119 @@ OPENSSL_memcmp                          4565	EXIST::FUNCTION:
 OPENSSL_strncasecmp                     4566    EXIST::FUNCTION:
 OPENSSL_gmtime                          4567    EXIST::FUNCTION:
 OPENSSL_gmtime_adj                      4568    EXIST::FUNCTION:
-ENGINE_load_aesni                       4569    EXIST::FUNCTION:ENGINE
+SRP_VBASE_get_by_user                   4569    EXIST::FUNCTION:SRP
+SRP_Calc_server_key                     4570    EXIST::FUNCTION:SRP
+SRP_create_verifier                     4571    EXIST::FUNCTION:SRP
+SRP_create_verifier_BN                  4572    EXIST::FUNCTION:SRP
+SRP_Calc_u                              4573    EXIST::FUNCTION:SRP
+SRP_VBASE_free                          4574    EXIST::FUNCTION:SRP
+SRP_Calc_client_key                     4575    EXIST::FUNCTION:SRP
+SRP_get_default_gN                      4576    EXIST::FUNCTION:SRP
+SRP_Calc_x                              4577    EXIST::FUNCTION:SRP
+SRP_Calc_B                              4578    EXIST::FUNCTION:SRP
+SRP_VBASE_new                           4579    EXIST::FUNCTION:SRP
+SRP_check_known_gN_param                4580    EXIST::FUNCTION:SRP
+SRP_Calc_A                              4581    EXIST::FUNCTION:SRP
+SRP_Verify_A_mod_N                      4582    EXIST::FUNCTION:SRP
+SRP_VBASE_init                          4583    EXIST::FUNCTION:SRP
+SRP_Verify_B_mod_N                      4584    EXIST::FUNCTION:SRP
+EC_KEY_set_public_key_affine_coordinates 4585   EXIST:!VMS:FUNCTION:EC
+EC_KEY_set_pub_key_aff_coords           4585    EXIST:VMS:FUNCTION:EC
+EVP_aes_192_ctr                         4586    EXIST::FUNCTION:AES
+EVP_PKEY_meth_get0_info                 4587    EXIST::FUNCTION:
+EVP_PKEY_meth_copy                      4588    EXIST::FUNCTION:
+ERR_add_error_vdata                     4589    EXIST::FUNCTION:
+EVP_aes_128_ctr                         4590    EXIST::FUNCTION:AES
+EVP_aes_256_ctr                         4591    EXIST::FUNCTION:AES
+EC_GFp_nistp224_method                  4592    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_KEY_get_flags                        4593    EXIST::FUNCTION:EC
+RSA_padding_add_PKCS1_PSS_mgf1          4594    EXIST::FUNCTION:RSA
+EVP_aes_128_xts                         4595    EXIST::FUNCTION:AES
+private_SHA224_Init                     4596    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+private_AES_set_decrypt_key             4597    EXIST::FUNCTION:AES
+private_WHIRLPOOL_Init                  4598    EXIST:OPENSSL_FIPS:FUNCTION:WHIRLPOOL
+EVP_aes_256_xts                         4599    EXIST::FUNCTION:AES
+private_SHA512_Init                     4600    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_128_gcm                         4601    EXIST::FUNCTION:AES
+EC_KEY_clear_flags                      4602    EXIST::FUNCTION:EC
+EC_KEY_set_flags                        4603    EXIST::FUNCTION:EC
+private_DES_set_key_unchecked           4604    EXIST:OPENSSL_FIPS:FUNCTION:DES
+EVP_aes_256_ccm                         4605    EXIST::FUNCTION:AES
+private_AES_set_encrypt_key             4606    EXIST::FUNCTION:AES
+RSA_verify_PKCS1_PSS_mgf1               4607    EXIST::FUNCTION:RSA
+private_SHA1_Init                       4608    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA1
+EVP_aes_128_ccm                         4609    EXIST::FUNCTION:AES
+private_SEED_set_key                    4610    EXIST:OPENSSL_FIPS:FUNCTION:SEED
+EVP_aes_192_gcm                         4611    EXIST::FUNCTION:AES
+X509_ALGOR_set_md                       4612    EXIST::FUNCTION:
+private_SHA256_Init                     4613    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+RAND_init_fips                          4614    EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_256_gcm                         4615    EXIST::FUNCTION:AES
+private_SHA384_Init                     4616    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_192_ccm                         4617    EXIST::FUNCTION:AES
+CMAC_CTX_copy                           4618    EXIST::FUNCTION:
+CMAC_CTX_free                           4619    EXIST::FUNCTION:
+CMAC_CTX_get0_cipher_ctx                4620    EXIST::FUNCTION:
+CMAC_CTX_cleanup                        4621    EXIST::FUNCTION:
+CMAC_Init                               4622    EXIST::FUNCTION:
+CMAC_Update                             4623    EXIST::FUNCTION:
+CMAC_resume                             4624    EXIST::FUNCTION:
+CMAC_CTX_new                            4625    EXIST::FUNCTION:
+CMAC_Final                              4626    EXIST::FUNCTION:
+CRYPTO_ctr128_encrypt_ctr32             4627    EXIST::FUNCTION:
+CRYPTO_gcm128_release                   4628    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt_ccm64             4629    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt                   4630    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt                   4631    EXIST::FUNCTION:
+CRYPTO_xts128_encrypt                   4632    EXIST::FUNCTION:
+EVP_rc4_hmac_md5                        4633    EXIST::FUNCTION:MD5,RC4
+CRYPTO_nistcts128_decrypt_block         4634    EXIST::FUNCTION:
+CRYPTO_gcm128_setiv                     4635    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt               4636    EXIST::FUNCTION:
+EVP_aes_128_cbc_hmac_sha1               4637    EXIST::FUNCTION:AES,SHA,SHA1
+CRYPTO_gcm128_tag                       4638    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt_ccm64             4639    EXIST::FUNCTION:
+ENGINE_load_rdrand                      4640    EXIST::FUNCTION:ENGINE
+CRYPTO_ccm128_setiv                     4641    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt_block         4642    EXIST::FUNCTION:
+CRYPTO_gcm128_aad                       4643    EXIST::FUNCTION:
+CRYPTO_ccm128_init                      4644    EXIST::FUNCTION:
+CRYPTO_nistcts128_decrypt               4645    EXIST::FUNCTION:
+CRYPTO_gcm128_new                       4646    EXIST::FUNCTION:
+CRYPTO_ccm128_tag                       4647    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt                   4648    EXIST::FUNCTION:
+CRYPTO_ccm128_aad                       4649    EXIST::FUNCTION:
+CRYPTO_gcm128_init                      4650    EXIST::FUNCTION:
+CRYPTO_gcm128_decrypt                   4651    EXIST::FUNCTION:
+ENGINE_load_rsax                        4652    EXIST::FUNCTION:ENGINE
+CRYPTO_gcm128_decrypt_ctr32             4653    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt_ctr32             4654    EXIST::FUNCTION:
+CRYPTO_gcm128_finish                    4655    EXIST::FUNCTION:
+EVP_aes_256_cbc_hmac_sha1               4656    EXIST::FUNCTION:AES,SHA,SHA1
+PKCS5_pbkdf2_set                        4657    EXIST::FUNCTION:
+CMS_add0_recipient_password             4658    EXIST::FUNCTION:CMS
+CMS_decrypt_set1_password               4659    EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_password         4660    EXIST::FUNCTION:CMS
+RAND_set_fips_drbg_type                 4661    EXIST:OPENSSL_FIPS:FUNCTION:
+X509_REQ_sign_ctx                       4662    EXIST::FUNCTION:EVP
+RSA_PSS_PARAMS_new                      4663    EXIST::FUNCTION:RSA
+X509_CRL_sign_ctx                       4664    EXIST::FUNCTION:EVP
+X509_signature_dump                     4665    EXIST::FUNCTION:EVP
+d2i_RSA_PSS_PARAMS                      4666    EXIST::FUNCTION:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSA_PSS_PARAMS_free                     4668    EXIST::FUNCTION:RSA
+X509_sign_ctx                           4669    EXIST::FUNCTION:EVP
+i2d_RSA_PSS_PARAMS                      4670    EXIST::FUNCTION:RSA
+ASN1_item_sign_ctx                      4671    EXIST::FUNCTION:EVP
+EC_GFp_nistp521_method                  4672    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_GFp_nistp256_method                  4673    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+OPENSSL_stderr                          4674    EXIST::FUNCTION:
+OPENSSL_cpuid_setup                     4675    EXIST::FUNCTION:
+OPENSSL_showfatal                       4676    EXIST::FUNCTION:
+BIO_new_dgram_sctp                      4677    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_msg_waiting              4678    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_wait_for_dry             4679    EXIST::FUNCTION:SCTP
+BIO_s_datagram_sctp                     4680    EXIST::FUNCTION:DGRAM,SCTP
+BIO_dgram_is_sctp                       4681    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_notification_cb          4682    EXIST::FUNCTION:SCTP