libsql-ffi: Switch to SQLCipher as the default cipher

Fixes #893
tursodatabase · Feb 16, 2024 · 60189ef · 60189ef
1 parent eb189b0
commit 60189ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt
@@ -133,7 +133,7 @@ set(SQLITE3MC_BASE_DEFINITIONS
   HAVE_CIPHER_AES_128_CBC=0
   HAVE_CIPHER_AES_256_CBC=1
   HAVE_CIPHER_CHACHA20=0   
-  HAVE_CIPHER_SQLCIPHER=0   
+  HAVE_CIPHER_SQLCIPHER=1   
   HAVE_CIPHER_RC4=0   
   HAVE_CIPHER_ASCON128=0
 #  $<$<BOOL:${SQLITE_USE_TCL}>:SQLITE_USE_TCL=1>

diff --git a/libsql-ffi/src/lib.rs b/libsql-ffi/src/lib.rs
@@ -18,13 +18,15 @@ include!(concat!(env!("OUT_DIR"), "/bindgen.rs"));
 
 #[derive(Clone, Debug)]
 pub enum Cipher {
+    // SQLCipher: AES 256 Bit (recommended)
+    SQLCIPHER,
     // AES 256 Bit CBC - No HMAC (wxSQLite3)
     AES_256_CBC,
 }
 
 impl Default for Cipher {
     fn default() -> Self {
-        Cipher::AES_256_CBC
+        Cipher::SQLCIPHER
     }
 }
 
@@ -33,6 +35,7 @@ impl FromStr for Cipher {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
+            "sqlcipher" => Ok(Cipher::SQLCIPHER),
             "aes256cbc" => Ok(Cipher::AES_256_CBC),
             _ => Err(Error::new(SQLITE_MISUSE)),
         }