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