Skip to content

Commit 87b4a1e

Browse files
sjlombardosjlombardo
committed
Merge branch 'prerelease'
2 parents 4a81bea + 4673c7a commit 87b4a1e

File tree

290 files changed

+14569
-3972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+14569
-3972
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# SQLCipher Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## [4.4.1] - (October 2020 - [4.4.1 changes])
5+
- Updates baseline to upstream SQLite 3.33.0
6+
- Fixes double-free bug in cipher_default_plaintext_header_size
7+
- Changes SQLCipher tests to use suite runner
8+
- Improvement to cipher_integrity_check tests to minimize false negatives
9+
- Deprecates PRAGMA cipher_store_pass
10+
411
## [4.4.0] - (May 2020 - [4.4.0 changes])
512
- Updates baseline to upstream SQLite 3.31.0
613
- Adjusts shell to report SQLCipher version alongside SQLite version
@@ -164,7 +171,9 @@ All notable changes to this project will be documented in this file.
164171
### Security
165172
- Change KDF iteration length from 4,000 to 64,000
166173

167-
[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v4.4.0...prerelease
174+
[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v4.4.1...prerelease
175+
[4.4.1]: https://github.com/sqlcipher/sqlcipher/tree/v4.4.1
176+
[4.4.1 changes]: https://github.com/sqlcipher/sqlcipher/compare/v4.4.0...v4.4.1
168177
[4.4.0]: https://github.com/sqlcipher/sqlcipher/tree/v4.4.0
169178
[4.4.0 changes]: https://github.com/sqlcipher/sqlcipher/compare/v4.3.0...v4.4.0
170179
[4.3.0]: https://github.com/sqlcipher/sqlcipher/tree/v4.3.0

‎Makefile.in‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
211211
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
212212
update.lo userauth.lo upsert.lo util.lo vacuum.lo \
213213
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
214-
vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
215-
window.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
214+
vdbetrace.lo vdbevtab.lo \
215+
wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
216+
window.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
216217

217218
# Object files for the amalgamation.
218219
#
@@ -318,6 +319,7 @@ SRC = \
318319
$(TOP)/src/vdbemem.c \
319320
$(TOP)/src/vdbesort.c \
320321
$(TOP)/src/vdbetrace.c \
322+
$(TOP)/src/vdbevtab.c \
321323
$(TOP)/src/vdbeInt.h \
322324
$(TOP)/src/vtab.c \
323325
$(TOP)/src/vxworks.h \
@@ -463,6 +465,7 @@ TESTSRC += \
463465
$(TOP)/ext/misc/carray.c \
464466
$(TOP)/ext/misc/closure.c \
465467
$(TOP)/ext/misc/csv.c \
468+
$(TOP)/ext/misc/decimal.c \
466469
$(TOP)/ext/misc/eval.c \
467470
$(TOP)/ext/misc/explain.c \
468471
$(TOP)/ext/misc/fileio.c \
@@ -524,6 +527,7 @@ TESTSRC2 = \
524527
$(TOP)/src/vdbe.c \
525528
$(TOP)/src/vdbemem.c \
526529
$(TOP)/src/vdbetrace.c \
530+
$(TOP)/src/vdbevtab.c \
527531
$(TOP)/src/where.c \
528532
$(TOP)/src/wherecode.c \
529533
$(TOP)/src/whereexpr.c \
@@ -629,6 +633,7 @@ SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
629633
SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
630634
SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
631635
SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
636+
SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
632637
SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
633638
SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
634639
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
@@ -637,10 +642,12 @@ FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
637642
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
638643
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
639644
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
645+
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS3_PARENTHESIS
640646
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
641647
FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
642648
FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
643649
FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
650+
FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
644651
FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
645652
DBFUZZ_OPT =
646653

@@ -710,6 +717,7 @@ DBFUZZ2_OPTS = \
710717
-DSQLITE_ENABLE_DESERIALIZE \
711718
-DSQLITE_DEBUG \
712719
-DSQLITE_ENABLE_DBSTAT_VTAB \
720+
-DSQLITE_ENABLE_BYTECODE_VTAB \
713721
-DSQLITE_ENABLE_RTREE \
714722
-DSQLITE_ENABLE_FTS4 \
715723
-DSQLITE_ENABLE_FTS5
@@ -1041,6 +1049,9 @@ vdbesort.lo: $(TOP)/src/vdbesort.c $(HDR)
10411049
vdbetrace.lo: $(TOP)/src/vdbetrace.c $(HDR)
10421050
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbetrace.c
10431051

1052+
vdbevtab.lo: $(TOP)/src/vdbevtab.c $(HDR)
1053+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbevtab.c
1054+
10441055
vtab.lo: $(TOP)/src/vtab.c $(HDR)
10451056
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vtab.c
10461057

@@ -1094,6 +1105,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE)
10941105
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) $(TOP)/VERSION
10951106
$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
10961107

