diff options
author | Cedric BAIL <cedric.bail@free.fr> | 2012-12-11 11:56:27 +0000 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2012-12-11 11:56:27 +0000 |
commit | 8677720509cd0a13584b1bfa858c981132566f20 (patch) | |
tree | 11bd23d730f2234cc4189504c4bbc4d275bd0b6e | |
parent | 1a8e0a0114d9b64714d9bbfd613969a952095c6e (diff) | |
download | eet-8677720509cd0a13584b1bfa858c981132566f20.tar.gz |
eet: backport r60648.
SVN revision: 80649
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | NEWS | 8 | ||||
-rw-r--r-- | src/lib/eet_cipher.c | 5 |
3 files changed, 14 insertions, 2 deletions
@@ -648,3 +648,6 @@ * 1.7.3 release +2012-12-11 Cedric Bail + + * Fix leak eet_pbkdf2_sha1 with OpenSSL. @@ -1,3 +1,11 @@ +Eet 1.7.4 + +Changes since Eet 1.7.3: +-------------------------- + +Fixes: + * Fix memory leak when using OpenSSL for ciphering long data. + Eet 1.7.3 Changes since Eet 1.7.2: diff --git a/src/lib/eet_cipher.c b/src/lib/eet_cipher.c index 5bd9f25..3317538 100644 --- a/src/lib/eet_cipher.c +++ b/src/lib/eet_cipher.c @@ -1379,12 +1379,13 @@ eet_pbkdf2_sha1(const char *key, for (k = 0; k < tmp_len; k++) p[k] ^= digest[k]; } - } # ifdef HAVE_GNUTLS # else - HMAC_cleanup(&hctx); + HMAC_cleanup(&hctx); # endif /* ifdef HAVE_GNUTLS */ + } + return 0; } |