Merge remote-tracking branch 'origin/prerelease' into kdfiter

developernotes · developernotes · commit 81e487afb7b1 · 2013-07-11T16:21:00.000-05:00
diff --git a/src/crypto.h b/src/crypto.h
@@ -44,7 +44,7 @@
 #define FILE_HEADER_SZ 16
 
 #ifndef CIPHER_VERSION
-#define CIPHER_VERSION "2.2.0"
+#define CIPHER_VERSION "2.2.1"
 #endif
 
 #ifndef CIPHER
diff --git a/test/crypto.test b/test/crypto.test
@@ -1424,7 +1424,7 @@ do_test verify-pragma-cipher-version {
     execsql {
         PRAGMA cipher_version;
     }
-} {2.2.0}
+} {2.2.1}
 db close
 file delete -force test.db
 

Original file line number	Diff line number	Diff line change
`@@ -1424,7 +1424,7 @@ do_test verify-pragma-cipher-version {`
`1424`	`1424`	`execsql {`
`1425`	`1425`	`PRAGMA cipher_version;`
`1426`	`1426`	`}`
`1427`		`-} {2.2.0}`
	`1427`	`+} {2.2.1}`
`1428`	`1428`	`db close`
`1429`	`1429`	`file delete -force test.db`
`1430`	`1430`