From 0d1b29e5e15190139bb6e129564f6623c060ce93 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 11 Dec 2012 11:52:53 +0000 Subject: [PATCH] eet: fix memory leak with OpenSSL. Reported by Leandro Santiago . SVN revision: 80648 --- ChangeLog | 4 ++++ NEWS | 1 + src/lib/eet/eet_cipher.c | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2658538090..ba576b7bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-12-11 Cedric Bail + + * Fix leak eet_pbkdf2_sha1 with OpenSSL. + 2012-12-10 Gustavo Sverzut Barbieri (k-s) * Added ECORE_GETOPT_ACTION_BREAK to force breaking out of argument diff --git a/NEWS b/NEWS index 2c735fa90b..6a93191393 100644 --- a/NEWS +++ b/NEWS @@ -72,3 +72,4 @@ Fixes: * Fix build of Ecore_Evas_Extn on Solaris. * Don't leak fd on exec. * Fixed polygon rendering bug in GL backend when there are cutouts. + * Fix leak in eet_pbkdf2_sha1 with OpenSSL. diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c index ff475c639e..f61b1009d7 100644 --- a/src/lib/eet/eet_cipher.c +++ b/src/lib/eet/eet_cipher.c @@ -1324,12 +1324,12 @@ 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; }