Always seed libtomcrypt CSPRNG (even for tests)

sjlombardo · sjlombardo · commit c66691b89097 · 2026-02-26T14:14:35.000-05:00
diff --git a/src/crypto_libtomcrypt.c b/src/crypto_libtomcrypt.c
@@ -94,9 +94,7 @@ static int sqlcipher_ltc_activate(void *ctx) {
   }
   ltc_ref_count++;
 
-#ifndef SQLCIPHER_TEST
   bytes = rng_get_bytes(random_buffer, FORTUNA_MAX_SZ, NULL);
-#endif
   sqlcipher_log(SQLCIPHER_LOG_TRACE, SQLCIPHER_LOG_PROVIDER, "sqlcipher_ltc_activate: seeded fortuna with %d bytes from rng_get_bytes", bytes);
 
   if(sqlcipher_ltc_add_random(ctx, random_buffer, FORTUNA_MAX_SZ) != SQLITE_OK) {
diff --git a/test/sqlcipher-compatibility.test b/test/sqlcipher-compatibility.test
@@ -1264,40 +1264,6 @@ db close
 file delete -force test.db
 file delete -force new.db
 
-
-# Requires SQLCipher to be built with -DSQLCIPHER_TEST
-if_built_with_libtomcrypt verify-random-data-alters-file-content {
-    file delete -force test.db
-    file delete -force test2.db
-    file delete -force test3.db
-    set rc {}
-    
-    sqlite_orig db test.db
-    execsql {
-        PRAGMA key="x'2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99'";
-        create table t1(a,b);
-    }
-    db close
-    sqlite_orig db test2.db
-    execsql {
-        PRAGMA key="x'2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99'";
-        create table t1(a,b);
-    }
-    db close
-    sqlite_orig db test3.db
-    execsql {
-        PRAGMA key="x'2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99'";
-        PRAGMA cipher_add_random = "x'deadbaad'";
-        create table t1(a,b);
-    }
-    db close
-    lappend rc [cmpFilesChunked test.db test2.db]
-    lappend rc [cmpFilesChunked test2.db test3.db]
-} {0 1}
-file delete -force test.db
-file delete -force test2.db
-file delete -force test3.db
-
 do_test can-migrate-with-keys-longer-than-64-characters {
     sqlite_orig db test.db
     execsql {

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,7 @@ static int sqlcipher_ltc_activate(void *ctx) {`
`94`	`94`	`}`
`95`	`95`	`ltc_ref_count++;`
`96`	`96`
`97`		`-#ifndef SQLCIPHER_TEST`
`98`	`97`	`bytes = rng_get_bytes(random_buffer, FORTUNA_MAX_SZ, NULL);`
`99`		`-#endif`
`100`	`98`	`sqlcipher_log(SQLCIPHER_LOG_TRACE, SQLCIPHER_LOG_PROVIDER, "sqlcipher_ltc_activate: seeded fortuna with %d bytes from rng_get_bytes", bytes);`
`101`	`99`
`102`	`100`	`if(sqlcipher_ltc_add_random(ctx, random_buffer, FORTUNA_MAX_SZ) != SQLITE_OK) {`