OpenSSL: openssl/crypto/dsa/ dsa_ameth.c openssl/crypto/ec/ ec_a...

  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:  
23-Mar-2006 15:04:39
  Branch: HEAD                             Handle:
2006032314043702

  Modified files:
    openssl/crypto/dsa      dsa_ameth.c
    openssl/crypto/ec       ec_ameth.c

  Log:
    Fix bug in DSA, EC methods.

  Summary:
    Revision    Changes     Path
    1.6         +2  -1      openssl/crypto/dsa/dsa_ameth.c
    1.7         +4  -5      openssl/crypto/ec/ec_ameth.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/crypto/dsa/dsa_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.5 -r1.6 dsa_ameth.c
  --- openssl/crypto/dsa/dsa_ameth.c	23 Mar 2006 11:54:48
-0000	1.5
  +++ openssl/crypto/dsa/dsa_ameth.c	23 Mar 2006 14:04:37
-0000	1.6
   -108,7 +108,7 
   		}
   
   	ASN1_INTEGER_free(public_key);
  -
  +	EVP_PKEY_assign_DSA(pkey, dsa);
   	return 1;
   
   	err:
   -139,6 +139,7 
   			DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
   			goto err;
   			}
  +		pval = str;
   		ptype = V_ASN1_SEQUENCE;
   		}
   	else
   .
  patch -p0 <<' .'
  Index: openssl/crypto/ec/ec_ameth.c
 
============================================================
================
  $ cvs diff -u -r1.6 -r1.7 ec_ameth.c
  --- openssl/crypto/ec/ec_ameth.c	23 Mar 2006 11:54:49
-0000	1.6
  +++ openssl/crypto/ec/ec_ameth.c	23 Mar 2006 14:04:39
-0000	1.7
   -445,7 +445,6 
   		goto err;
   		}
   
  -
   	if (ktype > 0)
   		{
   		public_key = EC_KEY_get0_public_key(x);
   -455,15 +454,15 
   			reason = ERR_R_EC_LIB;
   			goto err;
   			}
  -		buf_len = (size_t)BN_num_bytes(pub_key);
  +		if (pub_key)
  +			buf_len = (size_t)BN_num_bytes(pub_key);
   		}
  -	else
   
   	if (ktype == 2)
   		{
  -		if ((i = (size_t)BN_num_bytes(priv_key)) > buf_len)
  -			buf_len = i;
   		priv_key = EC_KEY_get0_private_key(x);
  +		if (priv_key && (i =
(size_t)BN_num_bytes(priv_key)) > buf_len)
  +			buf_len = i;
   		}
   	else
   		priv_key = NULL;
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org