From bebb8f016327f48968c9c965924f18d4eaf5c025 Mon Sep 17 00:00:00 2001
From: utelle <ulrich.telle@gmx.de>
Date: Mon, 9 Oct 2023 22:44:22 +0200
Subject: [PATCH] Prepare release of version 1.7.1

- Added compile time option SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT
- Fixed autoconf/automake build files to support msys/mingw
---
 CHANGELOG.md            | 13 ++++++++++++-
 CMakeLists.txt          |  4 ++++
 configure.ac            |  2 +-
 readme.md               |  6 +++---
 src/aes_hardware.c      | 10 ++++++++++
 src/sqlite3mc_version.h |  4 ++--
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e41e1d..bd0d586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.1] - 2023-10-09
+
+### Added
+
+- Added compile time option to omit AES hardware support
+
+### Fixed
+
+- Fixed autoconf/automake build files to be usable with msys/mingw
+
 ## [1.7.0] - 2023-10-03
 
 ### Added
@@ -414,7 +424,8 @@ 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.7.0...HEAD
+[Unreleased]: ../../compare/v1.7.1...HEAD
+[1.7.1]: ../../compare/v1.7.0...v1.7.1
 [1.7.0]: ../../compare/v1.6.5...v1.7.0
 [1.6.5]: ../../compare/v1.6.4...v1.6.5
 [1.6.4]: ../../compare/v1.6.3...v1.6.4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 747195c..997166b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,9 @@ OPTION(SQLITE3MC_USE_SQLCIPHER_LEGACY "Use sqlcipher legacy mode as default" OFF
 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)
+
 # TCL
 #OPTION(SQLITE_ENABLE_TCL "Enable TCL interface" OFF)
 
@@ -114,6 +117,7 @@ set(SQLITE3MC_BASE_DEFINITIONS
   $<$<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>
+  $<$<BOOL:${SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT}>:SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT=1>
 #  $<$<BOOL:${SQLITE_USE_TCL}>:SQLITE_USE_TCL=1>
 )
 
diff --git a/configure.ac b/configure.ac
index 5925c4b..80e6074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2023 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.7.0], [ulrich@telle-online.de])
+AC_INIT([sqlite3mc], [1.7.1], [ulrich@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])
diff --git a/readme.md b/readme.md
index 3fb8072..41f8b44 100644
--- a/readme.md
+++ b/readme.md
@@ -10,10 +10,10 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version information
 
-* 1.7.0 - *October 2023*
+* 1.7.1 - *October 2023*
   - Based on SQLite version 3.43.1
-  - Fixed issues #118 and #119
-  - Added optional `PRAGMA memory_security`
+  - Added compile time option to omit AES hardware support
+  - Fixed autoconf/automake build files to be usable with msys/mingw
   
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 
diff --git a/src/aes_hardware.c b/src/aes_hardware.c
index ca7380a..2787712 100644
--- a/src/aes_hardware.c
+++ b/src/aes_hardware.c
@@ -15,6 +15,8 @@
 #define AES_HARDWARE_NI    1
 #define AES_HARDWARE_NEON  2
 
+#ifndef SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT
+
 #if defined __ARM_FEATURE_CRYPTO
 #define HAS_AES_HARDWARE AES_HARDWARE_NEON
 
@@ -72,6 +74,14 @@
 
 #endif
 
+#else /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT defined */
+
+/* Omit AES hardware support */
+#define HAS_AES_HARDWARE AES_HARDWARE_NONE
+
+#endif /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT */
+
+
 #if HAS_AES_HARDWARE != AES_HARDWARE_NONE
 /* --- Implementation of common data and functions for any AES hardware --- */
 
diff --git a/src/sqlite3mc_version.h b/src/sqlite3mc_version.h
index 3ed29ea..92d12a2 100644
--- a/src/sqlite3mc_version.h
+++ b/src/sqlite3mc_version.h
@@ -14,8 +14,8 @@
 
 #define SQLITE3MC_VERSION_MAJOR      1
 #define SQLITE3MC_VERSION_MINOR      7
-#define SQLITE3MC_VERSION_RELEASE    0
+#define SQLITE3MC_VERSION_RELEASE    1
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.7.0"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.7.1"
 
 #endif /* SQLITE3MC_VERSION_H_ */