#define BN_BLINDING_set_flags FIPS_bn_blinding_set_flags
#define BN_BLINDING_thread_id FIPS_bn_blinding_thread_id
#define BN_BLINDING_update FIPS_bn_blinding_update
+#define BN_BLINDING_get_thread_id FIPS_bn_blinding_get_thread_id
+#define BN_BLINDING_set_thread_id FIPS_bn_blinding_set_thread_id
#define BN_CTX_end FIPS_bn_ctx_end
+#define BN_CTX_init FIPS_bn_ctx_init
#define BN_CTX_free FIPS_bn_ctx_free
#define BN_CTX_get FIPS_bn_ctx_get
#define BN_CTX_new FIPS_bn_ctx_new
#define BN_ucmp FIPS_bn_ucmp
#define BN_usub FIPS_bn_usub
#define BN_value_one FIPS_bn_value_one
+#define BN_set_params FIPS_bn_set_params
+#define BN_get_params FIPS_bn_get_params
#define BN_version FIPS_bn_version
#define BUF_memdup FIPS_buf_memdup
#define BUF_strdup FIPS_buf_strdup
#define BUF_strlcat FIPS_buf_strlcat
#define BUF_strlcpy FIPS_buf_strlcpy
#define BUF_strndup FIPS_buf_strndup
+#define DllMain fips_dllmain
#define CRYPTO_THREADID_cmp FIPS_crypto_threadid_cmp
#define CRYPTO_THREADID_cpy FIPS_crypto_threadid_cpy
#define CRYPTO_THREADID_current FIPS_crypto_threadid_current
#define CRYPTO_THREADID_set_callback FIPS_crypto_threadid_set_callback
#define CRYPTO_THREADID_set_numeric FIPS_crypto_threadid_set_numeric
#define CRYPTO_THREADID_set_pointer FIPS_crypto_threadid_set_pointer
+#define CRYPTO_get_id_callback FIPS_crypto_get_id_callback
+#define CRYPTO_set_id_callback FIPS_crypto_set_id_callback
+#define CRYPTO_thread_id FIPS_crypto_thread_id
+#define CRYPTO_ccm128_aad FIPS_crypto_ccm128_aad
+#define CRYPTO_ccm128_decrypt FIPS_crypto_ccm128_decrypt
+#define CRYPTO_ccm128_decrypt_ccm64 FIPS_crypto_ccm128_decrypt_ccm64
+#define CRYPTO_ccm128_encrypt FIPS_crypto_ccm128_encrypt
+#define CRYPTO_ccm128_encrypt_ccm64 FIPS_crypto_ccm128_encrypt_ccm64
+#define CRYPTO_ccm128_init FIPS_crypto_ccm128_init
+#define CRYPTO_ccm128_setiv FIPS_crypto_ccm128_setiv
+#define CRYPTO_ccm128_tag FIPS_crypto_ccm128_tag
#define CRYPTO_cbc128_decrypt FIPS_crypto_cbc128_decrypt
#define CRYPTO_cbc128_encrypt FIPS_crypto_cbc128_encrypt
#define CRYPTO_cfb128_1_encrypt FIPS_crypto_cfb128_1_encrypt
#define CRYPTO_gcm128_setiv FIPS_crypto_gcm128_setiv
#define CRYPTO_gcm128_tag FIPS_crypto_gcm128_tag
#define CRYPTO_ofb128_encrypt FIPS_crypto_ofb128_encrypt
+#define CRYPTO_xts128_encrypt FIPS_crypto_xts128_encrypt
#define DES_cfb64_encrypt FIPS_des_cfb64_encrypt
#define DES_cfb_encrypt FIPS_des_cfb_encrypt
#define DES_check_key_parity FIPS_des_check_key_parity
#define EC_KEY_set_asn1_flag FIPS_ec_key_set_asn1_flag
#define EC_KEY_set_conv_form FIPS_ec_key_set_conv_form
#define EC_KEY_set_enc_flags FIPS_ec_key_set_enc_flags
+#define EC_KEY_set_flags FIPS_ec_key_set_flags
+#define EC_KEY_clear_flags FIPS_ec_key_clear_flags
+#define EC_KEY_get_flags FIPS_ec_key_get_flags
#define EC_KEY_set_group FIPS_ec_key_set_group
#define EC_KEY_set_private_key FIPS_ec_key_set_private_key
#define EC_KEY_set_public_key FIPS_ec_key_set_public_key
#define EC_POINTs_mul FIPS_ec_points_mul
#define EC_get_builtin_curves FIPS_ec_get_builtin_curves
#define EVP_aes_128_cbc FIPS_evp_aes_128_cbc
+#define EVP_aes_128_ccm FIPS_evp_aes_128_ccm
#define EVP_aes_128_cfb1 FIPS_evp_aes_128_cfb1
#define EVP_aes_128_cfb128 FIPS_evp_aes_128_cfb128
#define EVP_aes_128_cfb8 FIPS_evp_aes_128_cfb8
#define EVP_aes_128_ecb FIPS_evp_aes_128_ecb
#define EVP_aes_128_gcm FIPS_evp_aes_128_gcm
#define EVP_aes_128_ofb FIPS_evp_aes_128_ofb
+#define EVP_aes_128_xts FIPS_evp_aes_128_xts
#define EVP_aes_192_cbc FIPS_evp_aes_192_cbc
+#define EVP_aes_192_ccm FIPS_evp_aes_192_ccm
#define EVP_aes_192_cfb1 FIPS_evp_aes_192_cfb1
#define EVP_aes_192_cfb128 FIPS_evp_aes_192_cfb128
#define EVP_aes_192_cfb8 FIPS_evp_aes_192_cfb8
#define EVP_aes_192_gcm FIPS_evp_aes_192_gcm
#define EVP_aes_192_ofb FIPS_evp_aes_192_ofb
#define EVP_aes_256_cbc FIPS_evp_aes_256_cbc
+#define EVP_aes_256_ccm FIPS_evp_aes_256_ccm
#define EVP_aes_256_cfb1 FIPS_evp_aes_256_cfb1
#define EVP_aes_256_cfb128 FIPS_evp_aes_256_cfb128
#define EVP_aes_256_cfb8 FIPS_evp_aes_256_cfb8
#define EVP_aes_256_ecb FIPS_evp_aes_256_ecb
#define EVP_aes_256_gcm FIPS_evp_aes_256_gcm
#define EVP_aes_256_ofb FIPS_evp_aes_256_ofb
+#define EVP_aes_256_xts FIPS_evp_aes_256_xts
#define EVP_des_ede FIPS_evp_des_ede
#define EVP_des_ede3 FIPS_evp_des_ede3
#define EVP_des_ede3_cbc FIPS_evp_des_ede3_cbc
#define OPENSSL_stderr FIPS_openssl_stderr
#define OpenSSLDie FIPS_openssldie
#define PKCS1_MGF1 FIPS_pkcs1_mgf1
-#define RAND_SSLeay FIPS_rand_ssleay
-#define RAND_add FIPS_rand_add
-#define RAND_bytes FIPS_ossl_rand_bytes
-#define RAND_cleanup FIPS_rand_cleanup
-#define RAND_egd FIPS_rand_egd
-#define RAND_egd_bytes FIPS_rand_egd_bytes
-#define RAND_file_name FIPS_rand_file_name
-#define RAND_get_rand_method FIPS_rand_get_rand_method
-#define RAND_load_file FIPS_rand_load_file
-#define RAND_poll FIPS_rand_poll
-#define RAND_pseudo_bytes FIPS_rand_pseudo_bytes
-#define RAND_query_egd_bytes FIPS_rand_query_egd_bytes
-#define RAND_seed FIPS_ossl_rand_seed
-#define RAND_set_rand_method FIPS_rand_set_rand_method
-#define RAND_status FIPS_ossl_rand_status
-#define RAND_version FIPS_rand_version
-#define RAND_write_file FIPS_rand_write_file
#define RSA_PKCS1_SSLeay FIPS_rsa_pkcs1_ssleay
#define RSA_X931_derive_ex FIPS_rsa_x931_derive_ex
#define RSA_X931_generate_key_ex FIPS_rsa_x931_generate_key_ex
#define bn_add_part_words fips_bn_add_part_words
#define bn_cmp_part_words fips_bn_cmp_part_words
#define bn_cmp_words fips_bn_cmp_words
+#define bn_dup_expand fips_bn_dup_expand
#define bn_expand2 fips_bn_expand2
#define bn_mul_high fips_bn_mul_high
#define bn_mul_low_normal fips_bn_mul_low_normal
#define ec_wNAF_precompute_mult fips_ec_wnaf_precompute_mult
#define int_bn_mod_inverse fips_int_bn_mod_inverse
#define cleanse_ctr fips_cleanse_ctr
+#define DH_compute_key_padded FIPS_dh_compute_key_padded
+#define ECDH_OpenSSL FIPS_ecdh_openssl
+#define ECDH_compute_key FIPS_ecdh_compute_key
+
+#define CMAC_CTX_cleanup FIPS_cmac_ctx_cleanup
+#define CMAC_CTX_copy FIPS_cmac_ctx_copy
+#define CMAC_CTX_free FIPS_cmac_ctx_free
+#define CMAC_CTX_get0_cipher_ctx FIPS_cmac_ctx_get0_cipher_ctx
+#define CMAC_CTX_new FIPS_cmac_ctx_new
+#define CMAC_Init FIPS_cmac_init
+#define CMAC_Update FIPS_cmac_update
+#define CMAC_Final FIPS_cmac_final
+#define CMAC_resume FIPS_cmac_resume
+
/* assembler symbols */
#define gcm_gmult_4bit_x86 fips_gcm_gmult_4bit_x86
#define gcm_ghash_4bit_x86 fips_gcm_ghash_4bit_x86
#define DES_encrypt2 FIPS_des_encrypt2
#define DES_encrypt3 FIPS_des_encrypt3
#define DES_ncbc_encrypt FIPS_des_ncbc_encrypt
+#define OPENSSL_altivec_probe FIPS_openssl_altivec_probe
#define OPENSSL_atomic_add FIPS_openssl_atomic_add
#define OPENSSL_cleanse FIPS_openssl_cleanse
#define OPENSSL_cpuid_setup FIPS_openssl_cpuid_setup
#define OPENSSL_ia32_cpuid FIPS_openssl_ia32_cpuid
#define OPENSSL_ia32cap_P FIPS_openssl_ia32cap_p
+#define OPENSSL_instrument_bus FIPS_openssl_instrument_bus
+#define OPENSSL_instrument_bus2 FIPS_openssl_instrument_bus2
+#define OPENSSL_ppc64_probe FIPS_openssl_ppc64_probe
#define OPENSSL_rdtsc FIPS_openssl_rdtsc
#define OPENSSL_wipe_cpu FIPS_openssl_wipe_cpu
#define SHA256 FIPS_sha256
#define bn_mul_comba4 fips_bn_mul_comba4
#define bn_mul_comba8 fips_bn_mul_comba8
#define bn_mul_mont fips_bn_mul_mont
+#define bn_mul_mont_fpu64 fips_bn_mul_mont_fpu64
+#define bn_mul_mont_int fips_bn_mul_mont_int
#define bn_mul_words fips_bn_mul_words
#define bn_sqr_comba4 fips_bn_sqr_comba4
#define bn_sqr_comba8 fips_bn_sqr_comba8
#define OPENSSL_far_spin fips_openssl_far_spin
#define OPENSSL_indirect_call fips_openssl_indirect_call
#define OPENSSL_instrument_halt fips_openssl_instrument_halt
+#define OPENSSL_armcap fips_openssl_armcap
#define aesni_cbc_encrypt fips_aesni_cbc_encrypt
#define aesni_decrypt fips_aesni_decrypt
#define aesni_set_decrypt_key fips_aesni_set_decrypt_key
#define aesni_set_encrypt_key fips_aesni_set_encrypt_key
+#define bn_GF2m_mul_2x2 fips_bn_GF2m_mul_2x2
+#define gcm_ghash_neon fips_gcm_ghash_neon
+#define gcm_gmult_neon fips_gcm_gmult_neon