Commit 592f5c57 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix couple of memory leaks in PKCS7_dataDecode().

parent 14ba3116

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]



  *) Fix a couple of memory leaks in PKCS7_dataDecode()

     [Steve Henson, reported by Heyun Zheng <hzheng@atdsprint.com>]



  *) Change Configure and Makefiles to provide EXE_EXT, which will contain

     the default extension for executables, if any.  Also, make the perl

     scripts that use symlink() to test if it really exists and use "cp"

crypto/pkcs7/pk7_doit.c

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) 
		if (ri == NULL) {

			PKCS7err(PKCS7_F_PKCS7_DATADECODE,

				 PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);

			return(NULL);

			goto err;

		}



		jj=EVP_PKEY_size(pkey);
@@ -393,7 +393,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) 
		BIO_get_cipher_ctx(etmp,&evp_ctx);

		EVP_CipherInit(evp_ctx,evp_cipher,NULL,NULL,0);

		if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)

			return(NULL);

			goto err;



		if (jj != EVP_CIPHER_CTX_key_length(evp_ctx)) {

			/* Some S/MIME clients don't use the same key