All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PULL v2 5/8] crypto: remove bogus /= 2 for pbkdf iterations
Date: Mon, 19 Sep 2016 16:33:54 +0100	[thread overview]
Message-ID: <1474299237-1054-6-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1474299237-1054-1-git-send-email-berrange@redhat.com>

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 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 9269aaf..3ab3250 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -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",
-- 
2.7.4

  parent reply	other threads:[~2016-09-19 15:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-19 15:33 [Qemu-devel] [PULL v2 0/8] Merge qcrypto 2016/09/19 Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 1/8] crypto: use uint64_t for pbkdf iteration count parameters Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 2/8] crypto: make PBKDF iterations configurable for LUKS format Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 3/8] crypto: clear out buffer after timing pbkdf algorithm Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 4/8] crypto: use correct derived key size when timing pbkdf Daniel P. Berrange
2016-09-19 15:33 ` Daniel P. Berrange [this message]
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 6/8] crypto: increase default pbkdf2 time for luks to 2 seconds Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 7/8] crypto: support more hash algorithms for pbkdf Daniel P. Berrange
2016-09-19 15:33 ` [Qemu-devel] [PULL v2 8/8] crypto: add trace points for TLS cert verification Daniel P. Berrange
2016-09-19 15:55 ` [Qemu-devel] [PULL v2 0/8] Merge qcrypto 2016/09/19 no-reply
2016-09-19 17:06 ` Peter Maydell
2016-09-19 20:16 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1474299237-1054-6-git-send-email-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.