generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conf/hmac FIPS merge.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-09-16 11:37:03 +00:00
parent 3d1be455ce
commit fced277486
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/conf/conf_mall.c
View File

@ -63,6 +63,7 @@
#include <openssl/dso.h> #include <openssl/dso.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include <openssl/evp.h>
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h> #include <openssl/engine.h>
#endif #endif
@ -76,5 +77,6 @@ void OPENSSL_load_builtin_modules(void)
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
ENGINE_add_conf_module(); ENGINE_add_conf_module();
#endif #endif
EVP_add_alg_module();
} }

3
crypto/hmac/hmac.c
View File

@ -61,6 +61,8 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/hmac.h> #include <openssl/hmac.h>
#ifndef OPENSSL_FIPS
void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
const EVP_MD *md, ENGINE *impl) 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); EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
} }
#endif