diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-09-16 11:37:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-09-16 11:37:03 +0000 |
| commit | fced277486d24b6421f7a7ef38e7138f717923b4 (patch) | |
| tree | 0d3eb842f9f66d0daa35748f1f882db2a15f68b3 | |
| parent | 3d1be455ce499713de6d98ad3c7e73c56dfed0b8 (diff) | |
| download | openssl-fced277486d24b6421f7a7ef38e7138f717923b4.tar.gz | |
conf/hmac FIPS merge.
| -rw-r--r-- | crypto/conf/conf_mall.c | 2 | ||||
| -rw-r--r-- | crypto/hmac/hmac.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 4ba40cf44c..6c692e99d5 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -63,6 +63,7 @@ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> +#include <openssl/evp.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif @@ -76,5 +77,6 @@ void OPENSSL_load_builtin_modules(void) #ifndef OPENSSL_NO_ENGINE ENGINE_add_conf_module(); #endif + EVP_add_alg_module(); } diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index 1d140f7adb..cbc1c76a57 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -61,6 +61,8 @@ #include "cryptlib.h" #include <openssl/hmac.h> +#ifndef OPENSSL_FIPS + void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, ENGINE *impl) { @@ -178,3 +180,4 @@ void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); } +#endif |