From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kAqXO-0007Kh-60 for mharc-grub-devel@gnu.org; Wed, 26 Aug 2020 04:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAqXM-0007HO-Ja for grub-devel@gnu.org; Wed, 26 Aug 2020 04:12:04 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:52827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAqXK-0005QN-Ss for grub-devel@gnu.org; Wed, 26 Aug 2020 04:12:04 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 77D1510BB; Wed, 26 Aug 2020 04:12:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 26 Aug 2020 04:12:01 -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=fVjd4oK7DbgG/39eqCmsgvFwyk6 F+3ctKV0jY99t6vw=; b=nQM0c+7P48LkKvUvuxAgrGDQfjL/Q1rafr5pO20gKMd RSnIPD4UaxU11jsdMSSqQNEpFEgKOkdX9UQ6QVt9RdZqIdoK8m6AKRPoEQ/gi14C 06ZHAd7S8YNOXz1vRzZ3EHmdhReq+GZnjXmBx8tfp+7NS23wHT1Cjy5BC1/fsPAv EX9bkW8F4o866JB6mxabgw9BBW/kFPVcZzfKCc9CtKxDRbeD8GcMLoYjbQlQbESw jeQIQNsevQ8nosRhJVKERYbciv/UxZs0tsfyZLmLHmz+tCuq9MrnM7D/xvVtbxMd 7pdykgXLAmuFQFHEHwePtCmVy3UoY1U8zmaRbN7osuA== 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=fVjd4o K7DbgG/39eqCmsgvFwyk6F+3ctKV0jY99t6vw=; b=XQq3NjNi9YvZOp6gtKRWPg oPuvs7fDy2tlC1J5n6InWc7YzZcrh13K5dUbCc2maTsS+w1JHT0ptHWVQ466t49O Wh6WBZHgqfeJtc6yzDpL5u8ODYO5ic37ZKMG2+fNwSC3y03APwHdA57Faa+qFleZ 6MgWbXjEyoo0Nl0vkaSYqLn36g7y0uhOojuHaZLHNkIznJ4iNTMTi15RhppoH+S4 uYESz6jJOT8sEHVwziO4iTj+WZ9z2TiGdaOQvWPok+4szt8Xw21AWSHkyir5SlIR xn2wWdXmyya1FSM8PNNnPJO+yWFjkLfmQA/WH66MX8iK3PVOduAo40iPFVg+0A8g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddvvddgtdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrdduvddrfeekrddvfeeinecuvehluhhsthgvrhfuihiivgepjeenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x590c26ec.dyn.telefonica.de [89.12.38.236]) by mail.messagingengine.com (Postfix) with ESMTPA id 539073280064; Wed, 26 Aug 2020 04:12:00 -0400 (EDT) Received: from localhost (xps [10.192.0.12]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 0cbdeb3c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 26 Aug 2020 08:11:59 +0000 (UTC) Date: Wed, 26 Aug 2020 10:13:58 +0200 From: Patrick Steinhardt To: grub-devel@gnu.org Cc: Denis GNUtoo Carikli , Glenn Washburn , Daniel Kiper Subject: [PATCH v2 8/9] cryptodisk: Fix cipher IV mode 'plain64' always being set as 'plain' Message-ID: <4aecb174ba8065c6b257cf5ecd0d59d1df7dcf0c.1598429170.git.ps@pks.im> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.24; envelope-from=ps@pks.im; helo=wout1-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 03:16:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Wed, 26 Aug 2020 08:12:04 -0000 --x+6KMIRAuhnl3hBn 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 1eea4161f..0b63b7d96 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 --x+6KMIRAuhnl3hBn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl9GGcUACgkQVbJhu7ck PpQKHw//Ys0wQi9aSBycJR9CwLbIQfCMqbSjQSc5hujS5flfI03sjsifIL/StCBv oZef08t0UnYONtERpYOZQSApw16QGSxf+dRtoKjh1AYHaF1LDYeZMK9sUUvgdHcJ rBWEB4wcxX0T4ZB8W83tl6JQjLg49unIXvkwX+Piy5xc94GfHFseoDlC2axfOkzg MkzmNM7D51J5yrW5uGA9ScbfRv6Hts8cGEm2uVBSikQ5lCooECgTW98AipgjxE+M XzS9L/KXz22OLL19HUeGH42Aw9eXHm+GOR1xYjCRaWs1rZjY1hyOs51XAEQBfwU4 BIoA1Jl+dffGqik9Q/qXP7QxLIg6/+szb0uk0errN0NducV38AEhvId+01ff3bZx RQZKaBVdwMiU1gRMfFn0gfwAIJzPZjE2Ui1Mza6VbeYmDGTNGxAh+lZGIiz9INCG YKTnuPhoosfR/YjYoEQXURV76vnbI+fiVwrwpNxT5AlVmnsX5+qq4GrWkIKT2GKk MMqyDerUSdOOpHafwKG1mm6IAYQ1nsUOac2vI+DAcduAgAHVmUmjCMhRxd3hBmds 3BKtq/Us4VGxr0uIE7aIyDpGpNr0by21pRs258QnbA7NEk303RdEyflgwQxIXTyH yrl1UeufOOGMORZh08VHgqlli7F4XBIJbKutWZgsKVb/46l7uRI= =t8qq -----END PGP SIGNATURE----- --x+6KMIRAuhnl3hBn--