From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klu9J-0007FH-Ni for mharc-grub-devel@gnu.org; Sun, 06 Dec 2020 08:32:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu9H-0007D0-CA for grub-devel@gnu.org; Sun, 06 Dec 2020 08:32:23 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:43477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu9F-00043h-3F for grub-devel@gnu.org; Sun, 06 Dec 2020 08:32:23 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id C2BF8A57; Sun, 6 Dec 2020 08:32:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 06 Dec 2020 08:32:20 -0500 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=8TmZx2QYChjFZyAUPd6G4q7huRV tZPWD5fs1pmdK6As=; b=MKUiL9cb6KxD39qZnVezT45DhVZ2BHJCzZ9Rut5qJV6 wGb5hzTlBtOOsXBtY2WyQ9eWHuxatvaip8DzRHc9DMujeEiQsEEu+hs//NtEbo08 Mr+vQu7ILzhlJfMtuZbwdNi9RGpF+mHcByLUlqvQ3cJQ3NPsTmjltnMwYPP3ypDI wRk3UFiGoTp2VEN5ge2oI5VehAZLfoo3ku4TrEqcAJS9H7FSmk2w8yk7ha+53pIk JqjsuiXxrpRa9SsRUaGqbLeAgTfQKK2Chygxiq0Zlqa9Y8zHC/yYQPdx9WYLNEnt h0WI6MIzzEssyBemX1U11USWYDC7lm9114OZ2M2G39A== 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=fm1; bh=8TmZx2 QYChjFZyAUPd6G4q7huRVtZPWD5fs1pmdK6As=; b=mgRBDdRL7obhP20AlwfhgY lTEBGCjYYDjCSuUTvdiWMnDTZHLup+lW/aauQkdZIYTLKg79ZPFmAwOL+SGAiWDa H+0ncAdim9TCDyGx6lvz2bfF2D29RmvJITxXLKquG4953vwFHW/0fPtv8UxE3Uwz MwrmVA/cpcKt5cf2SNd3BK/a0Bwo2ZN+Y7lCLTp3JArDEa3MB9bSC0ZHrmIXarG6 wzPT4gkBsTzI6XOq3g3e2HTm3/CpjuyL3sB05xjD9et4Yl5kAzquaUgyznYwMVXt XgLYgyU9Otu5PqUpKeX295YfFCUOqhRt6iwnzY+a4sAPVSHkw7jEiDg5QAXfba7A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejvddgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrddukeefrddujedruddutdenucevlhhushhtvghrufhiiigvpedvnecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail (x4db7116e.dyn.telefonica.de [77.183.17.110]) by mail.messagingengine.com (Postfix) with ESMTPA id C49BB24005A; Sun, 6 Dec 2020 08:32:18 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id b1279507 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 6 Dec 2020 13:32:17 +0000 (UTC) Date: Sun, 6 Dec 2020 14:32:16 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v7 08/17] cryptodisk: Add macro GRUB_TYPE_BITS() to replace some literals Message-ID: References: <4aa9757e1dcdebbdf503e6fe56c0b2b7e55334ea.1607098915.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="O+BO3zi8lkSKRqXx" Content-Disposition: inline In-Reply-To: <4aa9757e1dcdebbdf503e6fe56c0b2b7e55334ea.1607098915.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.24; envelope-from=ps@pks.im; helo=wout1-smtp.messagingengine.com 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Sun, 06 Dec 2020 13:32:23 -0000 --O+BO3zi8lkSKRqXx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 04, 2020 at 10:43:37AM -0600, Glenn Washburn wrote: > The new macro GRUB_TYPE_BITS(type) returns the number of bits allocated f= or > type. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/cryptodisk.c | 7 ++++--- > include/grub/types.h | 2 ++ > 2 files changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 473c93976..0e955a020 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -281,20 +281,21 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > } > break; > case GRUB_CRYPTODISK_MODE_IV_PLAIN64: > - iv[1] =3D grub_cpu_to_le32 (sector >> 32); > + iv[1] =3D grub_cpu_to_le32 (sector >> GRUB_TYPE_BITS (iv[0])); > /* FALLTHROUGH */ > case GRUB_CRYPTODISK_MODE_IV_PLAIN: > iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > break; > case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: > - iv[1] =3D grub_cpu_to_le32 (sector >> (32 - dev->log_sector_size)); > + iv[1] =3D grub_cpu_to_le32 (sector >> (GRUB_TYPE_BITS (iv[1]) > + - dev->log_sector_size)); > iv[0] =3D grub_cpu_to_le32 ((sector << dev->log_sector_size) > & 0xFFFFFFFF); > break; > case GRUB_CRYPTODISK_MODE_IV_BENBI: > { > grub_uint64_t num =3D (sector << dev->benbi_log) + 1; > - iv[sz - 2] =3D grub_cpu_to_be32 (num >> 32); > + iv[sz - 2] =3D grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0])); > iv[sz - 1] =3D grub_cpu_to_be32 (num & 0xFFFFFFFF); > } > break; > diff --git a/include/grub/types.h b/include/grub/types.h > index f22055f98..9989e3a16 100644 > --- a/include/grub/types.h > +++ b/include/grub/types.h > @@ -80,6 +80,8 @@ > # define GRUB_CHAR_BIT __CHAR_BIT__ > #endif > =20 > +#define GRUB_TYPE_BITS(type) (sizeof(type) * GRUB_CHAR_BIT) > + > /* Define various wide integers. */ > typedef signed char grub_int8_t; > typedef short grub_int16_t; > --=20 > 2.27.0 >=20 --O+BO3zi8lkSKRqXx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/M3V8ACgkQVbJhu7ck PpSvww/+JLN43l5cU7Z385ielBLFXrXQaE2fIkY030Ympzzq5oIa8wkPfVhjUXVE XqFNkyFQhiAOx9omQLAU8UrBOvwz0IR0Fg7j77TOQ4t86FNBXk4Z9HBvndeyOSSS MhI8UTClhFf8m5TzxEZXgwAo3p9FN0nXrUpibQSX+m85jf4zk+HjmGjQkTzQS6Gm 53pXk7yIb6URSViQz/A24CdIw49pobF2sq+Knn49NahxS604Ml07aqZVP3u3I4uy xCIi2i9V6pUKP/8rgV4/lJrmMXwj5YvM65k5BYeN6lXZwQroKdj9iyBzO2USfkIX by6hK0FfuXckn3+oSPmZF1SdhC0DUdfHAab4UVfvUkymOonSTtQXO5f8nlxtw9o1 Cte62CK/1CYbCFOdQ0jas1YbFBr8z+nAgOVWXV9wHHNubW/R3qLTELTiElzmdtWT y11Iw7Q9p+7s7a2hgudzs+Ez6eU2qy+7trOHQBt/JS6dSYhSXdOeex50SUfnVNkr 4Dc36CBP8qNnjfMrzEUrbaSRW4fJuorQd6xSTDOBolWTkDHvd78mKiZjI8BkBwv/ 2EWq/lZOfRMmGE0yPX7hVmY3lXcVSWW2eS5NBu136PPhckwUpZTWLcfMzu7Z9fzp lkWtP3WLfyvZT+up6YhJo4ymltTP3eR9GYZqX05EWBOxRvRsdv4= =ebGF -----END PGP SIGNATURE----- --O+BO3zi8lkSKRqXx--