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

FIPS HMAC changes:

Browse Source 
Use EVP macros.

Use tiny EVP in FIPS mode.
This commit is contained in:
Dr. Stephen Henson 2011-01-26 16:15:38 +00:00
parent df6de39fe7
commit 6dff52e858
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/hmac/hmac.c
View File

@ -55,6 +55,9 @@
* copied and put under another distribution licence * copied and put under another distribution licence
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
#define OPENSSL_FIPSEVP
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -78,7 +81,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
if (key != NULL) if (key != NULL)
{ {
reset=1; reset=1;
j=EVP_MD_block_size(md); j=M_EVP_MD_block_size(md);
OPENSSL_assert(j <= (int)sizeof(ctx->key)); OPENSSL_assert(j <= (int)sizeof(ctx->key));
if (j < len) if (j < len)
{ {
@ -107,14 +110,14 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
pad[i]=0x36^ctx->key[i]; pad[i]=0x36^ctx->key[i];
if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl)) if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl))
goto err; goto err;
if (!EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md))) if (!EVP_DigestUpdate(&ctx->i_ctx,pad,M_EVP_MD_block_size(md)))
goto err; goto err;
for (i=0; i<HMAC_MAX_MD_CBLOCK; i++) for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
pad[i]=0x5c^ctx->key[i]; pad[i]=0x5c^ctx->key[i];
if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl)) if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl))
goto err; goto err;
if (!EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md))) if (!EVP_DigestUpdate(&ctx->o_ctx,pad,M_EVP_MD_block_size(md)))
goto err; goto err;
} }
if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx)) if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx))
@ -163,11 +166,12 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
{ {
if (!EVP_MD_CTX_copy(&dctx->i_ctx, &sctx->i_ctx)) HMAC_CTX_init(dctx);
if (!EVP_MD_CTX_copy_ex(&dctx->i_ctx, &sctx->i_ctx))
goto err; goto err;
if (!EVP_MD_CTX_copy(&dctx->o_ctx, &sctx->o_ctx)) if (!EVP_MD_CTX_copy_ex(&dctx->o_ctx, &sctx->o_ctx))
goto err; goto err;
if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx)) if (!EVP_MD_CTX_copy_ex(&dctx->md_ctx, &sctx->md_ctx))
goto err; goto err;
memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK); memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
dctx->key_length = sctx->key_length; dctx->key_length = sctx->key_length;
@ -208,7 +212,7 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags) void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
{ {
EVP_MD_CTX_set_flags(&ctx->i_ctx, flags); M_EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
EVP_MD_CTX_set_flags(&ctx->o_ctx, flags); M_EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
EVP_MD_CTX_set_flags(&ctx->md_ctx, flags); M_EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
} }