commit 06dc31181752c3e59b4c5b58b24f023640898564
author Thurston Hou Yeen Dang <thurston@google.com> Mon Jul 18 14:16:37 2016 -0700
committer Thurston Hou Yeen Dang <thurston@google.com> Mon Jul 18 14:16:37 2016 -0700
tree 84fc4d965b353487842c6e776319df435c92e9bc
parent 848639bdfc67ec1ecb8d76de25b345a2a0762e2a

Call EVP_CIPHER_CTX_cleanup to avoid leaking memory that was allocated in EVP_DecryptInit_ex

Also add matching cleanup to EVP_EncryptInit_ex for symmetry (though I'm not
convinced it actually leaks memory)

Change-Id: Icf72dd9e0295d8b6ea55909266a43e684b16420f

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 0334bbd..6dd56cb 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1409,6 +1409,8 @@
       SLOGE("encrypt_master_key: crypto_scrypt failed");
     }
 
+    EVP_CIPHER_CTX_cleanup(&e_ctx);
+
     return 0;
 }
 
@@ -1458,6 +1460,8 @@
     }
   }
 
+  EVP_CIPHER_CTX_cleanup(&d_ctx);
+
   return 0;
 }