Merge branch 'prerelease'

This commit is contained in:
Stephen Lombardo
2012-12-07 11:20:44 -05:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -38,7 +38,7 @@
#define FILE_HEADER_SZ 16
#ifndef CIPHER_VERSION
#define CIPHER_VERSION "2.1.0"
#define CIPHER_VERSION "2.1.1"
#endif
#ifndef CIPHER
+1 -1
View File
@@ -601,7 +601,7 @@ void sqlcipher_codec_ctx_free(codec_ctx **iCtx) {
}
/** convert a 32bit unsigned integer to little endian byte ordering */
static inline void sqlcipher_put4byte_le(unsigned char *p, u32 v) {
static void sqlcipher_put4byte_le(unsigned char *p, u32 v) {
p[0] = (u8)v;
p[1] = (u8)(v>>8);
p[2] = (u8)(v>>16);
+1 -1
View File
@@ -1392,7 +1392,7 @@ do_test verify-pragma-cipher-version {
execsql {
PRAGMA cipher_version;
}
} {2.1.0}
} {2.1.1}
db close
file delete -force test.db