status-im/sqlcipher
2
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2025-02-23 17:28:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "perform fast key derivation on raw keys"

Browse Source 
This reverts commit 2e868032dc0acbf631bcdb36345eaf1b900d9b14.
This commit is contained in:
Stephen Lombardo 2012-01-13 12:27:16 -05:00
parent f963c3e48c
commit 8ce46cd998
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/crypto_impl.c
View File

@ -568,22 +568,8 @@ int sqlcipher_cipher_ctx_key_derive(codec_ctx *ctx, cipher_ctx *c_ctx) {
if (c_ctx->pass_sz == ((c_ctx->key_sz*2)+3) && sqlite3StrNICmp(c_ctx->pass ,"x'", 2) == 0) {
int n = c_ctx->pass_sz - 3; /* adjust for leading x' and tailing ' */
const char *z = c_ctx->pass + 2; /* adjust lead offset of x' */
unsigned char *key_tmp;
#ifndef OMIT_RAW_PBKDF2
CODEC_TRACE(("codec_key_derive: deriving cipher key from raw key with fast PBKDF2 %d iterations\n", c_ctx->fast_kdf_iter));
key_tmp = sqlcipher_malloc(c_ctx->key_sz);
if(key_tmp == NULL) return SQLITE_NOMEM;
cipher_hex2bin(z, n, key_tmp);
PKCS5_PBKDF2_HMAC_SHA1( key_tmp, c_ctx->key_sz,
ctx->kdf_salt, ctx->kdf_salt_sz,
c_ctx->fast_kdf_iter, c_ctx->key_sz, c_ctx->key);
sqlcipher_free(key_tmp, c_ctx->key_sz);
#else
CODEC_TRACE(("codec_key_derive: using raw key from hex as cipher_key\n"));
CODEC_TRACE(("codec_key_derive: deriving key from hex\n"));
cipher_hex2bin(z, n, c_ctx->key);
#endif
} else {
CODEC_TRACE(("codec_key_derive: deriving key using full PBKDF2 with %d iterations\n", c_ctx->kdf_iter));
PKCS5_PBKDF2_HMAC_SHA1( c_ctx->pass, c_ctx->pass_sz,
@ -608,7 +594,7 @@ int sqlcipher_cipher_ctx_key_derive(codec_ctx *ctx, cipher_ctx *c_ctx) {
ctx->hmac_kdf_salt[i] ^= HMAC_SALT_MASK;
}
CODEC_TRACE(("codec_key_derive: deriving hmac key from encryption key using fast PBKDF2 with %d iterations\n",
CODEC_TRACE(("codec_key_derive: deriving hmac key from encryption key using PBKDF2 with %d iterations\n",
c_ctx->fast_kdf_iter));
PKCS5_PBKDF2_HMAC_SHA1( (const char*)c_ctx->key, c_ctx->key_sz,
ctx->hmac_kdf_salt, ctx->kdf_salt_sz,