From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi2At-00011f-3x for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi2Ar-00076f-3l for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi2Aq-00076T-UN for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:37 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94A074E05F for ; Thu, 8 Sep 2016 16:27:36 +0000 (UTC) From: "Daniel P. Berrange" Date: Thu, 8 Sep 2016 17:27:25 +0100 Message-Id: <1473352047-908-5-git-send-email-berrange@redhat.com> In-Reply-To: <1473352047-908-1-git-send-email-berrange@redhat.com> References: <1473352047-908-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] crypto: remove bogus /= 2 for pbkdf iterations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 by cryptsetup had this division and it was recently removed too. Signed-off-by: Daniel P. Berrange --- crypto/block-luks.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 11047fa..7d5893a 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -1154,9 +1154,6 @@ qcrypto_block_luks_create(QCryptoBlock *block, /* iter_time was in millis, but count_iters reported for secs */ iters /= 1000; - /* Why /= 2 ? That matches cryptsetup, but there's no - * explanation why they chose /= 2... */ - iters /= 2; if (iters > UINT32_MAX) { error_setg(errp, "Too many PBKDF iterations for LUKS format"); goto error; -- 2.7.4