Merge upstream SQLite 3.48.0

libsql-ffi/bundled/SQLite3MultipleCiphers/CHANGELOG.md

@@ -7,6 +7,115 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.2] - 2025-01-15
+
+### Changed
+
+- Based on SQLite version 3.48.0
+
+## [2.0.1] - 2025-01-06
+
+### Fixed
+
+- Fixed issue [#186](../../issues/186)) - crashes due to _illegal instruction_ exception on some Linux systems
+- Fixed issue [#185](../../issues/185)) - missing header file and include path in CMake build file
+
+## [2.0.0] - 2024-12-31
+
+### Added
+
+- Added new cipher scheme AEGIS
+
+### Changed
+
+- Removed User Authentication extension
+- Cleaned up some extensions to use SQLITE_API
+
+### Fixed
+
+- Fixed undefined behavior related to function pointer cast
+
+## [1.9.2] - 2024-12-08
+
+### Changed
+
+- Based on SQLite version 3.47.2
+
+### Fixed
+
+- Fixed issue with page size change request for encrypted databases
+
+## [1.9.1] - 2024-11-26
+
+### Changed
+
+- Based on SQLite version 3.47.1
+- Remove need to specify AES hw compile time options
+
+## [1.9.0] - 2024-10-22
+
+### Changed
+
+- Based on SQLite version 3.47.0
+- Changed signature of cipher scheme method `GenerateKey` (affects only developers of dynamic cipher schemes)
+
+### Fixed
+
+- Using differing KDF and HMAC algorithms resulted in databases incompatible with the original SQLCipher library. Setting the parameter `hmac_algorithm_compat` to 0 restores the (incompatible) behaviour.
+
+## [1.8.7] - 2024-08-14
+
+### Changed
+
+- Based on SQLite version 3.46.1
+
+## [1.8.6] - 2024-06-14
+
+### Changed
+
+- Removed extern keyword in function declarations
+- Cleaned up white space
+- Added SQLITE_PRIVATE for several internal functions
+- The cipher configuration parameter `legacy_page_size` now accepts only valid page sizes
+- The cipher configuration parameter `plaintext_header_size` now accepts only values that are multiples of 16
+
+### Fixed
+
+- Fixed issue [#156](../../issues/156)) - corrupted database if MMAP_SIZE > 0 was used
+- Fixed issue [#158](../../issues/158)) - add check to verify compatibility of source and target database in backup operation
+- Fixed issue [#160](../../issues/160)) - fix accessing memory out of array bounds
+- Fixed issue [#162](../../issues/162)) - fix loading/storing misaligned data
+- Fixed issue [#164](../../issues/164)) - fix return of error messages from rekey
+- Fixed issue [#165](../../issues/165)) - fix rekey function by enforcing page size and number of reserved bytes per page
+- Fixed issue [#166](../../issues/166)) - missing attribute SQLITE_PRIVATE for several internal functions
+- Fixed issue [#167](../../issues/167)) - improve VFS error reporting
+- Fixed issue [#168](../../issues/168)) - add check for encryption support
+
+## [1.8.5] - 2024-05-24
+
+### Changed
+
+- Based on SQLite version 3.46.0
+
+## [1.8.4] - 2024-03-14
+
+### Changed
+
+- Based on SQLite version 3.45.2
+- Disable user authentication extension by default
+
+## [1.8.3] - 2024-01-31
+
+### Changed
+
+- Based on SQLite version 3.45.1
+
+## [1.8.2] - 2024-01-16
+
+### Changed
+
+- Based on SQLite version 3.45.0
+
 ## [1.8.1] - 2023-12-02
 
 ### Changed
@@ -469,7 +578,20 @@ The following ciphers are supported:
 - AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
 - RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
 
-[Unreleased]: ../../compare/v1.8.0...HEAD
+[Unreleased]: ../../compare/v2.0.2...HEAD
+[2.0.2]: ../../compare/v2.0.1...v2.0.2
+[2.0.1]: ../../compare/v2.0.0...v2.0.1
+[2.0.0]: ../../compare/v1.9.2...v2.0.0
+[1.9.2]: ../../compare/v1.9.1...v1.9.2
+[1.9.1]: ../../compare/v1.9.0...v1.9.1
+[1.9.0]: ../../compare/v1.8.7...v1.9.0
+[1.8.7]: ../../compare/v1.8.6...v1.8.7
+[1.8.6]: ../../compare/v1.8.5...v1.8.6
+[1.8.5]: ../../compare/v1.8.4...v1.8.5
+[1.8.4]: ../../compare/v1.8.3...v1.8.4
+[1.8.3]: ../../compare/v1.8.2...v1.8.3
+[1.8.2]: ../../compare/v1.8.1...v1.8.2
+[1.8.1]: ../../compare/v1.8.0...v1.8.1
 [1.8.0]: ../../compare/v1.7.4...v1.8.0
 [1.7.4]: ../../compare/v1.7.3...v1.7.4
 [1.7.3]: ../../compare/v1.7.2...v1.7.3

libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt

@@ -32,7 +32,6 @@ OPTION(SQLITE_ENABLE_JSON1 "Enable extension 'json1'" ON)
 OPTION(SQLITE_ENABLE_RTREE "Enable extension 'rtree'" ON)
 OPTION(SQLITE_ENABLE_UUID "Enable extension 'uuid'" ON)
 OPTION(SQLITE_USE_URI "Enable the URI filename process logic" ON)
-OPTION(SQLITE_USER_AUTHENTICATION "Enable extension 'user authentication'" ON)
 OPTION(SQLITE_ENABLE_PREUPDATE_HOOK "Enable preupdate hooks" OFF)
 OPTION(SQLITE_ENABLE_SESSION "Enable session extension" OFF)
 OPTION(SQLITE_SHELL_IS_UTF8 "Shell command line arguments in UTF-8 encoding" ON)
@@ -64,7 +63,6 @@ OPTION(SQLITE3MC_USE_SQLCIPHER_LEGACY "Use sqlcipher legacy mode as default" OFF
 
 # Additional memory security (filling freed memory allocations with zeros or random data)
 OPTION(SQLITE3MC_SECURE_MEMORY "Enable pragma to secure freed memory" OFF)
-OPTION(SQLITE3MC_USE_RANDOM_FILL_MEMORY "Fill freed memory with random data" OFF)
 
 # Omit AES hardware support
 OPTION(SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT "Omit AES hardware support" OFF)
@@ -84,7 +82,7 @@ set(SQLITE_THREADSAFE 1 CACHE STRING "Set threading mode (0 = single-threaded, 1
 set_property(CACHE SQLITE_THREADSAFE PROPERTY STRINGS 0 1 2)
 
 set(CODEC_TYPE CHACHA20 CACHE STRING "Set default codec type")
-set_property(CACHE CODEC_TYPE PROPERTY STRINGS AES128 AES256 CHACHA20 SQLCIPHER RC4 ASCON128)
+set_property(CACHE CODEC_TYPE PROPERTY STRINGS AES128 AES256 CHACHA20 SQLCIPHER RC4 ASCON128 AEGIS)
 
 if(SQLITE_ENABLE_COMPRESS OR SQLITE_ENABLE_SQLAR OR SQLITE_ENABLE_ZIPFILE)
   if(NOT SQLITE3MC_USE_MINIZ)
@@ -98,7 +96,6 @@ set(SQLITE3MC_BASE_DEFINITIONS
   CODEC_TYPE=CODEC_TYPE_${CODEC_TYPE}
   SQLITE_DQS=${SQLITE_DQS}
   SQLITE_MAX_ATTACHED=${SQLITE_MAX_ATTACHED}
-  $<$<BOOL:${SQLITE_USER_AUTHENTICATION}>:SQLITE_USER_AUTHENTICATION=1>
   $<$<BOOL:${SQLITE_ENABLE_DEBUG}>:SQLITE_ENABLE_DEBUG=1>
   SQLITE_THREADSAFE=${SQLITE_THREADSAFE}
   $<$<BOOL:${SQLITE_SOUNDEX}>:SQLITE_SOUNDEX=1>
@@ -116,7 +113,6 @@ set(SQLITE3MC_BASE_DEFINITIONS
   $<$<BOOL:${SQLITE_ENABLE_UUID}>:SQLITE_ENABLE_UUID=1>
   SQLITE_TEMP_STORE=2
   $<$<BOOL:${SQLITE_USE_URI}>:SQLITE_USE_URI=1>
-  $<$<BOOL:${SQLITE_USER_AUTHENTICATION}>:SQLITE_USER_AUTHENTICATION=1>
   $<$<BOOL:${SQLITE_ENABLE_PREUPDATE_HOOK}>:SQLITE_ENABLE_PREUPDATE_HOOK=1>
   $<$<BOOL:${SQLITE_ENABLE_SESSION}>:SQLITE_ENABLE_SESSION=1>
   $<$<BOOL:${SQLITE3MC_USE_MINIZ}>:SQLITE3MC_USE_MINIZ=1>
@@ -133,9 +129,9 @@ 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_RC4=0   
+  HAVE_CIPHER_CHACHA20=0
+  HAVE_CIPHER_SQLCIPHER=0
+  HAVE_CIPHER_RC4=0
   HAVE_CIPHER_ASCON128=0
 #  $<$<BOOL:${SQLITE_USE_TCL}>:SQLITE_USE_TCL=1>
 )
@@ -182,12 +178,6 @@ if(SQLITE3MC_SECURE_MEMORY)
     SQLITE3MC_SECURE_MEMORY=1
   )
 endif()
-if(SQLITE3MC_USE_RANDOM_FILL_MEMORY)
-  set(SQLITE3MC_BASE_DEFINITIONS 
-    ${SQLITE3MC_BASE_DEFINITIONS}
-    SQLITE3MC_USE_RANDOM_FILL_MEMORY=1
-  )
-endif()
 
 if(SQLITE3MC_USE_MINIZ OR _SQLITE3MC_REQUIRE_ZLIB)
   if(_SQLITE3MC_REQUIRE_ZLIB)
@@ -234,7 +224,6 @@ set(SQLITE3MC_PUBLIC_HEADERS
   src/sqlite3mc.h
   src/sqlite3mc_version.h
   src/sqlite3mc_vfs.h
-  src/sqlite3userauth.h
 )
 
 set(SQLITE3MC_BASE_SRCS
@@ -260,6 +249,8 @@ set(SQLITE3MC_SHELL_SRCS
 
 set(SQLITE3MC_INCLUDEDIRS
   src
+  src/aegis/include
+  src/argon2/include
 )
 
 set(SQLITE3MC_LINK_LIBRARIES )
@@ -299,6 +290,14 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux"
     list(APPEND SQLITE3MC_LINK_LIBRARIES "-framework Security")
   endif()
   set(SHARED_LIB_EXPORT_DEFINITION "__attribute__((visibility(\"default\")))")
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
+  if (ANDROID_ABI STREQUAL "arm64-v8a")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto")
+  elseif (ANDROID_ABI STREQUAL "x86_64")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mvaes")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mvaes")
+  endif()
 else()
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (
       CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"
@@ -323,6 +322,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT (
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -maes -Wno-error=incompatible-function-pointer-types")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -maes")
 endif()
+
 set(_LIB_DIFINITIONS
   _LIB
 )

libsql-ffi/bundled/SQLite3MultipleCiphers/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2020 Ulrich Telle
+Copyright (c) 2019-2024 Ulrich Telle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

libsql-ffi/bundled/SQLite3MultipleCiphers/Makefile.am

@@ -1,14 +1,14 @@
 # Process this file with automake to create Makefile.in for sqlite3mc library
 #
-# Copyright (C) 2019-2023 Ulrich Telle <ulrich@telle-online.de>
+# Copyright (C) 2019-2024 Ulrich Telle <ulrich@telle-online.de>
 #
 # This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
 
-if HOST_X86
-X86_FLAGS = -msse4.2 -maes 
-else
+#if HOST_X86
+#X86_FLAGS = -msse4.2 -maes 
+#else
 X86_FLAGS =
-endif
+#endif
 
 if HOST_ARM
 #ARM_FLAGS = -march=native 
@@ -21,10 +21,10 @@ ACLOCAL_AMFLAGS = -I admin/m4
 
 # Flags used for compiling all the targets and linking all the executables
 # (libraries use LIBADD which is set for lib@SQLITE3MC_LIBNAME@.la only).
-AM_CXXFLAGS = -I$(top_srcdir)/src
-AM_CFLAGS   = -I$(top_srcdir)/src
+AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/aegis/include -I$(top_srcdir)/src/argon2/include
+AM_CFLAGS   = -I$(top_srcdir)/src -I$(top_srcdir)/src/aegis/include -I$(top_srcdir)/src/argon2/include
 
-AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_SHA3=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_FILEIO=1 -DSQLITE_ENABLE_SERIES=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_ENABLE_REGEXP=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 $(X86_FLAGS) $(ARM_FLAGS)
+AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_SHA3=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_FILEIO=1 -DSQLITE_ENABLE_SERIES=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_ENABLE_REGEXP=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=0 $(X86_FLAGS) $(ARM_FLAGS)
 
 if HOST_WINDOWS
 AM_CFLAGS += -DSQLITE_API=__declspec\(dllexport\)
@@ -79,7 +79,6 @@ endif
 
 includemc_HEADERS = \
     src/sqlite3.h \
-    src/sqlite3userauth.h \
     src/sqlite3ext.h \
     src/sqlite3mc_version.h \
     src/sqlite3mc_vfs.h \
@@ -111,7 +110,6 @@ noinst_HEADERS = \
     src/sqlite3.c \
     src/sqlite3mc_vfs.c \
     src/test_windirent.c \
-    src/userauth.c \
     src/uuid.c \
     src/cipher_common.h \
     src/fastpbkdf2.h \
@@ -120,7 +118,6 @@ noinst_HEADERS = \
     src/sha1.h \
     src/sha2.h \
     src/sqlite3mc_vfs.h \
-    src/sqlite3userauth.h \
     src/test_windirent.h
 
 lib@SQLITE3MC_LIBNAME@_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
@@ -138,7 +135,7 @@ sqlite3shell_SOURCES = \
     src/sqlite3mc.c \
     src/shell.c
 
-sqlite3shell_CFLAGS = -I$(top_srcdir)/src -std=c99 -D_GNU_SOURCE -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 -DSQLITE_ENABLE_DBPAGE_VTAB=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_ENABLE_STMTVTAB=1 -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 $(X86_FLAGS) $(ARM_FLAGS)
+sqlite3shell_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/aegis/include -I$(top_srcdir)/src/argon2/include -std=c99 -D_GNU_SOURCE -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=0 -DSQLITE_ENABLE_DBPAGE_VTAB=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_ENABLE_STMTVTAB=1 -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 $(X86_FLAGS) $(ARM_FLAGS)
 
 if HOST_WINDOWS
 sqlite3shell_LDADD =

libsql-ffi/bundled/SQLite3MultipleCiphers/configure.ac

@@ -1,10 +1,10 @@
 dnl Process this script with autoconf to create configure for sqlite3mc library
 dnl
-dnl Copyright (C) 2019-2023 Ulrich Telle <ulrich@telle-online.de>
+dnl Copyright (C) 2019-2025 Ulrich Telle <ulrich@telle-online.de>
 dnl
 dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
 
-AC_INIT([sqlite3mc], [1.8.1], [ulrich@telle-online.de])
+AC_INIT([sqlite3mc], [2.0.2], [ulrich@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])
@@ -95,6 +95,15 @@ AC_ARG_WITH([ascon128],
 AS_IF([test "x$with_ascon128" = xno],
     [AC_DEFINE([HAVE_CIPHER_ASCON128], [0], [Define if you have Ascon-128  disabled])])
 
+AC_ARG_WITH([aegis],
+    [AS_HELP_STRING([--without-aegis],
+        [Disable support for AEGIS Encryption])],
+    [],
+    [with_aegis=yes])
+
+AS_IF([test "x$with_aegis" = xno],
+    [AC_DEFINE([HAVE_CIPHER_AEGIS], [0], [Define if you have AEGIS disabled])])
+
 dnl Enable cipher codec
 
 AC_ARG_ENABLE(codec,
@@ -104,7 +113,8 @@ AC_ARG_ENABLE(codec,
                               chacha20 [default]: ChaCha20-Poly1305 Encryption
                               sqlcipher: SQLCipher Encryption
                               rc4: System.Data.SQLite RC4 Encryption
-                              ascon128: Ascon-128 Encryption],
+                              ascon128: Ascon-128 Encryption
+                              aegis: AEGIS Encryption],
       [if   test "x$enableval" = "xaes128" && test "x$with_aes128cbc" = xyes ; then
         codec_type=CODEC_TYPE_AES128
       elif test "x$enableval" = "xaes256" && test "x$with_aes256cbc" = xyes ; then
@@ -117,6 +127,8 @@ AC_ARG_ENABLE(codec,
         codec_type=CODEC_TYPE_RC4
       elif test "x$enableval" = "xascon128" && test "x$with_ascon128" = xyes ; then
         codec_type=CODEC_TYPE_ASCON128
+      elif test "x$enableval" = "xaegis" && test "x$with_aegis" = xyes ; then
+        codec_type=CODEC_TYPE_AEGIS
       else
         echo
         echo "Error!"
@@ -131,7 +143,8 @@ AS_IF([test "x$with_aes128cbc" = xno &&
        test "x$with_chacha20" = xno &&
        test "x$with_sqlcipher" = xno &&
        test "x$with_rc4" = xno &&
-       test "x$with_ascon128" = xno],
+       test "x$with_ascon128" = xno &&
+       test "x$with_aegis" = xno],
        [AC_DEFINE([SQLITE_HAS_CODEC], [0], [All ciphers disabled so encryption is disabled])])
 
 dnl Check for zlib