From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blwzw-0002QN-7e for qemu-devel@nongnu.org; Mon, 19 Sep 2016 07:44:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1blwzu-00017r-Bt for qemu-devel@nongnu.org; Mon, 19 Sep 2016 07:44:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blwzu-00017l-63 for qemu-devel@nongnu.org; Mon, 19 Sep 2016 07:44:30 -0400 From: "Daniel P. Berrange" Date: Mon, 19 Sep 2016 12:44:09 +0100 Message-Id: <1474285452-6166-6-git-send-email-berrange@redhat.com> In-Reply-To: <1474285452-6166-1-git-send-email-berrange@redhat.com> References: <1474285452-6166-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 5/8] crypto: remove bogus /= 2 for pbkdf iterations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Daniel P. Berrange" 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 Signed-off-by: Daniel P. Berrange --- 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