Skip to content

Commit 37b8061

Browse files
utelleutelle
committed
Prepare release of version 2.0.4
- Based on SQLite version 3.49.1
1 parent f07f12b commit 37b8061

8 files changed

+42
-31
lines changed

‎CHANGELOG.md

+8-1
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.0.4] - 2025-02-18
11+
12+
### Changed
13+
14+
- Based on SQLite version 3.49.1
15+
1016
## [2.0.3] - 2025-02-07
1117

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

587-
[Unreleased]: ../../compare/v2.0.3...HEAD
593+
[Unreleased]: ../../compare/v2.0.4...HEAD
594+
[2.0.4]: ../../compare/v2.0.3...v2.0.4
588595
[2.0.3]: ../../compare/v2.0.2...v2.0.3
589596
[2.0.2]: ../../compare/v2.0.1...v2.0.2
590597
[2.0.1]: ../../compare/v2.0.0...v2.0.1

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dnl Process this script with autoconf to create configure for sqlite3mc library
22
dnl
3-
dnl Copyright (C) 2019-2025 Ulrich Telle <ulrich@telle-online.de>
3+
dnl Copyright (C) 2019-2025 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.0.3], [ulrich@telle-online.de])
7+
AC_INIT([sqlite3mc], [2.0.4], [github@telle-online.de])
88

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

‎readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1010

1111
## Version information
1212

13-
* 2.0.3 - *February 2025*
14-
- Based on SQLite version 3.49.0
13+
* 2.0.4 - *February 2025*
14+
- Based on SQLite version 3.49.1
1515

1616
For further version information please consult the [CHANGELOG](CHANGELOG.md).
1717

