From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1k9npn-0003Zd-3J for mharc-grub-devel@gnu.org; Sun, 23 Aug 2020 07:06:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9npl-0003Xx-Uh for grub-devel@gnu.org; Sun, 23 Aug 2020 07:06:45 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:54813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9nnp-0000IK-J1 for grub-devel@gnu.org; Sun, 23 Aug 2020 07:06:45 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 0B3F0580342; Sun, 23 Aug 2020 07:04:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 23 Aug 2020 07:04:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=uVVLtUohnD8caLgjaYZw3eYzmSu CSxTwWPR2nqjIwVU=; b=GeCFxfx0k+Xguzm0hM0RyS8uvNUZxt3OTmS5zO5vbNK 4Kwp/2E4b6vrZY4i+yxb1AWSgZI83O9eB2Elizn5vymxJ94M9tnFzk99M30xQ1nM 2KC85Sy8vcHIY380kAVR/SiL3VurvqLrQVN30pXIB0AZI4aUmrk+ThCK/mziyWF1 s0eNnbS7oJiC8H9uao+a4E9cLXppBlUBbRuhLL1FswtrbK1qs55mBgr4OrsZHO0F O2JgCRto8h4vrVRXwu8VWNECwKOEFuOjKFwMDgG6ZOpEBNiBal/oHdGw3lZZiFkJ RbHTlJAoQxa/dAxdFWj+nuayZm+ZKGnnt63ecIxmiHA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=uVVLtU ohnD8caLgjaYZw3eYzmSuCSxTwWPR2nqjIwVU=; b=ZjMBKabB/uNF70m75UgtWE BkUbgvzGEH/eQgQ1Rh7k1Zluu9u2DG+M8d43RnooasGhyBbEURq6KZSTX0IOjlJT 4oKX+TBJDFRzoG6vHof5VXnrdqwKMcagqEwTOxwd2cGCPuy67Cvk9FF4aMjU5olV mUnusQO703zP7picDEaTpXmemFEtDM1s6SqGKKjtCmLX3LoF8E5uJaD9Trgq04Ro OTz89DZF9FUiK19m+9i/Or7HIetwtOv+UVhXEqBICr7ZEQZ9TfYA0ulCLKfGi3Gx 6kDghsztNh6iZwHvOQaigo534+y6vsUdjQKkNI44ujYu8mIfeP47wohDFzNCsP4g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudduiedgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrddukeefrdehkedrudelheenucevlhhushhtvghrufhiiigvpeejnecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (x4db73ac3.dyn.telefonica.de [77.183.58.195]) by mail.messagingengine.com (Postfix) with ESMTPA id 3F32C30600B1; Sun, 23 Aug 2020 07:04:34 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 96142eb8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 23 Aug 2020 11:04:32 +0000 (UTC) Date: Sun, 23 Aug 2020 13:04:35 +0200 From: Patrick Steinhardt To: grub-devel@gnu.org Cc: Denis 'GNUtoo' Carikli , Glenn Washburn , Daniel Kiper Subject: [PATCH 8/9] cryptodisk: Fix cipher IV mode 'plain64' always being set as 'plain' Message-ID: <12bc26698b51da43d35972e102aa21ea0edb6199.1598179677.git.ps@pks.im> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="AqsLC8rIMeq19msA" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=66.111.4.224; envelope-from=ps@pks.im; helo=new2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/23 06:59:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2020 11:06:46 -0000 --AqsLC8rIMeq19msA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =46rom: Glenn Washburn Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt --- grub-core/disk/cryptodisk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 76ec2d4b9..74ab54eaa 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -501,10 +501,10 @@ grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, c= onst char *ciphername, cons =20 if (cipheriv =3D=3D NULL) ; - else if (grub_memcmp (cipheriv, "plain", sizeof ("plain") - 1) =3D=3D 0) - mode_iv =3D GRUB_CRYPTODISK_MODE_IV_PLAIN; else if (grub_memcmp (cipheriv, "plain64", sizeof ("plain64") - 1) =3D= =3D 0) mode_iv =3D GRUB_CRYPTODISK_MODE_IV_PLAIN64; + else if (grub_memcmp (cipheriv, "plain", sizeof ("plain") - 1) =3D=3D 0) + mode_iv =3D GRUB_CRYPTODISK_MODE_IV_PLAIN; else if (grub_memcmp (cipheriv, "benbi", sizeof ("benbi") - 1) =3D=3D 0) { if (cipher->cipher->blocksize & (cipher->cipher->blocksize - 1) --=20 2.28.0 --AqsLC8rIMeq19msA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl9CTUIACgkQVbJhu7ck PpRgNQ//TeeqAkkSAnHsHTk2oLQbPfseETscB/n4psCf/R1KMqU9J0vztCYgYjYa YP0/TLoQ/Ye0OvZTZz35w+xSi0vjmrgyN2QJX5hbYAG5dS9A0aGAm40hnYtiljFW jLnWmyoOC4rv7W4kVC2Hb/nP+6HTgxDK808Lflx6hGceJh4K7oD8d38iZgq0MZc/ FI7BYlX276y+vfy6R0mmZ/PIIXe0tYXsUIY/j4IRPXDHPAcKMzrYf1Uk1p+urNJu 6hzMAmAdO65QPXCcAkAj8mPYWco2S88sEb6VfVljcE+WsSvriquY+qL54GPUAeow Q0QnhdmvmmOLtFQBJ9DJf528hf3G3/vF6TaNtvamO8HbEGL1TRIZnCceN9sYkaxM A50WX22vIgklv++4nFTHtWHXgASDBwBheiUzszccVl+i80LZuUS0CZSsPOAU4Kto sT7+j5L6J/qrkket69eWn4om3K6PJ+7YzJBs/sm/46fX6XXuTTgn3Xh+urZpSqGz bj7d6gL5+eyoNDj+kHTKhruad6CYowuCqU0yjouA//J1lTfAhaU5y8hPnb6fFNQj W/QxrYxvtdRQCj3AWWqz45NEVOIeF+pkfuSMhbvLuFb9hQb2mro2GgG3gOJ3h8xz xXlzWlwNFfgwbwdJWXIdck5K+ccD6iIvmbGEAiWmCk4bAtm+cbU= =KK+8 -----END PGP SIGNATURE----- --AqsLC8rIMeq19msA--