signalapp/sqlcipher
signalapp/sqlcipher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explicitly use RAND_bytes per issue #15

Browse Source
This commit is contained in:
Stephen Lombardo 2011-12-27 10:35:43 -05:00
parent 5c743489b0
commit 9f710946ac
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto_impl.c
View File

@ -65,8 +65,8 @@ int sqlcipher_memcmp(const unsigned char *a0, const unsigned char *a1, int len)
}
/* generate a defined number of pseudorandom bytes */
int sqlcipher_pseudorandom (void *buffer, int length) {
return RAND_pseudo_bytes(buffer, length);
int sqlcipher_random (void *buffer, int length) {
return RAND_bytes(buffer, length);
}
/**
@ -312,7 +312,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 */
sqlcipher_pseudorandom(ctx->kdf_salt, FILE_HEADER_SZ);
if(sqlcipher_random(ctx->kdf_salt, FILE_HEADER_SZ) != 1) return SQLITE_ERROR;
}
sqlcipher_codec_ctx_set_cipher(ctx, CIPHER, 0);
@ -392,7 +392,8 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int
}
if(mode == CIPHER_ENCRYPT) {
sqlcipher_pseudorandom(iv_out, c_ctx->reserve_sz); /* start at front of the reserve block, write random data to the end */
/* start at front of the reserve block, write random data to the end */
if(sqlcipher_random(iv_out, c_ctx->reserve_sz) != 1) return SQLITE_ERROR;
} else { /* CIPHER_DECRYPT */
memcpy(iv_out, iv_in, c_ctx->iv_sz); /* copy the iv from the input to output buffer */
}