Skip to content

Commit bebb8f0

Browse files
committed
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
1 parent f612997 commit bebb8f0

File tree

6 files changed

+32
-7
lines changed

6 files changed

+32
-7
lines changed

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.7.1] - 2023-10-09
11+
12+
### Added
13+
14+
- Added compile time option to omit AES hardware support
15+
16+
### Fixed
17+
18+
- Fixed autoconf/automake build files to be usable with msys/mingw
19+
1020
## [1.7.0] - 2023-10-03
1121

1222
### Added
@@ -414,7 +424,8 @@ The following ciphers are supported:
414424
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
415425
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
416426

417-
[Unreleased]: ../../compare/v1.7.0...HEAD
427+
[Unreleased]: ../../compare/v1.7.1...HEAD
428+
[1.7.1]: ../../compare/v1.7.0...v1.7.1
418429
[1.7.0]: ../../compare/v1.6.5...v1.7.0
419430
[1.6.5]: ../../compare/v1.6.4...v1.6.5
420431
[1.6.4]: ../../compare/v1.6.3...v1.6.4

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ OPTION(SQLITE3MC_USE_SQLCIPHER_LEGACY "Use sqlcipher legacy mode as default" OFF
6666
OPTION(SQLITE3MC_SECURE_MEMORY "Enable pragma to secure freed memory" OFF)
6767
OPTION(SQLITE3MC_USE_RANDOM_FILL_MEMORY "Fill freed memory with random data" OFF)
6868

69+
# Omit AES hardware support
70+
OPTION(SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT "Omit AES hardware support" OFF)
71+
6972
# TCL
7073
#OPTION(SQLITE_ENABLE_TCL "Enable TCL interface" OFF)
7174

@@ -114,6 +117,7 @@ set(SQLITE3MC_BASE_DEFINITIONS
114117
$<$<BOOL:${SQLITE_ENABLE_PREUPDATE_HOOK}>:SQLITE_ENABLE_PREUPDATE_HOOK=1>
115118
$<$<BOOL:${SQLITE_ENABLE_SESSION}>:SQLITE_ENABLE_SESSION=1>
116119
$<$<BOOL:${SQLITE3MC_USE_MINIZ}>:SQLITE3MC_USE_MINIZ=1>
120+
$<$<BOOL:${SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT}>:SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT=1>
117121
# $<$<BOOL:${SQLITE_USE_TCL}>:SQLITE_USE_TCL=1>
118122
)
119123

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2023 Ulrich Telle <[email protected]>
44
dnl
55
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
66

7-
AC_INIT([sqlite3mc], [1.7.0], [[email protected]])
7+
AC_INIT([sqlite3mc], [1.7.1], [[email protected]])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])

readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1010

1111
## Version information
1212

13-
* 1.7.0 - *October 2023*
13+
* 1.7.1 - *October 2023*
1414
- Based on SQLite version 3.43.1
15-
- Fixed issues #118 and #119
16-
- Added optional `PRAGMA memory_security`
15+
- Added compile time option to omit AES hardware support
16+
- Fixed autoconf/automake build files to be usable with msys/mingw
1717

1818
For further version information please consult the [CHANGELOG](CHANGELOG.md).
1919

src/aes_hardware.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#define AES_HARDWARE_NI 1
1616
#define AES_HARDWARE_NEON 2
1717

18+
#ifndef SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT
19+
1820
#if defined __ARM_FEATURE_CRYPTO
1921
#define HAS_AES_HARDWARE AES_HARDWARE_NEON
2022

@@ -72,6 +74,14 @@
7274

7375
#endif
7476

77+
#else /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT defined */
78+
79+
/* Omit AES hardware support */
80+
#define HAS_AES_HARDWARE AES_HARDWARE_NONE
81+
82+
#endif /* SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT */
83+
84+
7585
#if HAS_AES_HARDWARE != AES_HARDWARE_NONE
7686
/* --- Implementation of common data and functions for any AES hardware --- */
7787

src/sqlite3mc_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define SQLITE3MC_VERSION_MAJOR 1
1616
#define SQLITE3MC_VERSION_MINOR 7
17-
#define SQLITE3MC_VERSION_RELEASE 0
17+
#define SQLITE3MC_VERSION_RELEASE 1
1818
#define SQLITE3MC_VERSION_SUBRELEASE 0
19-
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 1.7.0"
19+
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 1.7.1"
2020

2121
#endif /* SQLITE3MC_VERSION_H_ */

0 commit comments

Comments
 (0)