Skip to content

Commit

Permalink
Prepare release of version 1.7.1
Browse files Browse the repository at this point in the history
- Added compile time option SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT
- Fixed autoconf/automake build files to support msys/mingw
  • Loading branch information
utelle committed Oct 9, 2023
1 parent f612997 commit bebb8f0
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 7 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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>
)

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2023 Ulrich Telle <[email protected]>
dnl
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.

AC_INIT([sqlite3mc], [1.7.0], [[email protected]])
AC_INIT([sqlite3mc], [1.7.1], [[email protected]])

dnl This is the version tested with, might work with earlier ones.
AC_PREREQ([2.69])
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
10 changes: 10 additions & 0 deletions src/aes_hardware.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 --- */

Expand Down
4 changes: 2 additions & 2 deletions src/sqlite3mc_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

0 comments on commit bebb8f0

Please sign in to comment.