1108+
sqlite3rc.h: $(TOP)/src/sqlite3.rc $(TOP)/VERSION
1109+
echo '#ifndef SQLITE_RESOURCE_VERSION' >$@
1110+
echo -n '#define SQLITE_RESOURCE_VERSION ' >>$@
1111+
cat $(TOP)/VERSION | $(TCLSH_CMD) $(TOP)/tool/replace.tcl exact . , >>$@
1112+
echo '#endif' >>sqlite3rc.h
1113+
10971114
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
10981115
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
10991116
./mkkeywordhash$(BEXE) >keywordhash.h
@@ -1102,10 +1119,13 @@ keywordhash.h: $(TOP)/tool/mkkeywordhash.c
11021119
SHELL_SRC = \
11031120
$(TOP)/src/shell.c.in \
11041121
$(TOP)/ext/misc/appendvfs.c \
1105-
$(TOP)/ext/misc/shathree.c \
1106-
$(TOP)/ext/misc/fileio.c \
11071122
$(TOP)/ext/misc/completion.c \
1123+
$(TOP)/ext/misc/decimal.c \
1124+
$(TOP)/ext/misc/fileio.c \
1125+
$(TOP)/ext/misc/ieee754.c \
1126+
$(TOP)/ext/misc/shathree.c \
11081127
$(TOP)/ext/misc/sqlar.c \
1128+
$(TOP)/ext/misc/uint.c \
11091129
$(TOP)/ext/expert/sqlite3expert.c \
11101130
$(TOP)/ext/expert/sqlite3expert.h \
11111131
$(TOP)/ext/misc/zipfile.c \
@@ -1247,6 +1267,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
12471267
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
12481268
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12491269
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
1270+
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
12501271
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
12511272

12521273
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
@@ -1311,6 +1332,9 @@ valgrindtest: $(TESTPROGS) valgrindfuzz
13111332
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
13121333
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
13131334

1335+
shelltest: $(TESTPROGS)
1336+
./testfixture$(TEXT) $(TOP)/test/permutations.test shell
1337+
13141338
sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
13151339
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
13161340

@@ -1413,10 +1437,10 @@ checksymbols: sqlite3.o
14131437
# a tarball named for the version number. Ex: sqlite-autoconf-3110000.tar.gz.
14141438
# The snapshot-tarball target builds a tarball named by the SHA1 hash
14151439
#
1416-
amalgamation-tarball: sqlite3.c
1440+
amalgamation-tarball: sqlite3.c sqlite3rc.h
14171441
TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal
14181442

1419-
snapshot-tarball: sqlite3.c
1443+
snapshot-tarball: sqlite3.c sqlite3rc.h
14201444
TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot
14211445

14221446
# The next two rules are used to support the "threadtest" target. Building

‎Makefile.msc‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,15 @@ OSTRACE = 0
234234
DEBUG = 0
235235
!ENDIF
236236

237+
# <<mark>>
238+
# Disable use of the --linemacros argument to the mksqlite3c.tcl tool, which
239+
# is used to build the amalgamation.
240+
#
241+
!IFNDEF NO_LINEMACROS
242+
NO_LINEMACROS = 0
243+
!ENDIF
244+
# <</mark>>
245+
237246
# Enable use of available compiler optimizations? Normally, this should be
238247
# non-zero. Setting this to zero, thus disabling all compiler optimizations,
239248
# can be useful for testing.
@@ -357,6 +366,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
357366
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
358367
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
359368
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
369+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
360370
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
361371
!ENDIF
362372
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -775,7 +785,7 @@ MKSQLITE3C_TOOL = $(TOP)\tool\mksqlite3c.tcl
775785
!ENDIF
776786

