Skip to content

Commit aebe161

Browse files
committed
Update version information and some extensions
- updating the version info in some files is still a manual process - some SQLite extensions required minor adjustments
1 parent 34c5425 commit aebe161

12 files changed

Lines changed: 447 additions & 36 deletions

File tree

CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [2.3.5] - 2026-06-05
11+
12+
### Changed
13+
14+
- Based on SQLite version 3.53.2
15+
1016
## [2.3.4] - 2026-05-06
1117

1218
### Changed
@@ -749,7 +755,9 @@ The following ciphers are supported:
749755
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
750756
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
751757

752-
[Unreleased]: ../../compare/v2.3.3...HEAD
758+
[Unreleased]: ../../compare/v2.3.5...HEAD
759+
[2.3.5]: ../../compare/v2.3.4...v2.3.5
760+
[2.3.4]: ../../compare/v2.3.3...v2.3.4
753761
[2.3.3]: ../../compare/v2.3.2...v2.3.3
754762
[2.3.2]: ../../compare/v2.3.1...v2.3.2
755763
[2.3.1]: ../../compare/v2.3.0...v2.3.1

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.24.0.0)
2-
project(sqlite3mc VERSION 2.3.4)
2+
project(sqlite3mc VERSION 2.3.5)
33

44
# Helper macro
55
macro(_Enable_MT _target)

autoconf/README.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
January 10, 2026
2-
================
1+
June 5, 2026
2+
============
33

44
This package contains an experimental variant for "SQLite3 Multiple
55
Ciphers" of the original C source amalgamation package including a

autoconf/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.4
1+
2.3.5

autoconf/sqlite3rc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#ifndef SQLITE_RESOURCE_VERSION
2-
#define SQLITE_RESOURCE_VERSION 3,53,1
2+
#define SQLITE_RESOURCE_VERSION 3,53,2
33
#endif

configure.ac

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

7-
AC_INIT([sqlite3mc], [2.3.4], [github@telle-online.de])
7+
AC_INIT([sqlite3mc], [2.3.5], [github@telle-online.de])
88

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

packaging/release-notes.md.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
**Changes since previous release**
22
- Based on SQLite version {SQLITE_VERSION}
3-
- Fixed issue #232 - Zero out one-time-keys (for cipher schemes `chacha20`, `aegis`, and `ascon128`) after encrypt/decrypt operation
4-
- Resolved issue #233 - Add support for specifying plaintext header size in non-legacy mode of the _SQLCipher_ cipher scheme. This option was supported only for legacy mode version 4 (legacy=4), but there is no reason to not support it for non-legacy mode.
53

64
> [!IMPORTANT]
75
> :pushpin: The _amalgamation source package_ including `configure` is _still_ **experimental**. :pushpin:

readme.md

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

1111
## Version information
1212

13-
* 2.3.4 - *May 2026*
14-
- Based on SQLite version 3.53.1
15-
- Fixed issue #232 - Zero out one-time-keys (for cipher schemes `chacha20`, `aegis`, and `ascon128`) after encrypt/decrypt operation
16-
- Resolved issue #233 - Add support for specifying plaintext header size in non-legacy mode of the SQLCipher cipher scheme. This option was supported only for legacy mode version 4 (legacy=4), but there is no reason to not support it for non-legacy mode.
13+
* 2.3.5 - *June 2026*
14+
- Based on SQLite version 3.53.2
1715

1816
For further version information please consult the [CHANGELOG](CHANGELOG.md).
1917

src/compress.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ static void compressFunc(
6060
nIn = sqlite3_value_bytes(argv[0]);
6161
nOut = 13 + nIn + (nIn+999)/1000;
6262
pOut = sqlite3_malloc64( nOut+5 );
63+
if( pOut==0 ){
64+
sqlite3_result_error_nomem(context);
65+
return;
66+
}
6367
for(i=4; i>=0; i--){
6468
x[i] = (nIn >> (7*(4-i)))&0x7f;
6569
}
@@ -99,6 +103,10 @@ static void uncompressFunc(
99103
if( (pIn[i]&0x80)!=0 ){ i++; break; }
100104
}
101105
pOut = sqlite3_malloc64( nOut+1 );
106+
if( pOut==0 ){
107+
sqlite3_result_error_nomem(context);
108+
return;
109+
}
102110
rc = uncompress(pOut, &nOut, &pIn[i], nIn-i);
103111
if( rc==Z_OK ){
104112
sqlite3_result_blob(context, pOut, nOut, sqlite3_free);

src/series.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ static int seriesFilter(
536536
if( r<(double)SMALLEST_INT64 ){
537537
iMin = SMALLEST_INT64;
538538
}else if( (idxNum & 0x0200)!=0 && r==seriesCeil(r) ){
539-
iMin = (sqlite3_int64)seriesCeil(r+1.0);
539+
iMin = (sqlite3_int64)seriesCeil(r)+1;
540540
}else{
541541
iMin = (sqlite3_int64)seriesCeil(r);
542542
}
@@ -557,7 +557,7 @@ static int seriesFilter(
557557
if( r>(double)LARGEST_INT64 ){
558558
iMax = LARGEST_INT64;
559559
}else if( (idxNum & 0x2000)!=0 && r==seriesFloor(r) ){
560-
iMax = (sqlite3_int64)(r-1.0);
560+
iMax = ((sqlite3_int64)r)-1;
561561
}else{
562562
iMax = (sqlite3_int64)seriesFloor(r);
563563
}

0 commit comments

Comments
 (0)