OpenSSL: openssl/crypto/evp/ p5_crpt2.c

  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:  
15-Apr-2006 19:43:43
  Branch: HEAD                             Handle:
2006041518434300

  Modified files:
    openssl/crypto/evp      p5_crpt2.c

  Log:
    Fix from 0.9.7-stable branch.

  Summary:
    Revision    Changes     Path
    1.21        +8  -3      openssl/crypto/evp/p5_crpt2.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/evp/p5_crpt2.c
 
============================================================
================
  $ cvs diff -u -r1.20 -r1.21 p5_crpt2.c
  --- openssl/crypto/evp/p5_crpt2.c	26 Jul 2005 21:10:30
-0000	1.20
  +++ openssl/crypto/evp/p5_crpt2.c	15 Apr 2006 17:43:43
-0000	1.21
   -201,11 +201,16 
   
   	/* Now decode key derivation function */
   
  +	if(!pbe2->keyfunc->parameter ||
  +		 (pbe2->keyfunc->parameter->type !=
V_ASN1_SEQUENCE))
  +		{
  +		EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
  +		goto err;
  +		}
  +
   	pbuf =
pbe2->keyfunc->parameter->value.sequence->data;
   	plen =
pbe2->keyfunc->parameter->value.sequence->length
;
  -	if(!pbe2->keyfunc->parameter ||
  -		 (pbe2->keyfunc->parameter->type !=
V_ASN1_SEQUENCE) ||
  -				!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
  +	if(!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
   		EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
   		goto err;
   	}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org