From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1keEov-0005ez-WA for mharc-grub-devel@gnu.org; Sun, 15 Nov 2020 04:59:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEot-0005ec-1T for grub-devel@gnu.org; Sun, 15 Nov 2020 04:59:39 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:46197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEor-0007ZK-Cy for grub-devel@gnu.org; Sun, 15 Nov 2020 04:59:38 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id EE4835C00AE; Sun, 15 Nov 2020 04:59:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 15 Nov 2020 04:59:36 -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=Zyaqspv61rZxciWdlFQHasUqhTd CGDbuhhthht9eu7M=; b=njn4jgDc0oygj2+s+cH0ksLGaVhuiaXqQlzIqKFd5+d R3purbA2Auo5Y5fQbpO0P9DxoFF7dxdUAsjmAd4eoWYDeuIe8Uv6DAZuKhzKK+jQ +D3uHq5dlA54xfGFg+QjK/rtkAzGlv+TFnzYUU6w+2NTFLrZOQYTURjlXIiRIfDz PFU/u1O3r+G5lLa138aEIuqh1CwAELuyJKsQ+MS0OPrsaUIuVwZlNIi0/OulJEds TxVj9cYkv3nnZawiJtRRWZHe8QFNNbCkIhMDR9uQUXODMAZ7k6xEPQj2PSepFz17 G6h4pPwIrnBpg7e23sw7Enjmszo33g13ZnqSPPt5M5w== 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=Zyaqsp v61rZxciWdlFQHasUqhTdCGDbuhhthht9eu7M=; b=Y9vsXmBs0pY2QPeaaWmIT5 fNU8sOKh1gSBx0W/shj9N5XS+4un5KoonWa6lFieSkVXPLp89ESrh6GFwEh6c2Vj AJdZuGYRcK8zI71lftLX37bghTVp9j+I0hefGWFnQ27XcSkbefHlWOquPFM3SjLz kxFX2LLgbEqIyJdsZYEe5S0vDVKcrb9Bu6MbGSk8V6+K3ki05ueYwKsCCbX7xkNj 5QJN4MjMfL8QqYu2tp5tH/YQkKIWQDYTGaK8HXi6iamYzvUPy8n1WB/nEoMIruHz n/+5DEWL58q5fIKsIbXMtKMGolbYRRi2WeSFF2vydKN2TfPq+V1FqS6YHvVGtFlQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehgedrvddurddvtdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-054-021-206.78.54.pool.telefonica.de [78.54.21.206]) by mail.messagingengine.com (Postfix) with ESMTPA id D216F3064AAF; Sun, 15 Nov 2020 04:59:35 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 3190596d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Nov 2020 09:59:34 +0000 (UTC) Date: Sun, 15 Nov 2020 10:59:33 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v4 11/15] cryptodisk: Replace some literals with constants in grub_cryptodisk_endecrypt. Message-ID: References: <87bafa5d9ef66472506a7a92b6e0a1cd1421c19e.1604723348.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="w0D15Tv7Z36L8Fs1" Content-Disposition: inline In-Reply-To: <87bafa5d9ef66472506a7a92b6e0a1cd1421c19e.1604723348.git.development@efficientek.com> Received-SPF: pass client-ip=66.111.4.27; envelope-from=ps@pks.im; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/15 04:37:28 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: Sun, 15 Nov 2020 09:59:39 -0000 --w0D15Tv7Z36L8Fs1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 06, 2020 at 10:44:31PM -0600, Glenn Washburn wrote: > This should improve readability of code by providing clues as to what the > value represents. The new macro GRUB_TYPE_BITS(type) returns the number of > bits allocated for type. Also add GRUB_TYPE_U_MAX/MIN(type) macros to get > the max/min values for an unsigned number with size of type. >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/cryptodisk.c | 13 +++++++------ > include/grub/types.h | 5 +++++ > 2 files changed, 12 insertions(+), 6 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 473c93976..31b73c535 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -284,22 +284,23 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > iv[1] =3D grub_cpu_to_le32 (sector >> 32); > /* FALLTHROUGH */ > case GRUB_CRYPTODISK_MODE_IV_PLAIN: > - iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + iv[0] =3D grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); > 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); > + & GRUB_TYPE_U_MAX (iv[0])); > 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 - 1] =3D grub_cpu_to_be32 (num & 0xFFFFFFFF); > + iv[sz - 2] =3D grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0])); > + iv[sz - 1] =3D grub_cpu_to_be32 (num & GRUB_TYPE_U_MAX (iv[0])); > } > break; > case GRUB_CRYPTODISK_MODE_IV_ESSIV: > - iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + iv[0] =3D grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0])); > err =3D grub_crypto_ecb_encrypt (dev->essiv_cipher, iv, iv, > dev->cipher->cipher->blocksize); > if (err) > diff --git a/include/grub/types.h b/include/grub/types.h > index 495c86bb1..b57acc3b1 100644 > --- a/include/grub/types.h > +++ b/include/grub/types.h > @@ -72,6 +72,8 @@ > # endif > #endif > =20 > +#define GRUB_TYPE_BITS(type) (sizeof(type) * GRUB_CHAR_BIT) > + > #ifndef __CHAR_BIT__ > #error __CHAR_BIT__ is not defined > #elif __CHAR_BIT__ !=3D 8 > @@ -159,6 +161,9 @@ typedef grub_int32_t grub_ssize_t; > #endif > # define GRUB_LONG_MIN (-GRUB_LONG_MAX - 1) > =20 > +#define GRUB_TYPE_U_MAX(type) ((2 * ((1ULL << (GRUB_TYPE_BITS (type) - 1= )) - 1)) + 1) This macro is quite complicated. Considering this is specific to unsigned types now, couldn't we just use the following? #define GRUB_TYPE_U_MAX(type) (~((type)0)) Patrick > +#define GRUB_TYPE_U_MIN(type) 0ULL > + > typedef grub_uint64_t grub_properly_aligned_t; > =20 > #define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t = name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properl= y_aligned_t)] > --=20 > 2.27.0 >=20 --w0D15Tv7Z36L8Fs1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+w/AQACgkQVbJhu7ck PpShiA//UK6a5GVf0He0kNBVkK7sQxaPosR+sB5RarfPghxGkAZNRoU7DV5VVTvT VUkaudhjajC8wdKm8yGbdLBrH9PTRGlgeGBWysyJUUsDON3maQBz5Ng9sgXDj8uV vy9GCwLC4ptRIJ90dSfh0ZXU6BOOBu4wXd/M6wla0R51qvV8vMa9QDzW9HF8CzKk gma4C/3l+xgwW8n2hJTN3WtBndEjXjXHeWzGCVRyfrsF1t3H4IxwzLqYda0k9VqP ilu5E7soksfgoOuvnKHskkY/NWPxAtiSET0AmycByKUSuMkGHcn/tsYYg8DPjK87 E/gSspnvr9mU9pYu0Jvl0/pXlRgDO++qwzWasw9TlifeiQY49ZNV6Vq/Ze2UN//C GcxY+jdzxzwUkRqYydhV3GT7gcDCuTHQgzu15xAivW6P/LTKN4kxdFfPQqm0AbL3 B6L1paeIbpAymUWys5Wc1KWgmMKlF0TaM72l5YBB5Hc1JH0/OQqHIqhYpAVCBniD dtDU61fJ8xLy3xvOO20S52N5/ot29IzqvpvOMTJ2REw6npbvHTcGBFJq+sOHSRUQ ghBjTOQfI5jZ9dZSQ2ev3m41xJOhgXlithw1uNiVcH8cxrFKTRnMUMB7fd2dH4SZ +hA5BnH5ivOfEFN64xTQZSb04FptgbfDxHCeIB8TIi2rlRdSLhs= =olU4 -----END PGP SIGNATURE----- --w0D15Tv7Z36L8Fs1--