OpenSSL: openssl/crypto/hmac/ hm_pmeth.c openssl/engines/ccgost/...

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
22-May-2007 14:58:39
  Branch: HEAD                             Handle:
2007052213583801

  Modified files:
    openssl/crypto/hmac     hm_pmeth.c
    openssl/engines/ccgost  gost_pmeth.c

  Log:
    Revert broken change to ccgost.
    
    Initialize context properly for HMAC pkey method.

  Summary:
    Revision    Changes     Path
    1.3         +4  -1      openssl/crypto/hmac/hm_pmeth.c
    1.7         +1  -1     
openssl/engines/ccgost/gost_pmeth.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/hmac/hm_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.2 -r1.3 hm_pmeth.c
  --- openssl/crypto/hmac/hm_pmeth.c	12 Apr 2007 13:02:31
-0000	1.2
  +++ openssl/crypto/hmac/hm_pmeth.c	22 May 2007 12:58:38
-0000	1.3
   -80,11 +80,14 
   		return 0;
   	hctx->md = NULL;
   	hctx->ktmp.data = NULL;
  +	hctx->ktmp.length = 0;
  +	hctx->ktmp.flags = 0;
  +	hctx->ktmp.type = V_ASN1_OCTET_STRING;
   	HMAC_CTX_init(&hctx->ctx);
   
   	ctx->data = hctx;
   	ctx->keygen_info_count = 0;
  -	
  +
   	return 1;
   	}
   
   .
  patch -p0 <<' .'
  Index: openssl/engines/ccgost/gost_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.6 -r1.7 gost_pmeth.c
  --- openssl/engines/ccgost/gost_pmeth.c	21 May 2007
12:16:36 -0000	1.6
  +++ openssl/engines/ccgost/gost_pmeth.c	22 May 2007
12:58:39 -0000	1.7
   -545,7 +545,7 
   		{
   		case EVP_PKEY_CTRL_MD:
   		{
  -		if (p2 != NULL)
  +		if (EVP_MD_type((const EVP_MD *)p2) !=
NID_id_Gost28147_89_MAC)
   			{
   			GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL,
GOST_R_INVALID_DIGEST_TYPE);
   			return 0;
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org