X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=fips%2Ffipssyms.h;h=5b1e18878597bdbc2ce07f897bc4dd8968c07ef5;hp=fed9b9a59f9fe2b18eba4ab7e7937efa37dbde5e;hb=85a1a836a2b865cb0ff8ee15647e5c5a8c7e464f;hpb=9ebc37e667704041f9d31f916f41e7d2e0b3feb0

diff --git a/fips/fipssyms.h b/fips/fipssyms.h
index fed9b9a59f..5b1e188785 100644
--- a/fips/fipssyms.h
+++ b/fips/fipssyms.h
@@ -1,3 +1,57 @@
+
+/* Where necessary redirect standard OpenSSL APIs to FIPS versions */
+
+#define CRYPTO_lock FIPS_lock
+#define CRYPTO_add_lock FIPS_add_lock
+#define CRYPTO_malloc FIPS_malloc
+#define CRYPTO_free FIPS_free
+
+#define ERR_put_error FIPS_put_error
+#define ERR_add_error_data FIPS_add_error_data
+
+#define EVP_MD_CTX_init FIPS_md_ctx_init
+#define EVP_MD_CTX_cleanup FIPS_md_ctx_cleanup
+#define EVP_MD_CTX_create FIPS_md_ctx_create
+#define EVP_MD_CTX_destroy FIPS_md_ctx_destroy
+#define EVP_DigestInit_ex(ctx, type, impl) FIPS_digestinit(ctx, type)
+#define EVP_DigestInit FIPS_digestinit
+#define EVP_DigestUpdate FIPS_digestupdate
+#define EVP_Digest(data, count, md, size, type, impl) \
+			FIPS_digest(data, count, md, size, type)
+#define EVP_DigestFinal_ex FIPS_digestfinal
+#define EVP_MD_CTX_copy_ex FIPS_md_ctx_copy
+
+#define EVP_CipherInit_ex(ctx, cipher, impl, key, iv, enc) \
+				FIPS_cipherinit(ctx, cipher, key, iv, enc)
+
+#define EVP_CipherInit FIPS_cipherinit
+
+#define EVP_CIPHER_CTX_init FIPS_cipher_ctx_init
+#define EVP_CIPHER_CTX_cleanup FIPS_cipher_ctx_cleanup
+#define EVP_Cipher FIPS_cipher
+#define EVP_CIPHER_CTX_ctrl FIPS_cipher_ctx_ctrl
+#define EVP_CIPHER_CTX_new FIPS_cipher_ctx_new
+#define EVP_CIPHER_CTX_free FIPS_cipher_ctx_free
+#define EVP_CIPHER_CTX_copy FIPS_cipher_ctx_copy
+#define EVP_CIPHER_CTX_set_key_length FIPS_cipher_ctx_set_key_length
+
+#define DSA_SIG_new FIPS_dsa_sig_new
+#define DSA_SIG_free FIPS_dsa_sig_free
+
+#define ECDSA_SIG_new FIPS_ecdsa_sig_new
+#define ECDSA_SIG_free FIPS_ecdsa_sig_free
+
+#define ecdsa_check fips_ecdsa_check
+#define ecdh_check fips_ecdh_check
+
+#define RAND_bytes FIPS_rand_bytes
+#define RAND_pseudo_bytes FIPS_rand_pseudo_bytes
+#define RAND_add FIPS_rand_add
+#define RAND_seed FIPS_rand_seed
+#define RAND_status FIPS_rand_status
+
+/* Rename symbols so they don't clash with standard OpenSSL */
+
 #define AES_cfb128_encrypt fips_aes_cfb128_encrypt
 #define AES_cfb1_encrypt fips_aes_cfb1_encrypt
 #define AES_cfb8_encrypt fips_aes_cfb8_encrypt
@@ -342,7 +396,7 @@
 #define EVP_des_ede_cfb64 FIPS_evp_des_ede_cfb64
 #define EVP_des_ede_ecb FIPS_evp_des_ede_ecb
 #define EVP_des_ede_ofb FIPS_evp_des_ede_ofb
-#define EVP_null FIPS_evp_null
+#define EVP_enc_null FIPS_evp_enc_null
 #define EVP_sha1 FIPS_evp_sha1
 #define EVP_dss FIPS_evp_dss
 #define EVP_dss1 FIPS_evp_dss1
@@ -437,6 +491,7 @@
 #define bn_sqr_recursive fips_bn_sqr_recursive
 #define dsa_builtin_paramgen fips_dsa_builtin_paramgen
 #define dsa_builtin_paramgen2 fips_dsa_builtin_paramgen2
+#define dsa_paramgen_check_g fips_dsa_paramgen_check_g
 #define ec_GF2m_have_precompute_mult fips_ec_gf2m_have_precompute_mult
 #define ec_GF2m_precompute_mult fips_ec_gf2m_precompute_mult
 #define ec_GF2m_simple_add fips_ec_gf2m_simple_add
@@ -567,6 +622,7 @@
 #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_sqr_mont fips_bn_sqr_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
@@ -599,3 +655,23 @@
 #define gcm_gmult_neon fips_gcm_gmult_neon
 #define aesni_xts_decrypt fips_aesni_xts_decrypt
 #define aesni_xts_encrypt fips_aesni_xts_encrypt
+#define OPENSSL_ia32_rdrand fips_openssl_ia32_rdrand
+#define OPENSSL_armcap_P fips_openssl_armcap_P
+#define _armv7_neon_probe _fips_armv7_neon_probe
+#define _armv7_tick _fips_armv7_tick
+#define _sparcv9_rdtick _fips_sparcv9_rdtick
+#define _sparcv9_vis1_probe _fips_sparcv9_vis1_probe
+#define _sparcv9_vis2_probe _fips_sparcv9_vis2_probe
+#define _sparcv9_fmadd_probe _fips_sparcv9_fmadd_probe
+#define _sparcv9_vis1_instrument _fips_sparcv9_vis1_instrument
+#define bn_mul_mont_gather5 fips_bn_mul_mont_gather5
+#define bn_scatter5 fips_bn_scatter5
+#define bn_gather5 fips_bn_gather5
+
+#if defined(_MSC_VER)
+# pragma const_seg("fipsro$b")
+# pragma const_seg()
+# define __fips_constseg __declspec(allocate("fipsro$b"))
+#else
+# define __fips_constseg
+#endif