[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [openssl] OpenSSL source code branch OpenSSL_1_0_1-stable updated. OpenSSL_1_0_1e-76-ge94a238
From:       Dr. Stephen Henson <steve () openssl ! org>
Date:       2013-11-11 23:56:24
Message-ID: 20131111235624.7FA0D1DF10C () openssl ! net
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL source code".

The branch, OpenSSL_1_0_1-stable has been updated
       via  e94a23876c808c0b70887110bb6ea2b50108f994 (commit)
       via  041f681943c56ed9e2dbb55866c74865ad1af36b (commit)
      from  afec9f57da80b63957e620219a4f7af8ccdca910 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e94a23876c808c0b70887110bb6ea2b50108f994
Author: Dr. Stephen Henson <steve@openssl.org>
Date:   Mon Nov 11 22:39:40 2013 +0000

    Fix memory leak.
    (cherry picked from commit 16bc45ba956fdf07c7cda7feda88de597569df63)

commit 041f681943c56ed9e2dbb55866c74865ad1af36b
Author: Dr. Stephen Henson <steve@openssl.org>
Date:   Mon Nov 11 22:24:08 2013 +0000

    Typo.
    (cherry picked from commit 5c50462e1e23eeb6d91e1e5311f5da0b79b04fb4)

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org          |    2 +-
 crypto/evp/p5_crpt2.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.org b/Makefile.org
index 0368ed9..a9e2727 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -303,7 +303,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
 			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
 		fi; \
 		$(MAKE) -e SHLIBDIRS=crypto  CC=$${CC:-$(CC)} build-shared; \
-		touch -c fips_premain_dso($EXE_EXT); \
+		touch -c fips_premain_dso$(EXE_EXT); \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index cf26085..fe3c6c8 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -129,6 +129,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
 			HMAC_CTX_cleanup(&hctx);
 			return 0;
 			}
+		HMAC_CTX_cleanup(&hctx);
 		memcpy(p, digtmp, cplen);
 		for(j = 1; j < iter; j++)
 			{


hooks/post-receive
-- 
OpenSSL source code
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]