increase to 128K KDF

This commit is contained in:
Stephen Lombardo 2018-08-30 13:29:31 -04:00
parent fee1153e5c
commit a0320d99b3
2 changed files with 9 additions and 8 deletions

View File

@ -63,7 +63,7 @@
#define CIPHER_READWRITE_CTX 2
#ifndef PBKDF2_ITER
#define PBKDF2_ITER 64000
#define PBKDF2_ITER 128000
#endif
/* possible flags for cipher_ctx->flags */

View File

@ -1493,8 +1493,8 @@ do_test default-hmac-kdf-attach {
ATTACH 'sqlcipher-1.1.8-testkey.db' AS db2 KEY 'testkey';
SELECT count(*) from db2.t1;
PRAGMA cipher_default_use_hmac = ON;
PRAGMA cipher_default_kdf_iter = 64000;
PRAGMA cipher_default_kdf_iter = 4096;
PRAGMA cipher_default_kdf_iter = 128000;
PRAGMA cipher_default_page_size = 4096;
}
} {75709 75709}
db close
@ -1542,7 +1542,7 @@ do_test change-default-hmac-kdf-attach {
ATTACH 'sqlcipher-1.1.8-testkey.db' AS db2 KEY 'testkey';
SELECT count(*) from db2.t1;
PRAGMA cipher_default_use_hmac = ON;
PRAGMA cipher_default_kdf_iter = 64000;
PRAGMA cipher_default_kdf_iter = 128000;
PRAGMA cipher_default_page_size = 4096;
}
} {1 75709}
@ -1727,6 +1727,7 @@ do_test open-3.0-le-database {
execsql {
PRAGMA key = 'testkey';
PRAGMA cipher_page_size = 1024;
PRAGMA kdf_iter = 64000;
SELECT count(*) FROM t1;
SELECT distinct * FROM t1;
}
@ -1844,13 +1845,13 @@ db close
file delete -force test.db
# verify the pragma default_cipher_kdf_iter
# is set to 64000 by default
# is set to 128000 by default
do_test verify-pragma-cipher-default-kdf-iter-default {
sqlite_orig db test.db
execsql {
PRAGMA cipher_default_kdf_iter;
}
} {64000}
} {128000}
db close
file delete -force test.db
@ -1862,7 +1863,7 @@ do_test verify-pragma-cipher-default-use-hmac-off {
execsql {
PRAGMA cipher_default_kdf_iter = 1000;
PRAGMA cipher_default_kdf_iter;
PRAGMA cipher_default_kdf_iter = 64000;
PRAGMA cipher_default_kdf_iter = 128000;
}
} {1000}
db close
@ -1876,7 +1877,7 @@ do_test verify-pragma-kdf-iter-reports-default {
PRAGMA key = 'test';
PRAGMA kdf_iter;
}
} {64000}
} {128000}
db close
file delete -force test.db