Fix issue #226: raw key+salt not handled properly

In case a database is encrypted with the _SQLCipher_ scheme using _raw key and salt material_ and the _plaintext header_ feature, opening an existing database failed. The reason was that the salt part was erroneously ignored on reading the raw key and salt material. This has been fixed.

The same fix has been applied to other cipher schemes, namely AEGIS, Ascon, and ChaCha20. Actually, this fix is currently not absolutely required for these schemes, because the salt is only used for key derivation, which is not performed when raw key and salt material is used. However, behaviour of the schemes may change in the future.

Author: utelle

src/cipher_aegis.c

@@ -262,6 +262,8 @@ GenerateKeyAegisCipher(void* cipher, char* userPassword, int passwordLength, int
   else
   {
     memcpy(aegisCipher->m_salt, cipherSalt, SALTLENGTH_AEGIS);
+    if (aegisCipher->m_plaintextHeaderSize > 0)
+      keyOnly = 0;
   }
 
   /* Bypass key derivation, if raw key (and optionally salt) are given */

src/cipher_ascon.c

@@ -131,6 +131,8 @@ GenerateKeyAscon128Cipher(void* cipher, char* userPassword, int passwordLength,
   else
   {
     memcpy(ascon128Cipher->m_salt, cipherSalt, SALTLENGTH_ASCON128);
+    if (ascon128Cipher->m_plaintextHeaderSize > 0)
+      keyOnly = 0;
   }
 
   /* Bypass key derivation, if raw key (and optionally salt) are given */

src/cipher_chacha20.c

@@ -157,6 +157,8 @@ GenerateKeyChaCha20Cipher(void* cipher, char* userPassword, int passwordLength,
   else
   {
     memcpy(chacha20Cipher->m_salt, cipherSalt, SALTLENGTH_CHACHA20);
+    if (chacha20Cipher->m_plaintextHeaderSize > 0)
+      keyOnly = 0;
   }
 
   /* Bypass key derivation, if raw key (and optionally salt) are given */

src/cipher_sqlcipher.c

@@ -252,6 +252,8 @@ GenerateKeySQLCipherCipher(void* cipher, char* userPassword, int passwordLength,
   else
   {
     memcpy(sqlCipherCipher->m_salt, cipherSalt, SALTLENGTH_SQLCIPHER);
+    if (sqlCipherCipher->m_plaintextHeaderSize > 0)
+      keyOnly = 0;
   }
 
   /* Bypass key derivation, if raw key (and optionally salt) are given */