Add prototype for null cipher.

[openssl.git] / fips / fips.h

diff --git a/fips/fips.h b/fips/fips.h
index 86985c27ca1f75ea0b0fc732b2d7231061225dfd..44fd3a9dd84c515dc52b6baf10075901540238a9 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -76,6 +76,7 @@ struct ec_method_st;
 struct ecdsa_method;
 struct dh_method;
 struct CMAC_CTX_st;
+struct hmac_ctx_st;
 
 int FIPS_module_mode_set(int onoff);
 int FIPS_module_mode(void);
@@ -211,7 +212,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 +266,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,6 +311,14 @@ 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);
 
+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
 
 /* Where necessary redirect standard OpenSSL APIs to FIPS versions */