Merge branch 'prerelease'

sjlombardo · sjlombardo · commit c19c72f512d2 · 2012-12-07T11:20:44.000-05:00
diff --git a/src/crypto.h b/src/crypto.h
@@ -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
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -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);
diff --git a/test/crypto.test b/test/crypto.test
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ void sqlcipher_codec_ctx_free(codec_ctx **iCtx) {`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`/** convert a 32bit unsigned integer to little endian byte ordering */`
`604`		`-static inline void sqlcipher_put4byte_le(unsigned char *p, u32 v) {`
	`604`	`+static void sqlcipher_put4byte_le(unsigned char *p, u32 v) {`
`605`	`605`	`p[0] = (u8)v;`
`606`	`606`	`p[1] = (u8)(v>>8);`
`607`	`607`	`p[2] = (u8)(v>>16);`
Original file line number	Diff line number	Diff line change
`@@ -1392,7 +1392,7 @@ do_test verify-pragma-cipher-version {`
`1392`	`1392`	`execsql {`
`1393`	`1393`	`PRAGMA cipher_version;`
`1394`	`1394`	`}`
`1395`		`-} {2.1.0}`
	`1395`	`+} {2.1.1}`
`1396`	`1396`	`db close`
`1397`	`1397`	`file delete -force test.db`
`1398`	`1398`