]> git.proxmox.com Git - mirror_qemu.git/commitdiff
crypto: remove bogus /= 2 for pbkdf iterations
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 7 Sep 2016 12:17:07 +0000 (13:17 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Mon, 19 Sep 2016 15:30:45 +0000 (16:30 +0100)
When calculating iterations for pbkdf of the key slot
data, we had a /= 2, which was copied from identical
code in cryptsetup. It was always unclear & undocumented
why cryptsetup had this division and it was recently
removed there, too.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
crypto/block-luks.c

index 9269aaf488363a08d46988ac8c784440f8b19d69..3ab3250e3da5d1471c1ec43d6e31c9589e486216 100644 (file)
@@ -1170,10 +1170,6 @@ qcrypto_block_luks_create(QCryptoBlock *block,
     /* iter_time was in millis, but count_iters reported for secs */
     iters = iters * luks_opts.iter_time / 1000;
 
-    /* Why /= 2 ?  That matches cryptsetup, but there's no
-     * explanation why they chose /= 2... */
-    iters /= 2;
-
     if (iters > UINT32_MAX) {
         error_setg_errno(errp, ERANGE,
                          "PBKDF iterations %llu larger than %u",