[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/hmac/ hmac.c
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2011-01-26 16:15:38
Message-ID: 20110126161538.BDC271EAE909 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   26-Jan-2011 17:15:38
  Branch: HEAD                             Handle: 2011012616153800

  Modified files:
    openssl/crypto/hmac     hmac.c

  Log:
    FIPS HMAC changes:
    
    Use EVP macros.
    
    Use tiny EVP in FIPS mode.

  Summary:
    Revision    Changes     Path
    1.26        +13 -9      openssl/crypto/hmac/hmac.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/hmac/hmac.c
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 hmac.c
  --- openssl/crypto/hmac/hmac.c	12 Jun 2010 14:13:17 -0000	1.25
  +++ openssl/crypto/hmac/hmac.c	26 Jan 2011 16:15:38 -0000	1.26
  @@ -55,6 +55,9 @@
    * copied and put under another distribution licence
    * [including the GNU Public Licence.]
    */
  +
  +#define OPENSSL_FIPSEVP
  +
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
  @@ -78,7 +81,7 @@
   	if (key != NULL)
   		{
   		reset=1;
  -		j=EVP_MD_block_size(md);
  +		j=M_EVP_MD_block_size(md);
   		OPENSSL_assert(j <= (int)sizeof(ctx->key));
   		if (j < len)
   			{
  @@ -107,14 +110,14 @@
   			pad[i]=0x36^ctx->key[i];
   		if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl))
   			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;
   
   		for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
   			pad[i]=0x5c^ctx->key[i];
   		if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl))
   			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;
   		}
   	if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx))
  @@ -163,11 +166,12 @@
   
   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;
  -	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;
  -	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;
   	memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
   	dctx->key_length = sctx->key_length;
  @@ -208,7 +212,7 @@
   
   void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
   	{
  -	EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
  -	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->i_ctx, flags);
  +	M_EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
  +	M_EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
   	}
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]