Checking for SQLITE_OK as return code for random

developernotes · developernotes · commit 51f2855d36ca · 2013-06-11T11:24:29.000-05:00
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -557,7 +557,7 @@ int sqlcipher_codec_ctx_init(codec_ctx **iCtx, Db *pDb, Pager *pPager, sqlite3_f
 
   if(fd == NULL || sqlite3OsRead(fd, ctx->kdf_salt, FILE_HEADER_SZ, 0) != SQLITE_OK) {
     /* if unable to read the bytes, generate random salt */
-    if(ctx->read_ctx->provider->random(ctx->read_ctx->provider_ctx, ctx->kdf_salt, FILE_HEADER_SZ) != 1) return SQLITE_ERROR;
+    if(ctx->read_ctx->provider->random(ctx->read_ctx->provider_ctx, ctx->kdf_salt, FILE_HEADER_SZ) != SQLITE_OK) return SQLITE_ERROR;
   }
 
   if((rc = sqlcipher_codec_ctx_set_cipher(ctx, CIPHER, 0)) != SQLITE_OK) return rc;
@@ -662,7 +662,7 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int
 
   if(mode == CIPHER_ENCRYPT) {
     /* start at front of the reserve block, write random data to the end */
-    if(c_ctx->provider->random(c_ctx->provider_ctx, iv_out, c_ctx->reserve_sz) != 1) return SQLITE_ERROR; 
+    if(c_ctx->provider->random(c_ctx->provider_ctx, iv_out, c_ctx->reserve_sz) != SQLITE_OK) return SQLITE_ERROR; 
   } else { /* CIPHER_DECRYPT */
     memcpy(iv_out, iv_in, c_ctx->iv_sz); /* copy the iv from the input to output buffer */
   } 
diff --git a/src/crypto_libtomcrypt.c b/src/crypto_libtomcrypt.c
@@ -19,7 +19,7 @@ static int sqlcipher_ltc_activate(void *ctx) {
   ltc_ctx *ltc = (ltc_ctx*)ctx;
   int random_buffer_sz = 32;
   unsigned char random_buffer[random_buffer_sz];
-
+  
   if(ltc_init == 0) {
     if(register_prng(&fortuna_desc) != CRYPT_OK) return SQLITE_ERROR;
     if(register_cipher(&rijndael_desc) != CRYPT_OK) return SQLITE_ERROR;
@@ -53,8 +53,11 @@ static const char* sqlcipher_ltc_get_provider_name(void *ctx) {
 
 static int sqlcipher_ltc_random(void *ctx, void *buffer, int length) {
   ltc_ctx *ltc = (ltc_ctx*)ctx;
-
-  fortuna_ready(&(ltc->prng));
+  int rc;
+  
+  if((rc = fortuna_ready(&(ltc->prng))) != CRYPT_OK) {
+    return SQLITE_ERROR;
+  }
   fortuna_read(buffer, length, &(ltc->prng));
   return SQLITE_OK;
 }
diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
@@ -71,7 +71,8 @@ static const char* sqlcipher_openssl_get_provider_name(void *ctx) {
 
 /* generate a defined number of pseudorandom bytes */
 static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) {
-  return RAND_bytes((unsigned char *)buffer, length);
+  RAND_bytes((unsigned char *)buffer, length);
+  return SQLITE_OK;
 }
 
 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) {

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ int sqlcipher_codec_ctx_init(codec_ctx *iCtx, Db pDb, Pager *pPager, sqlite3_f`
`557`	`557`
`558`	`558`	`if(fd == NULL \|\| sqlite3OsRead(fd, ctx->kdf_salt, FILE_HEADER_SZ, 0) != SQLITE_OK) {`
`559`	`559`	`/* if unable to read the bytes, generate random salt */`
`560`		`- if(ctx->read_ctx->provider->random(ctx->read_ctx->provider_ctx, ctx->kdf_salt, FILE_HEADER_SZ) != 1) return SQLITE_ERROR;`
	`560`	`+ if(ctx->read_ctx->provider->random(ctx->read_ctx->provider_ctx, ctx->kdf_salt, FILE_HEADER_SZ) != SQLITE_OK) return SQLITE_ERROR;`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`if((rc = sqlcipher_codec_ctx_set_cipher(ctx, CIPHER, 0)) != SQLITE_OK) return rc;`
`@@ -662,7 +662,7 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int`
`662`	`662`
`663`	`663`	`if(mode == CIPHER_ENCRYPT) {`
`664`	`664`	`/* start at front of the reserve block, write random data to the end */`
`665`		`- if(c_ctx->provider->random(c_ctx->provider_ctx, iv_out, c_ctx->reserve_sz) != 1) return SQLITE_ERROR;`
	`665`	`+ if(c_ctx->provider->random(c_ctx->provider_ctx, iv_out, c_ctx->reserve_sz) != SQLITE_OK) return SQLITE_ERROR;`
`666`	`666`	`} else { /* CIPHER_DECRYPT */`
`667`	`667`	`memcpy(iv_out, iv_in, c_ctx->iv_sz); /* copy the iv from the input to output buffer */`
`668`	`668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ static const char* sqlcipher_openssl_get_provider_name(void *ctx) {`
`71`	`71`
`72`	`72`	`/* generate a defined number of pseudorandom bytes */`
`73`	`73`	`static int sqlcipher_openssl_random (void ctx, void buffer, int length) {`
`74`		`- return RAND_bytes((unsigned char *)buffer, length);`
	`74`	`+ RAND_bytes((unsigned char *)buffer, length);`
	`75`	`+ return SQLITE_OK;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`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) {`