libsql-ffi: Switch to SQLCipher as the default cipher

Fixes #893
tursodatabase · Feb 19, 2024 · 44eee38 · 44eee38
1 parent deb17db
commit 44eee38
Show file tree

Hide file tree

Showing 2 changed files with 6 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-sys/src/connection.rs b/libsql-sys/src/connection.rs
@@ -21,13 +21,15 @@ type Error = crate::Error;
 
 #[derive(Clone, Debug)]
 pub enum Cipher {
+    // SQLCipher: AES 256 Bit (recommended)
+    SQLCipher,
     // AES 256 Bit CBC - No HMAC (wxSQLite3)
     Aes256Cbc,
 }
 
 impl Default for Cipher {
     fn default() -> Self {
-        Cipher::Aes256Cbc
+        Cipher::SQLCipher
     }
 }
 
@@ -36,6 +38,7 @@ impl FromStr for Cipher {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
+            "sqlcipher" => Ok(Cipher::SQLCipher),
             "aes256cbc" => Ok(Cipher::Aes256Cbc),
             _ => Err(format!("{} is not a supported cipher for encryption", s)),
         }
@@ -46,6 +49,7 @@ impl Cipher {
     #[cfg(feature = "encryption")]
     pub fn cipher_id(&self) -> i32 {
         let name = match self {
+            Cipher::SQLCipher => "sqlcipher\0",
             Cipher::Aes256Cbc => "aes256cbc\0",
         };
         unsafe { sqlite3mc_cipher_index(name.as_ptr() as _) }