777787
!IFNDEF MKSQLITE3C_ARGS
778-
!IF $(DEBUG)>1
788+
!IF $(DEBUG)>1 && $(NO_LINEMACROS)==0
779789
MKSQLITE3C_ARGS = --linemacros
780790
!ELSE
781791
MKSQLITE3C_ARGS =
@@ -1246,7 +1256,8 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
12461256
table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
12471257
update.lo upsert.lo util.lo vacuum.lo \
12481258
vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
1249-
vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
1259+
vdbetrace.lo vdbevtab.lo wal.lo walker.lo where.lo wherecode.lo \
1260+
whereexpr.lo \
12501261
window.lo utf.lo vtab.lo
12511262
# <</mark>>
12521263

@@ -1361,6 +1372,7 @@ SRC01 = \
13611372
$(TOP)\src\vdbemem.c \
13621373
$(TOP)\src\vdbesort.c \
13631374
$(TOP)\src\vdbetrace.c \
1375+
$(TOP)\src\vdbevtab.c \
13641376
$(TOP)\src\vtab.c \
13651377
$(TOP)\src\wal.c \
13661378
$(TOP)\src\walker.c \
@@ -1491,7 +1503,7 @@ SRC12 =
14911503

14921504
# All source code files.
14931505
#
1494-
SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11)
1506+
SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11) $(SRC12)
14951507

14961508
# Source code to the test files.
14971509
#
@@ -1556,6 +1568,7 @@ TESTEXT = \
15561568
$(TOP)\ext\misc\carray.c \
15571569
$(TOP)\ext\misc\closure.c \
15581570
$(TOP)\ext\misc\csv.c \
1571+
$(TOP)\ext\misc\decimal.c \
15591572
$(TOP)\ext\misc\eval.c \
15601573
$(TOP)\ext\misc\explain.c \
15611574
$(TOP)\ext\misc\fileio.c \
@@ -1692,6 +1705,7 @@ FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
16921705
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
16931706
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
16941707
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
1708+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_BYTECODE_VTAB
16951709

16961710
FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
16971711
OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
@@ -1841,15 +1855,16 @@ mptest: mptester.exe
18411855
for %i in ($(SRC11)) do copy /Y %i tsrc
18421856
for %i in ($(SRC12)) do copy /Y %i tsrc
18431857
copy /Y fts5.c tsrc
1858+
copy /B tsrc\fts5.c +,,
18441859
copy /Y fts5.h tsrc
1860+
copy /B tsrc\fts5.h +,,
18451861
del /Q tsrc\sqlite.h.in tsrc\parse.y 2>NUL
18461862
$(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl $(OPTS) < tsrc\vdbe.c > vdbe.new
18471863
move vdbe.new tsrc\vdbe.c
18481864
echo > .target_source
18491865

1850-
sqlite3.c: .target_source sqlite3ext.h $(MKSQLITE3C_TOOL)
1866+
sqlite3.c: .target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL)
18511867
$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)
1852-
copy $(TOP)\ext\session\sqlite3session.h .
18531868

18541869
sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
18551870
$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -1864,7 +1879,8 @@ sqlite3.lo: $(SQLITE3C)
18641879
# Rules to build the LEMON compiler generator
18651880
#
18661881
lempar.c: $(TOP)\tool\lempar.c
1867-
copy $(TOP)\tool\lempar.c .
1882+
copy /Y $(TOP)\tool\lempar.c .
1883+
copy /B lempar.c +,,
18681884

18691885
lemon.exe: $(TOP)\tool\lemon.c lempar.c
18701886
$(BCC) $(NO_WARN) -Daccess=_access \
@@ -2117,6 +2133,9 @@ vdbesort.lo: $(TOP)\src\vdbesort.c $(HDR)
21172133
vdbetrace.lo: $(TOP)\src\vdbetrace.c $(HDR)
21182134
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbetrace.c
21192135

2136+
vdbevtab.lo: $(TOP)\src\vdbevtab.c $(HDR)
2137+
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbevtab.c
2138+
21202139
vtab.lo: $(TOP)\src\vtab.c $(HDR)
21212140
$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vtab.c
21222141

@@ -2161,7 +2180,8 @@ parse.h: parse.c
21612180

21622181
parse.c: $(TOP)\src\parse.y lemon.exe
21632182
del /Q parse.y parse.h parse.h.temp 2>NUL
2164-
copy $(TOP)\src\parse.y .
2183+
copy /Y $(TOP)\src\parse.y .
2184+
copy /B parse.y +,,
21652185
.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y
21662186

