Use "resp" for default directory name for .rsp files.

[openssl.git] / fips / fips.h

diff --git a/fips/fips.h b/fips/fips.h
index 86985c27ca1f75ea0b0fc732b2d7231061225dfd..c8a766e37a6b015903c358dffe7609cf508c9d5a 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -76,6 +76,10 @@ struct ec_method_st;
 struct ecdsa_method;
 struct dh_method;
 struct CMAC_CTX_st;
+struct hmac_ctx_st;
+
+unsigned long FIPS_module_version(void);
+const char *FIPS_module_version_text(void);
 
 int FIPS_module_mode_set(int onoff);
 int FIPS_module_mode(void);
@@ -211,7 +215,7 @@ int FIPS_rsa_verify_digest(struct rsa_st *rsa,
                        const struct env_md_st *mgf1Hash,
                        const unsigned char *sigbuf, unsigned int siglen);
 
-#ifndef OPENSSL_FIPSCANISTER
+#ifdef OPENSSL_FIPSCAPABLE
 
 int FIPS_digestinit(EVP_MD_CTX *ctx, const EVP_MD *type);
 int FIPS_digestupdate(EVP_MD_CTX *ctx, const void *data, size_t count);
@@ -265,6 +269,7 @@ const EVP_CIPHER *FIPS_evp_des_ede_cbc(void);
 const EVP_CIPHER *FIPS_evp_des_ede_cfb64(void);
 const EVP_CIPHER *FIPS_evp_des_ede_ecb(void);
 const EVP_CIPHER *FIPS_evp_des_ede_ofb(void);
+const EVP_CIPHER *FIPS_evp_enc_null(void);
 const EVP_MD *FIPS_evp_sha1(void);
 const EVP_MD *FIPS_evp_sha224(void);
 const EVP_MD *FIPS_evp_sha256(void);
@@ -309,60 +314,13 @@ int FIPS_cmac_final(struct CMAC_CTX_st *ctx, unsigned char *out,
                                                        size_t *poutlen);
 void FIPS_cmac_ctx_cleanup(struct CMAC_CTX_st *ctx);
 
-#endif
-
-/* Where necessary redirect standard OpenSSL APIs to FIPS versions */
-
-#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
-
-#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
+void FIPS_hmac_ctx_cleanup(struct hmac_ctx_st *ctx);
+int FIPS_hmac_init_ex(struct hmac_ctx_st *ctx, const void *key, int len,
+                 const EVP_MD *md, ENGINE *impl);
+int FIPS_hmac_update(struct hmac_ctx_st *ctx,
+                       const unsigned char *data, size_t len);
+int FIPS_hmac_final(struct hmac_ctx_st *ctx,
+                       unsigned char *md, unsigned int *len);
 
 #endif