Revert patching the xoshiro functions to use sqlite_uint64 (sqlcipher/sqlcipher#542) (#6)

Author: marcprux

Package.swift

@@ -63,6 +63,7 @@ let package = Package(
                 .define("SQLITE_EXTRA_INIT", to: "sqlcipher_extra_init"),
                 .define("SQLITE_EXTRA_SHUTDOWN", to: "sqlcipher_extra_shutdown"),
                 .define("HAVE_GETHOSTUUID", to: "0"),
+                .define("HAVE_STDINT_H"),
                 .define("SQLCIPHER_CRYPTO_LIBTOMCRYPT"),
             ],
             linkerSettings: [.linkedLibrary("log", .when(platforms: [.android]))]),

Sources/SQLCipher/sqlite/sqlite3.c

@@ -107711,15 +107711,15 @@ struct private_block {
  * https://prng.di.unimi.it/ under the public domain via https://prng.di.unimi.it/xoshiro256plusplus.c
  * xoshiro is NEVER used for any cryptographic functions as CSPRNG. It is solely used for
  * generating random data for testing, debugging, and forensic purposes (overwriting memory segments) */
-static volatile sqlite_uint64 xoshiro_s[4];
+static volatile uint64_t xoshiro_s[4];
 
-static inline sqlite_uint64 xoshiro_rotl(const sqlite_uint64 x, int k) {
+static inline uint64_t xoshiro_rotl(const uint64_t x, int k) {
   return (x << k) | (x >> (64 - k));
 }
 
-sqlite_uint64 xoshiro_next(void) {
-  volatile sqlite_uint64 result = xoshiro_rotl(xoshiro_s[0] + xoshiro_s[3], 23) + xoshiro_s[0];
-  volatile sqlite_uint64 t = xoshiro_s[1] << 17;
+uint64_t xoshiro_next(void) {
+  volatile uint64_t result = xoshiro_rotl(xoshiro_s[0] + xoshiro_s[3], 23) + xoshiro_s[0];
+  volatile uint64_t t = xoshiro_s[1] << 17;
 
   xoshiro_s[2] ^= xoshiro_s[0];
   xoshiro_s[3] ^= xoshiro_s[1];
@@ -107734,7 +107734,7 @@ sqlite_uint64 xoshiro_next(void) {
 }
 
 static void xoshiro_randomness(unsigned char *ptr, int sz) {
-  volatile sqlite_uint64 val;
+  volatile uint64_t val;
   volatile int to_copy;
   while (sz > 0) {
     val = xoshiro_next();