eet: backport r60648.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/eet-1.7@80649 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 97f56d2..00a33fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -648,3 +648,6 @@
 
        * 1.7.3 release
 
+2012-12-11  Cedric Bail
+
+       * Fix leak eet_pbkdf2_sha1 with OpenSSL.

diff --git a/NEWS b/NEWS
index 7e750a3..96c4d84 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 (file)
--- 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;
 }