diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-09-07 12:48:32 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2016-09-19 16:30:45 +0100 |
| commit | 2ab66cd577d6d0ec3c44b14cc823e76ea5a4397c (patch) | |
| tree | 83ba90f474b0dbb90706b0234b7ea442f1a46c0a | |
| parent | acd0dfd0c252a06ec6f2146fea01b66b7bc68cfc (diff) | |
| download | qemu-2ab66cd577d6d0ec3c44b14cc823e76ea5a4397c.tar.gz | |
crypto: increase default pbkdf2 time for luks to 2 seconds
cryptsetup recently increased the default pbkdf2 time to 2 seconds
to partially mitigate improvements in hardware performance wrt
brute-forcing the pbkdf algorithm. This updates QEMU defaults to
match.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | crypto/block-luks.c | 2 | ||||
| -rw-r--r-- | qapi/crypto.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 3ab3250e3d..a848232034 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -921,7 +921,7 @@ qcrypto_block_luks_create(QCryptoBlock *block, memcpy(&luks_opts, &options->u.luks, sizeof(luks_opts)); if (!luks_opts.has_iter_time) { - luks_opts.iter_time = 1000; + luks_opts.iter_time = 2000; } if (!luks_opts.has_cipher_alg) { luks_opts.cipher_alg = QCRYPTO_CIPHER_ALG_AES_256; diff --git a/qapi/crypto.json b/qapi/crypto.json index 2b6118f660..6933b13bd0 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -187,7 +187,7 @@ # Currently defaults to 'sha256' # @iter-time: #optional number of milliseconds to spend in # PBKDF passphrase processing. Currently defaults -# to 1000. (since 2.8) +# to 2000. (since 2.8) # Since: 2.6 ## { 'struct': 'QCryptoBlockCreateOptionsLUKS', |