Commit 3b21abfd authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix double frees. 

Conflicts:
	CHANGES
parent 5aeb4339

CHANGES

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


 Changes between 1.0.1g and 1.0.2 [xx XXX xxxx]



  *) Fix some double frees. These are not thought to be exploitable.

     [mancha <mancha1@zoho.com>]



  *) Use algorithm specific chains in SSL_CTX_use_certificate_chain_file():

     this fixes a limiation in previous versions of OpenSSL.

     [Steve Henson]

crypto/pkcs7/pk7_doit.c

+1 −0
Original line number Diff line number Diff line
@@ -928,6 +928,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) 
	if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0)

		goto err;

	OPENSSL_free(abuf);

	abuf = NULL;

	if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0)

		goto err;

	abuf = OPENSSL_malloc(siglen);

crypto/ts/ts_rsp_verify.c

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info, 
	X509_ALGOR_free(*md_alg);

	OPENSSL_free(*imprint);

	*imprint_len = 0;

	*imprint = 0;

	return 0;

	}