diff options
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | crypto/hmac/hmac.c | 3 | ||||
| -rw-r--r-- | fips/Makefile | 2 | ||||
| -rw-r--r-- | fips/fipshashes.c | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index fa365f8630..09a7b53db4 100644 --- a/Makefile.org +++ b/Makefile.org @@ -187,7 +187,7 @@ SDIRS= objects \ buffer bio stack lhash rand err \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 -FDIRS= sha1 rand des aes dsa rsa dh +FDIRS= sha1 rand des aes dsa rsa dh hmac # tests to perform. "alltests" is a special word indicating that all tests # should be performed. diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index 06ee80761f..2df670f245 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -61,6 +61,8 @@ #include <openssl/hmac.h> #include "cryptlib.h" +#ifndef OPENSSL_FIPS + void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, ENGINE *impl) { @@ -187,3 +189,4 @@ void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); } +#endif diff --git a/fips/Makefile b/fips/Makefile index 2b09e03344..be3ab1e296 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -25,7 +25,7 @@ CFLAGS= $(INCLUDE) $(CFLAG) LIBS= -FDIRS=sha1 rand des aes dsa rsa dh +FDIRS=sha1 rand des aes dsa rsa dh hmac GENERAL=Makefile README fips-lib.com install.com diff --git a/fips/fipshashes.c b/fips/fipshashes.c index 424def70ea..7adf37a813 100644 --- a/fips/fipshashes.c +++ b/fips/fipshashes.c @@ -29,4 +29,5 @@ const char * const FIPS_source_hashes[] = { "HMAC-SHA1(sha1/asm/fips-sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63", "HMAC-SHA1(sha1/fips_sha_locl.h)= c1b4c82eec5f0ee119658456690f3ea9d77ed1c5", "HMAC-SHA1(sha1/fips_md32_common.h)= 08a057a7b94acf5df4301ea6c894ce14082e1ec4", +"HMAC-SHA1(hmac/fips_hmac.c)= a477cec1da76c0092979c4a875b6469339bff7ef", }; |