Merge branch 'prerelease'

developernotes · developernotes · commit a1fb0d231605 · 2013-06-27T10:13:06.000-05:00
diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
@@ -72,6 +72,7 @@ static int sqlcipher_openssl_activate(void *ctx) {
     }
     openssl_init_count++; 
   } 
+  return SQLITE_OK;
 }
 
 /* deactivate SQLCipher, most imporantly decremeting the activation count and
@@ -92,6 +93,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) {
     }
   }
   sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
+  return SQLITE_OK;
 }
 
 static const char* sqlcipher_openssl_get_provider_name(void *ctx) {
@@ -105,7 +107,7 @@ static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) {
 
 static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) {
   HMAC_CTX hctx;
-  int outlen;
+  unsigned int outlen;
   HMAC_CTX_init(&hctx);
   HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL);
   HMAC_Update(&hctx, in, in_sz);
@@ -204,6 +206,7 @@ int sqlcipher_openssl_setup(sqlcipher_provider *p) {
   p->ctx_init = sqlcipher_openssl_ctx_init;
   p->ctx_free = sqlcipher_openssl_ctx_free;
   p->add_random = sqlcipher_openssl_add_random;
+  return SQLITE_OK;
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ static int sqlcipher_openssl_activate(void *ctx) {`
`72`	`72`	`}`
`73`	`73`	`openssl_init_count++;`
`74`	`74`	`}`
	`75`	`+ return SQLITE_OK;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`/* deactivate SQLCipher, most imporantly decremeting the activation count and`
`@@ -92,6 +93,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) {`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));`
	`96`	`+ return SQLITE_OK;`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`static const char* sqlcipher_openssl_get_provider_name(void *ctx) {`
`@@ -105,7 +107,7 @@ static int sqlcipher_openssl_random (void ctx, void buffer, int length) {`
`105`	`107`
`106`	`108`	`static int sqlcipher_openssl_hmac(void ctx, unsigned char hmac_key, int key_sz, unsigned char in, int in_sz, unsigned char in2, int in2_sz, unsigned char *out) {`
`107`	`109`	`HMAC_CTX hctx;`
`108`		`- int outlen;`
	`110`	`+ unsigned int outlen;`
`109`	`111`	`HMAC_CTX_init(&hctx);`
`110`	`112`	`HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL);`
`111`	`113`	`HMAC_Update(&hctx, in, in_sz);`
`@@ -204,6 +206,7 @@ int sqlcipher_openssl_setup(sqlcipher_provider *p) {`
`204`	`206`	`p->ctx_init = sqlcipher_openssl_ctx_init;`
`205`	`207`	`p->ctx_free = sqlcipher_openssl_ctx_free;`
`206`	`208`	`p->add_random = sqlcipher_openssl_add_random;`
	`209`	`+ return SQLITE_OK;`
`207`	`210`	`}`
`208`	`211`
`209`	`212`	`#endif`