OpenSSL: openssl/crypto/evp/ digest.c openssl/crypto/hmac/ hm_pm...

  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:  
12-Apr-2007 15:02:32
  Branch: HEAD                             Handle:
2007041214022902

  Modified files:
    openssl/crypto/evp      digest.c
    openssl/crypto/hmac     hm_pmeth.c

  Log:
    Copy update callback across when copying EVP_MD_CTX.
    
    Remove unnecessary reference to EVP_MD_CTX in HMAC pkey
method.

  Summary:
    Revision    Changes     Path
    1.34        +2  -0      openssl/crypto/evp/digest.c
    1.2         +0  -4      openssl/crypto/hmac/hm_pmeth.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/evp/digest.c
 
============================================================
================
  $ cvs diff -u -r1.33 -r1.34 digest.c
  --- openssl/crypto/evp/digest.c	11 Apr 2007 12:32:57
-0000	1.33
  +++ openssl/crypto/evp/digest.c	12 Apr 2007 13:02:29
-0000	1.34
   -292,6 +292,8 
  
		memcpy(out->md_data,in->md_data,out->digest->c
tx_size);
   		}
   
  +	out->update = in->update;
  +
   	if (in->pctx)
   		{
   		out->pctx = EVP_PKEY_CTX_dup(in->pctx);
   .
  patch -p0 <<' .'
  Index: openssl/crypto/hmac/hm_pmeth.c
 
============================================================
================
  $ cvs diff -u -r1.1 -r1.2 hm_pmeth.c
  --- openssl/crypto/hmac/hm_pmeth.c	11 Apr 2007 12:32:59
-0000	1.1
  +++ openssl/crypto/hmac/hm_pmeth.c	12 Apr 2007 13:02:31
-0000	1.2
   -68,7 +68,6 
   typedef struct
   	{
   	const EVP_MD *md;	/* MD for HMAC use */
  -	EVP_MD_CTX *mctx;	/* Parent EVP_MD_CTX */
   	ASN1_OCTET_STRING ktmp; /* Temp storage for key */
   	HMAC_CTX ctx;
   	} HMAC_PKEY_CTX;
   -80,7 +79,6 
   	if (!hctx)
   		return 0;
   	hctx->md = NULL;
  -	hctx->mctx = NULL;
   	hctx->ktmp.data = NULL;
   	HMAC_CTX_init(&hctx->ctx);
   
   -145,8 +143,6 
   
   static int hmac_signctx_init(EVP_PKEY_CTX *ctx,
EVP_MD_CTX *mctx)
   	{
  -	HMAC_PKEY_CTX *hctx = ctx->data;
  -	hctx->mctx = mctx;
   	EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
   	mctx->update = int_update;
   	return 1;
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org