21672187
$(SQLITE3H): $(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION
@@ -2174,8 +2194,13 @@ sqlite3ext.h: .target_source
21742194
copy /Y sqlite3ext.h tsrc\sqlite3ext.h
21752195
!ELSE
21762196
copy /Y tsrc\sqlite3ext.h sqlite3ext.h
2197+
copy /B sqlite3ext.h +,,
21772198
!ENDIF
21782199

2200+
sqlite3session.h: $(TOP)\ext\session\sqlite3session.h
2201+
copy /Y $(TOP)\ext\session\sqlite3session.h .
2202+
copy /B sqlite3session.h +,,
2203+
21792204
mkkeywordhash.exe: $(TOP)\tool\mkkeywordhash.c
21802205
$(BCC) $(NO_WARN) -Fe$@ $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) \
21812206
$(TOP)\tool\mkkeywordhash.c /link $(LDFLAGS) $(NLTLINKOPTS) $(NLTLIBPATHS)
@@ -2187,9 +2212,12 @@ keywordhash.h: $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
21872212
SHELL_SRC = \
21882213
$(TOP)\src\shell.c.in \
21892214
$(TOP)\ext\misc\appendvfs.c \
2190-
$(TOP)\ext\misc\shathree.c \
2191-
$(TOP)\ext\misc\fileio.c \
21922215
$(TOP)\ext\misc\completion.c \
2216+
$(TOP)\ext\misc\decimal.c \
2217+
$(TOP)\ext\misc\fileio.c \
2218+
$(TOP)\ext\misc\ieee754.c \
2219+
$(TOP)\ext\misc\shathree.c \
2220+
$(TOP)\ext\misc\uint.c \
21932221
$(TOP)\ext\expert\sqlite3expert.c \
21942222
$(TOP)\ext\expert\sqlite3expert.h \
21952223
$(TOP)\ext\misc\memtrace.c \
@@ -2320,19 +2348,22 @@ LSM1_SRC = \
23202348
$(TOP)\ext\lsm1\lsm_win32.c
23212349

23222350
fts5parse.c: $(TOP)\ext\fts5\fts5parse.y lemon.exe
2323-
copy $(TOP)\ext\fts5\fts5parse.y .
2351+
copy /Y $(TOP)\ext\fts5\fts5parse.y .
2352+
copy /B fts5parse.y +,,
23242353
del /Q fts5parse.h 2>NUL
23252354
.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S fts5parse.y
23262355

23272356
fts5parse.h: fts5parse.c
23282357

23292358
fts5.c: $(FTS5_SRC)
23302359
$(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl
2331-
copy $(TOP)\ext\fts5\fts5.h .
2360+
copy /Y $(TOP)\ext\fts5\fts5.h .
2361+
copy /B fts5.h +,,
23322362

23332363
lsm1.c: $(LSM1_SRC)
23342364
$(TCLSH_CMD) $(TOP)\ext\lsm1\tool\mklsm1c.tcl
2335-
copy $(TOP)\ext\lsm1\lsm.h .
2365+
copy /Y $(TOP)\ext\lsm1\lsm.h .
2366+
copy /B lsm.h +,,
23362367

23372368
fts5.lo: fts5.c $(HDR) $(EXTHDR)
23382369
$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c
@@ -2360,6 +2391,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
23602391
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
23612392
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23622393
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
2394+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
23632395
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
23642396
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23652397
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
@@ -2442,6 +2474,9 @@ smoketest: $(TESTPROGS)
24422474
@set PATH=$(LIBTCLPATH);$(PATH)
24432475
.\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)
24442476

2477+
shelltest: $(TESTPROGS)
2478+
.\testfixture.exe $(TOP)\test\permutations.test shell
2479+
24452480
sqlite3_analyzer.c: $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(SQLITE_TCL_DEP)
24462481
$(TCLSH_CMD) $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in > $@
24472482

‎SQLCipher.podspec.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"requires_arc": false,
1616
"source": {
1717
"git": "https://github.com/sqlcipher/sqlcipher.git",
18-
"tag": "v4.4.0"
18+
"tag": "v4.4.1"
1919
},
2020
"summary": "Full Database Encryption for SQLite.",
21-
"version": "4.4.0",
21+
"version": "4.4.1",
2222
"subspecs": [
2323
{
2424
"compiler_flags": [

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.31.0
1+
3.33.0

0 commit comments

Comments
 (0)