Fix issue #230

- Fix wrong argument list in call to sqlite3mcSecureZeroMemory
- Call sqlite3mcSecureZeroMemory in all Free*Cipher methods (instead of using memset())

Author: utelle

src/cipher_aegis.c

@@ -196,7 +196,7 @@ static void
 FreeAegisCipher(void* cipher)
 {
   AegisCipher* aegisCipher = (AegisCipher*) cipher;
-  memset(aegisCipher, 0, sizeof(AegisCipher));
+  sqlite3mcSecureZeroMemory(aegisCipher, sizeof(AegisCipher));
   sqlite3_free(aegisCipher);
 }
 

src/cipher_ascon.c

@@ -73,7 +73,7 @@ static void
 FreeAscon128Cipher(void* cipher)
 {
   Ascon128Cipher* ascon128Cipher = (Ascon128Cipher*) cipher;
-  memset(ascon128Cipher, 0, sizeof(Ascon128Cipher));
+  sqlite3mcSecureZeroMemory(ascon128Cipher, sizeof(Ascon128Cipher));
   sqlite3_free(ascon128Cipher);
 }
 

src/cipher_chacha20.c

@@ -89,7 +89,7 @@ static void
 FreeChaCha20Cipher(void* cipher)
 {
   ChaCha20Cipher* chacha20Cipher = (ChaCha20Cipher*) cipher;
-  memset(chacha20Cipher, 0, sizeof(ChaCha20Cipher));
+  sqlite3mcSecureZeroMemory(chacha20Cipher, sizeof(ChaCha20Cipher));
   sqlite3_free(chacha20Cipher);
 }
 

src/cipher_sds_rc4.c

@@ -65,7 +65,7 @@ static void
 FreeRC4Cipher(void* cipher)
 {
   RC4Cipher* localCipher = (RC4Cipher*) cipher;
-  memset(localCipher, 0, sizeof(RC4Cipher));
+  sqlite3mcSecureZeroMemory(localCipher, sizeof(RC4Cipher));
   sqlite3_free(localCipher);
 }
 

src/cipher_sqlcipher.c

@@ -156,9 +156,9 @@ static void
 FreeSQLCipherCipher(void* cipher)
 {
   SQLCipherCipher* sqlCipherCipher = (SQLCipherCipher*) cipher;
-  memset(sqlCipherCipher->m_aes, 0, sizeof(Rijndael));
+  sqlite3mcSecureZeroMemory(sqlCipherCipher->m_aes, sizeof(Rijndael));
   sqlite3_free(sqlCipherCipher->m_aes);
-  memset(sqlCipherCipher, 0, sizeof(SQLCipherCipher));
+  sqlite3mcSecureZeroMemory(sqlCipherCipher, sizeof(SQLCipherCipher));
   sqlite3_free(sqlCipherCipher);
 }
 

src/cipher_wxaes128.c

@@ -75,9 +75,9 @@ static void
 FreeAES128Cipher(void* cipher)
 {
   AES128Cipher* localCipher = (AES128Cipher*) cipher;
-  memset(localCipher->m_aes, 0, sizeof(Rijndael));
+  sqlite3mcSecureZeroMemory(localCipher->m_aes, sizeof(Rijndael));
   sqlite3_free(localCipher->m_aes);
-  memset(localCipher, 0, sizeof(AES128Cipher));
+  sqlite3mcSecureZeroMemory(localCipher, sizeof(AES128Cipher));
   sqlite3_free(localCipher);
 }
 

src/cipher_wxaes256.c

@@ -80,9 +80,9 @@ static void
 FreeAES256Cipher(void* cipher)
 {
   AES256Cipher* aesCipher = (AES256Cipher*) cipher;
-  memset(aesCipher->m_aes, 0, sizeof(Rijndael));
+  sqlite3mcSecureZeroMemory(aesCipher->m_aes, sizeof(Rijndael));
   sqlite3_free(aesCipher->m_aes);
-  memset(aesCipher, 0, sizeof(AES256Cipher));
+  sqlite3mcSecureZeroMemory(aesCipher, sizeof(AES256Cipher));
   sqlite3_free(aesCipher);
 }
 

src/memory_secure.c

@@ -68,7 +68,7 @@ static void mcMemoryFree(void* pPrior)
   if (mcSecureMemoryFlag)
   {
     int nSize = mcMemorySize(pPrior);
-    sqlite3mcSecureZeroMemory(pPrior, 0, nSize);
+    sqlite3mcSecureZeroMemory(pPrior, nSize);
   }
   mcDefaultMemoryMethods.xFree(pPrior);
 }