‎src/rekeyvacuum.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
2828
** (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
2929
**
30-
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.49.0 amalgamation.
30+
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.49.1 amalgamation.
3131
*/
3232
SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
3333
char **pzErrMsg, /* Write error message here */

‎src/sqlite3.c

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
** This file is an amalgamation of many separate C source files from SQLite
3-
** version 3.49.0. By combining all the individual C code files into this
3+
** version 3.49.1. By combining all the individual C code files into this
44
** single large file, the entire code can be compiled as a single translation
55
** unit. This allows many compilers to do optimizations that would not be
66
** possible if the files were compiled separately. Performance improvements
@@ -18,7 +18,7 @@
1818
** separate file. This file contains only code for the core SQLite library.
1919
**
2020
** The content in this amalgamation comes from Fossil check-in
21-
** 4a7dd425dc2a0e5082a9049c9b4a9d4f199a with changes in files:
21+
** 873d4e274b4988d260ba8354a9718324a1c2 with changes in files:
2222
**
2323
**
2424
*/
@@ -465,9 +465,9 @@ extern "C" {
465465
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466466
** [sqlite_version()] and [sqlite_source_id()].
467467
*/
468-
#define SQLITE_VERSION "3.49.0"
469-
#define SQLITE_VERSION_NUMBER 3049000
470-
#define SQLITE_SOURCE_ID "2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde"
468+
#define SQLITE_VERSION "3.49.1"
469+
#define SQLITE_VERSION_NUMBER 3049001
470+
#define SQLITE_SOURCE_ID "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
471471

472472
/*
473473
** CAPI3REF: Run-Time Library Version Numbers
@@ -131067,7 +131067,7 @@ static void concatFuncCore(
131067131067
for(i=0; i<argc; i++){
131068131068
n += sqlite3_value_bytes(argv[i]);
131069131069
}
131070-
n += (argc-1)*nSep;
131070+
n += (argc-1)*(i64)nSep;
131071131071
z = sqlite3_malloc64(n+1);
131072131072
if( z==0 ){
131073131073
sqlite3_result_error_nomem(context);
@@ -182305,7 +182305,7 @@ SQLITE_API int sqlite3_config(int op, ...){
182305182305
static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182306182306
#ifndef SQLITE_OMIT_LOOKASIDE
182307182307
void *pStart;
182308-
sqlite3_int64 szAlloc = sz*(sqlite3_int64)cnt;
182308+
sqlite3_int64 szAlloc;
182309182309
int nBig; /* Number of full-size slots */
182310182310
int nSm; /* Number smaller LOOKASIDE_SMALL-byte slots */
182311182311

@@ -182324,7 +182324,9 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182324182324
*/
182325182325
sz = ROUNDDOWN8(sz); /* IMP: R-33038-09382 */
182326182326
if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0;
182327+
if( sz>65528 ) sz = 65528;
182327182328
if( cnt<0 ) cnt = 0;
182329+
szAlloc = (i64)sz*(i64)cnt;
182328182330
if( sz==0 || cnt==0 ){
182329182331
sz = 0;
182330182332
pStart = 0;
@@ -182339,10 +182341,10 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182339182341
#ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
182340182342
if( sz>=LOOKASIDE_SMALL*3 ){
182341182343
nBig = szAlloc/(3*LOOKASIDE_SMALL+sz);
182342-
nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
182344+
nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
182343182345
}else if( sz>=LOOKASIDE_SMALL*2 ){
182344182346
nBig = szAlloc/(LOOKASIDE_SMALL+sz);
182345-
nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
182347+
nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
182346182348
}else
182347182349
#endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
182348182350
if( sz>0 ){
@@ -255872,7 +255874,7 @@ static void fts5SourceIdFunc(
255872255874
){
255873255875
assert( nArg==0 );
255874255876
UNUSED_PARAM2(nArg, apUnused);
255875-
sqlite3_result_text(pCtx, "fts5: 2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde", -1, SQLITE_TRANSIENT);
255877+
sqlite3_result_text(pCtx, "fts5: 2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70", -1, SQLITE_TRANSIENT);
255876255878
}
255877255879

255878255880
/*

‎src/sqlite3.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ extern "C" {
146146
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147147
** [sqlite_version()] and [sqlite_source_id()].
148148
*/
149-
#define SQLITE_VERSION "3.49.0"
150-
#define SQLITE_VERSION_NUMBER 3049000
151-
#define SQLITE_SOURCE_ID "2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde"
149+
#define SQLITE_VERSION "3.49.1"
150+
#define SQLITE_VERSION_NUMBER 3049001
151+
#define SQLITE_SOURCE_ID "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
152152

153153
/*
154154
** CAPI3REF: Run-Time Library Version Numbers

‎src/sqlite3mc_version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define SQLITE3MC_VERSION_MAJOR 2
1616
#define SQLITE3MC_VERSION_MINOR 0
17-
#define SQLITE3MC_VERSION_RELEASE 3
17+
#define SQLITE3MC_VERSION_RELEASE 4
1818
#define SQLITE3MC_VERSION_SUBRELEASE 0
19-
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.3"
19+
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.4"
2020

2121
#endif /* SQLITE3MC_VERSION_H_ */

‎src/sqlite3patched.c

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
** This file is an amalgamation of many separate C source files from SQLite
3-
** version 3.49.0. By combining all the individual C code files into this
3+
** version 3.49.1. By combining all the individual C code files into this
44
** single large file, the entire code can be compiled as a single translation
55
** unit. This allows many compilers to do optimizations that would not be
66
** possible if the files were compiled separately. Performance improvements
@@ -18,7 +18,7 @@
1818
** separate file. This file contains only code for the core SQLite library.
1919
**
2020
** The content in this amalgamation comes from Fossil check-in
21-
** 4a7dd425dc2a0e5082a9049c9b4a9d4f199a with changes in files:
21+
** 873d4e274b4988d260ba8354a9718324a1c2 with changes in files:
2222
**
2323
**
2424
*/
@@ -465,9 +465,9 @@ extern "C" {
465465
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466466
** [sqlite_version()] and [sqlite_source_id()].
467467
*/
468-
#define SQLITE_VERSION "3.49.0"
469-
#define SQLITE_VERSION_NUMBER 3049000
470-
#define SQLITE_SOURCE_ID "2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde"
468+
#define SQLITE_VERSION "3.49.1"
469+
#define SQLITE_VERSION_NUMBER 3049001
470+
#define SQLITE_SOURCE_ID "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
471471

472472
/*
473473
** CAPI3REF: Run-Time Library Version Numbers
@@ -131102,7 +131102,7 @@ static void concatFuncCore(
131102131102
for(i=0; i<argc; i++){
131103131103
n += sqlite3_value_bytes(argv[i]);
131104131104
}
131105-
n += (argc-1)*nSep;
131105+
n += (argc-1)*(i64)nSep;
131106131106
z = sqlite3_malloc64(n+1);
131107131107
if( z==0 ){
131108131108
sqlite3_result_error_nomem(context);
@@ -182349,7 +182349,7 @@ SQLITE_API int sqlite3_config(int op, ...){
182349182349
static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182350182350
#ifndef SQLITE_OMIT_LOOKASIDE
182351182351
void *pStart;
182352-
sqlite3_int64 szAlloc = sz*(sqlite3_int64)cnt;
182352+
sqlite3_int64 szAlloc;
182353182353
int nBig; /* Number of full-size slots */
182354182354
int nSm; /* Number smaller LOOKASIDE_SMALL-byte slots */
182355182355

@@ -182368,7 +182368,9 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182368182368
*/
182369182369
sz = ROUNDDOWN8(sz); /* IMP: R-33038-09382 */
182370182370
if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0;
182371+
if( sz>65528 ) sz = 65528;
182371182372
if( cnt<0 ) cnt = 0;
182373+
szAlloc = (i64)sz*(i64)cnt;
182372182374
if( sz==0 || cnt==0 ){
182373182375
sz = 0;
182374182376
pStart = 0;
@@ -182383,10 +182385,10 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
182383182385
#ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
182384182386
if( sz>=LOOKASIDE_SMALL*3 ){
182385182387
nBig = szAlloc/(3*LOOKASIDE_SMALL+sz);
182386-
nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
182388+
nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
182387182389
}else if( sz>=LOOKASIDE_SMALL*2 ){
182388182390
nBig = szAlloc/(LOOKASIDE_SMALL+sz);
182389-
nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
182391+
nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
182390182392
}else
182391182393
#endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
182392182394
if( sz>0 ){
@@ -255924,7 +255926,7 @@ static void fts5SourceIdFunc(
255924255926
){
255925255927
assert( nArg==0 );
255926255928
UNUSED_PARAM2(nArg, apUnused);
255927-
sqlite3_result_text(pCtx, "fts5: 2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde", -1, SQLITE_TRANSIENT);
255929+
sqlite3_result_text(pCtx, "fts5: 2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70", -1, SQLITE_TRANSIENT);
255928255930
}
255929255931

255930255932
/*

0 commit comments

Comments
 (0)