bumps version to 4.2.0

sjlombardo · sjlombardo · commit 83cddfda2150 · 2019-05-20T15:05:05.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # SQLCipher Change Log
 All notable changes to this project will be documented in this file.
 
-## [unreleased] - (TBD - [unreleased])
--  Adds PRAGMA cipher_integrity_check to perform external verification of page HMACs
+## [4.2.0] - (May 2019 - [4.2.0 changes])
+- Adds PRAGMA cipher_integrity_check to perform independent verification of page HMACs
 - Updates baseline to upstream SQLite 3.28.0
 
 ## [4.1.0] - (March 2019 - [4.1.0 changes])
@@ -144,7 +144,9 @@ All notable changes to this project will be documented in this file.
 ### Security
 - Change KDF iteration length from 4,000 to 64,000
 
-[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v4.1.0...prerelease
+[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v4.2.0...prerelease
+[4.2.0]: https://github.com/sqlcipher/sqlcipher/tree/v4.2.0
+[4.2.0 changes]: https://github.com/sqlcipher/sqlcipher/compare/v4.1.0...v4.2.0
 [4.1.0]: https://github.com/sqlcipher/sqlcipher/tree/v4.1.0
 [4.1.0 changes]: https://github.com/sqlcipher/sqlcipher/compare/v4.0.1...v4.1.0
 [4.0.1]: https://github.com/sqlcipher/sqlcipher/tree/v4.0.1
diff --git a/SQLCipher.podspec.json b/SQLCipher.podspec.json
@@ -15,10 +15,10 @@
   "requires_arc": false,
   "source": {
     "git": "https://github.com/sqlcipher/sqlcipher.git",
-    "tag": "v4.1.0"
+    "tag": "v4.2.0"
   },
   "summary": "Full Database Encryption for SQLite.",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "subspecs": [
     {
       "compiler_flags": [
diff --git a/src/crypto.h b/src/crypto.h
@@ -58,7 +58,7 @@ void sqlite3pager_reset(Pager *pPager);
 #define CIPHER_STR(s) #s
 
 #ifndef CIPHER_VERSION_NUMBER
-#define CIPHER_VERSION_NUMBER 4.1.0
+#define CIPHER_VERSION_NUMBER 4.2.0
 #endif
 
 #ifndef CIPHER_VERSION_BUILD
diff --git a/test/sqlcipher-pragmas.test b/test/sqlcipher-pragmas.test
@@ -46,7 +46,7 @@ do_test verify-pragma-cipher-version {
     execsql {
         PRAGMA cipher_version;
     }
-} {{4.1.0 community}}
+} {{4.2.0 community}}
 db close
 file delete -force test.db
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ do_test verify-pragma-cipher-version {`
`46`	`46`	`execsql {`
`47`	`47`	`PRAGMA cipher_version;`
`48`	`48`	`}`
`49`		`-} {{4.1.0 community}}`
	`49`	`+} {{4.2.0 community}}`
`50`	`50`	`db close`
`51`	`51`	`file delete -force test.db`
`52`	`52`