From f7781428d86d569589df418b2cea5cca06568794 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Fri, 7 Dec 2012 10:55:59 -0500 Subject: [PATCH 1/2] remove inline to support vs compilation --- src/crypto_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crypto_impl.c b/src/crypto_impl.c index 7a6845b..f35144d 100644 --- 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); From cf9fb1e07777bcacb1e020f5c215ae75167800ce Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Fri, 7 Dec 2012 10:56:20 -0500 Subject: [PATCH 2/2] rev to 2.1.1 --- src/crypto.h | 2 +- test/crypto.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crypto.h b/src/crypto.h index 6e33f03..8520152 100644 --- 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/test/crypto.test b/test/crypto.test index 6da65b6..e8bbe85 100644 --- 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