From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kFJ40-0004Fx-6V for mharc-grub-devel@gnu.org; Mon, 07 Sep 2020 11:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFJ3y-0004DE-9L for grub-devel@gnu.org; Mon, 07 Sep 2020 11:28:10 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:60525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFJ3w-0007FK-CB for grub-devel@gnu.org; Mon, 07 Sep 2020 11:28:09 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id DB2B04ED; Mon, 7 Sep 2020 11:28:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 07 Sep 2020 11:28:07 -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=fm2; bh=5uO18/edLrbC6tZXYHn2AQLtpEE dDJivW7mI52raxhc=; b=EUd/K4qaX7OWpaocO+xjGxyJK8neRdgoAdSnjcM8CuW q0arccGM6zsOe62sTrLFy9mR7bTLThoTKP70hAneF0TTlcvsR89fKUTWeow82ybE KaniLcz4M8gCpxQUmmu6JXP7B9o4DOCD3APRSvYb/7V9Dehr7uRY0ATgdV9o14Kh B8lPO5jbCjHelDP/yT4yCJFOFF86lnAPJTiHwsD7ulGnt+VHVyczAEGVS5mG0bxZ VSCyldgihJTXgAgK1Qvx/ptnnmYdxFI0b8tO2bQ7I7MXSyYuu1VpBmSDsajXjAct TnspB/Rg7JFllfVHTMVmVpuvWaJPhA159QUvQtNdwvw== 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=5uO18/ edLrbC6tZXYHn2AQLtpEEdDJivW7mI52raxhc=; b=pfzas0ik2C0+N6ygMA5k1k K/Rq0spnyKHTWmCm1C1ePZTZOYkE0xRIv1N1ltAOoN3JdJyTgZHdqtDUDGbIy78Y +b8XdCkCY1bqj4wPpdIbuJTuudTskM6VzRdnKhjWlBoB1Hh8NskuPn9cflXYKYA/ /SGwDxGX0V/8la4rCGgRS8hH+ArRNOHv9P/NjSfiuFXAdqZC2mcEh2Xyi55p83Rp GoqhoLYlYRUnBilveNZBn4WaFDjUbU7dVnV+7FnpdnYKMrttxnGTyXu9x8xZkrMd kF11hzrOS1pMeeJuW2+E3zUXOAo+9TE4hgU7NoHszToycsGaoIy7OMuv3R4GgcBQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehtddgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrfeekrddufeegnecuvehluhhsthgvrhfuihiivgepkeenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x590e2686.dyn.telefonica.de [89.14.38.134]) by mail.messagingengine.com (Postfix) with ESMTPA id B146E3280059; Mon, 7 Sep 2020 11:28:05 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 62049f84 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 7 Sep 2020 15:28:05 +0000 (UTC) Date: Mon, 7 Sep 2020 17:28:04 +0200 From: Patrick Steinhardt To: grub-devel@gnu.org Cc: Denis GNUtoo Carikli , Glenn Washburn , Daniel Kiper Subject: [PATCH v3 8/9] cryptodisk: Fix cipher IV mode 'plain64' always being set as 'plain' Message-ID: <5497b02cc21e2176f32ddab706050446c547773e.1599492346.git.ps@pks.im> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="k1lZvvs/B4yU6o8G" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.25; envelope-from=ps@pks.im; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/07 11:26:12 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_H3=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: Mon, 07 Sep 2020 15:28:10 -0000 --k1lZvvs/B4yU6o8G 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 --k1lZvvs/B4yU6o8G Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl9WUYMACgkQVbJhu7ck PpRjdhAAgvtiHEnqiE1ywGEWu0fOAQlXrD9oxA1QutIJFp+jaMeJY1+PfKroPfmL rE8luhVxssIKs4V5TnAQTOP8gW3VNtlkjEyEkEdIGHUTtfjO0bXYAMFK2TWZvqTa vqCs18M/Bafer4JDzHLPz6eoUbhp3o7ZCpJLleww5UPxSvZCWhsKOh4eoSEsIIxu zlpGJp6YGuqeKtumWJKzi1WU4zci2PjEJPCPdAMbAYuJAwWbvVdicbJ15u+HikVK adVZLk6WdR91q9QaIDJc+z/6nDl9l7TudxLAnd8ZfbBqpceaBP7TqLOn/H2Yj44z LKqX5siVKt8sCOUn5Hpe0J4vd1hRRyngN9ma3+WKcr539i3fKES8KRegiB9x2bmr 59KavHXxL8A3e51SFD2Rx8kGyvkEETDKpodtH4K0Sd14scNoIOs4ayGSpT49I8SI BnewVel96L+V1MpNmWTPa4KgPmdkYiRFKGr+ku9fuSVpn3kDc0uKNZGixXcrQweD l1hLO3jqKGtFjF5qs9jJI9bG0QeWNfJYXxHmH2g+7HUWZmBHtcCQmHSSPkaCOQ3m Ka1F8fyYcZzQ7VOvj7ebeDpkpKn5hLRhmsqI2d4NVrOgJaOrALCgC217b9A+Y5W7 zP3k2qUqGG+6/SPRwztlXEiLQAvxRCB1PdU2jdYIrbU8Z5+YNQo= =Y8jS -----END PGP SIGNATURE----- --k1lZvvs/B4yU6o8G--