From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ko01L-0002Hj-QX for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:12:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko01G-0002HV-JF for grub-devel@gnu.org; Sat, 12 Dec 2020 03:12:46 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:56719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko01E-000443-T5 for grub-devel@gnu.org; Sat, 12 Dec 2020 03:12:46 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 999B072F; Sat, 12 Dec 2020 03:12:43 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 12 Dec 2020 03:12:43 -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=wgJRYkETeyuBodHSXvkbaxCAenO DVTpIGS8jouyyKfc=; b=SG4tO18MhQdugyuUplzrE1O7L/GqPYNtKCNRw6Wr432 5GtWSf/htIlRTbt5FQWmumWv/PqBGBNJOophck2zSdZqMlQqwmsxheEnE8+J49Io N9Sxtq7+TtkHSu4iwHHTXnGgpC04qKZ2iMWvySyqLjETlCKTpOXBpk2/wPQhffAy PNQtkkISMlwjznnlWbqgTWp4NwuUx6lcaVNGn3i10AL4PlS3LsG4Ubf9II4UX6cn KcGIIDmnVzY4zWBriahPP66dWnp5fvhaoZ6FYBEWoE5wM71eY3aDB1l0v3U0Y1KF XWoGeDuekjfUko09EE+nFXAHf4i9YaTqRYNb/hQtHiw== 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=wgJRYk ETeyuBodHSXvkbaxCAenODVTpIGS8jouyyKfc=; b=iLHOvIMIEWx/QKNh/tEXWG DOVcMrP4iDYODQCKtWWBeuWiDxvaBXAIgLnLw6TcdBH7UUEQlQJNT/AheuPsLDif BNDfnJ5L0VFaEy1+p0D+7Svh5WbF0UKynjGLXsNcIVOp28RfmqHGAtV36ouZ3JjV w3JI+JQKLBMPxWxzyp+6INVfL9UMjtSYfruApk/VHjkNZO9NdME9gH/fbXqRPGLo 70POGFBSQp5g+FVuwVqr2NoPzzzgVhNhKxZREMe93pelXJElPRKOMaQxHADhIiPX QYU3nc1LVAgAsSCtvYvRfk62xh/GXzBU+c/cXPviQkGUW61cRJGSnLJUPhZ4YQpg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudekfedguddukecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepheeghfdtfeeuffehkefgffduleffjedthfdvjeektdfhhedvlefgtefgvdettdfh necukfhppeejjedrudeluddruddtrdduleegnecuvehluhhsthgvrhfuihiivgepudenuc frrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4dbf0ac2.dyn.telefonica.de [77.191.10.194]) by mail.messagingengine.com (Postfix) with ESMTPA id 9BA1224005B; Sat, 12 Dec 2020 03:12:42 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id ecf20867 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:12:41 +0000 (UTC) Date: Sat, 12 Dec 2020 09:12:40 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 10/18] cryptodisk: Add macro GRUB_TYPE_BITS() to replace some literals Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="/c+Hm0TwudZa3c1x" 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-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: Sat, 12 Dec 2020 08:12:46 -0000 --/c+Hm0TwudZa3c1x Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:41PM -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 --/c+Hm0TwudZa3c1x Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/Ue3cACgkQVbJhu7ck PpQf9Q/+MPC5Nhm/YVjfmaQkZuBMB+yuGLxi+qGuVyS+UrFqqL/em3V7la2CFpjI dIDq5L5jFTQI3uq7o1jkgJfwgTY0iAoC0Xc0XPaQ+yiP+P6yh2x1WkwG1+glB0Wt 9YUV1vIFKxJ2v4k4D+AdQZUSe5SZKcG/cOj+nWyswTYqyCVlgvI4Ro3Uicy92bVg b11BeurMwc2o/k9tivb6oA8fE8BrenJkGN/uMqukJhN/qTDdNe/IHbqcQWut1QUQ nW8t7RntQrMojsNS7TZ71i5CRl4f/5TD3nK34NB8rTHgvPzj4Sf8ZzIvLR6asyvA Xv05SP3L8RN/hWj+katA69Jy/hzJ/zJSxesYFwWc0WHFB8RzAbPnDrbQR54s5K1o gtDwLvXLIfk9HEzzeh8kncn5dSW2aUgztgdXgZd/agAN1XPHVVbcnjSHwtDbIRrq T95KNpYBErWWPxZ8+f1MCe4+U11qUyJwO5F0pi0pdWMj8aZ20tYFJovY//J5eRmT h2ENH0xNDGrZvZLGpwHuaOBwGkt7awTxVEL7A9crrwwcWyYHsdz8rMfo9Q8gPOdy 8kk11cucCy1c+aOjMlEq1diURclbO/f6jZzVRexiub5az0NbTrDXiGIAZUrzv9IW eUAu6yLrSUrayUHt/LueuHCtqDvzGc8Y/TYSSoPW8LLwPgofG/I= =/Vey -----END PGP SIGNATURE----- --/c+Hm0TwudZa3c1x--