From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kW1NO-0007s1-Mp for mharc-grub-devel@gnu.org; Fri, 23 Oct 2020 14:01:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1ND-0007pO-66 for grub-devel@gnu.org; Fri, 23 Oct 2020 14:01:07 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:37293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1NA-00054w-9M for grub-devel@gnu.org; Fri, 23 Oct 2020 14:01:06 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id E8B96A0E; Fri, 23 Oct 2020 14:00:57 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 23 Oct 2020 14:00:58 -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=Rg6ttgFnTjTqIHdH+fEewkiWiqQ MQA8pq0hxXyyCWAI=; b=tYXENXrvoSccOvhJivEmckYSOzTHstJjscBmnO2Tu9H abG4ttRW12RwFY5Z60KsbSjMdB4n2D4FMoIazhMh76vBQ9ERrTeyolx3VvG9SRbd /wH1EXZrzzHNbj3no+0i3aCCCYzRbqJ/w/sFYTr1pCEYuPl9VVHpTdYmdgOkoCKH UMnoj1YEVCeujShteXwxujn213aJaVD0CsNaxa/KgPsvupbylpZZZatfoyNwLLu8 b8o+V8MZ27aDdOv+oynBlEPogFkD3aedQTejUas5OYmWYPPGHVM7H5mVkEX4L0Ug om9dx7i/1Fg0tsFmlOlbz/SGnUUHPbjoW7Bw0lOjVKQ== 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=Rg6ttg FnTjTqIHdH+fEewkiWiqQMQA8pq0hxXyyCWAI=; b=JizifiYCccAPi4YqP0YkVO lGluYjTAM0W8uVCcui/7UEggzih8ISjMMsZMyj5Y0nNEQ5Z77vQAbnBLIAq/kzsc 0++74U/atc9UPIimfSrcYCWIAsvJBMEKCkh0zPyV8uw5edsBSLKfzHtCg8FkG5q2 WpRGo69vWxWtwNJ77d+DSoHA/CJ2oMp9vYc9YkrBjxELrkEJlQNRHZvPu6O5yjm3 04vohXKtwn0Y0FIIiFqI7Ojyj6zNQ5V65kGm9jNF1e27ILdhjwoyDrWmwTK/oUnF qheqbFrVjyX3/id6I/DQZ3x3NOZDU86TBaaHIH8UcqzvpblHnE0wblrKlRN/BdXg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkedtgdduvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrgeeirddvtddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-089-014-046-200.89.14.pool.telefonica.de [89.14.46.200]) by mail.messagingengine.com (Postfix) with ESMTPA id 499B33280066; Fri, 23 Oct 2020 14:00:56 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 483faa17 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 23 Oct 2020 18:00:55 +0000 (UTC) Date: Fri, 23 Oct 2020 20:01:01 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v3 07/10] cryptodisk: Replace some literals with constants in grub_cryptodisk_endecrypt. Message-ID: <20201023180101.GF810@tanuki> References: <20201009100122.GH2088@tanuki> <3918a9013156f71e01de05971b5441c0d9d09102.1603148099.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bGR76rFJjkSxVeRa" Content-Disposition: inline In-Reply-To: <3918a9013156f71e01de05971b5441c0d9d09102.1603148099.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.20; envelope-from=ps@pks.im; helo=wout4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 13:46:38 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: Fri, 23 Oct 2020 18:01:07 -0000 --bGR76rFJjkSxVeRa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 19, 2020 at 06:09:55PM -0500, Glenn Washburn wrote: > This should improve readability of code by providing clues as to what the > value represents. >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/cryptodisk.c | 12 +++++++----- > include/grub/types.h | 3 +++ > 2 files changed, 10 insertions(+), 5 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 623f0f396..1a91c2d55 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -297,19 +297,21 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > } > break; > case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: > - iv[1] =3D grub_cpu_to_le32 (sector >> (32 - log_sector_size)); > + /* The IV is the 64 bit byte offset of the sector. */ > + iv[1] =3D grub_cpu_to_le32 (sector >> (GRUB_TYPE_BIT(iv[0]) > + - log_sector_size)); > iv[0] =3D grub_cpu_to_le32 ((sector << log_sector_size) > - & 0xFFFFFFFF); > + & GRUB_TYPE_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_BIT(iv[0])); > + iv[sz - 1] =3D grub_cpu_to_be32 (num & GRUB_TYPE_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_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 035a4b528..8b4267ebd 100644 > --- a/include/grub/types.h > +++ b/include/grub/types.h > @@ -319,4 +319,7 @@ static inline void grub_set_unaligned64 (void *ptr, g= rub_uint64_t val) > =20 > #define GRUB_CHAR_BIT 8 > =20 > +#define GRUB_TYPE_BIT(type) (sizeof(type) * GRUB_CHAR_BIT) Hum. I'd rather name this `GRUB_TYPE_BITS`, as the current name implies that we only get a single bit. Other than that the change looks good to me and I agree that it helps readability. Patrick > +#define GRUB_TYPE_MAX(type) ((2 * ((1ULL << (GRUB_TYPE_BIT(type) - 1)) -= 1)) + 1) > + > #endif /* ! GRUB_TYPES_HEADER */ > --=20 > 2.27.0 >=20 --bGR76rFJjkSxVeRa Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+TGlwACgkQVbJhu7ck PpQAIQ//YylDACm72IYDdPdyAqKA9bXmqXxkEAoN+xYyHZ3JclzdbJC2LfZAUqQb fKSyn6YJieavCpxAP2R/QpJ4HK4dGtPq7lk7RRBx+1ZonirXM819TbZHdvC4QyaI Ua9bzTKC7X9jIMpWu/4/w0wi/vAztBWYA3Zxr0sMY8GYPWAGVQpUItSrFyzCw2R9 AUT+tCb4L1jVc/6/YN+Yv5Hu1S5EhhLYGLYy+h2/QtEJ+45dx/W4UmeCjsOULCIj gwLbL2/3M6uy/tMUJV7Xa6koINf2FZcZiDLPYu1B7X9BH5kqKtaPpYFRB3D4DdYU Qk8lgF8bddUl1CEJyYhwVg23dMQ42VmULB+bvhRN/uvTeBLoJ+OD9E3GBoKfV99m SGBuf3rbkBOZj2unRUqWWVUxyKhXXoeRgSs82oZFwSlv2wYS/EZxsweLnLGG7wvw 1YtOxnMCGnY9izBvJpIWbhHZGJPclF0gbX47twa+FYou6+4kbOoX0Fczrlmsf6ps IfsvIFJ5YC0DsicQoTcLVU74hY+uFRbzNJSk0/SCsnDs5JtWZgDmcON6CU4AxJVE Z139LnsSR1LsUv9UHpg0fpCgBCNuKNY+LLr4AvLIGsuMz7lUWuwKmUfoPYuT2wn7 3JBerulzigymUiLZilsfY247s3arAgpsTf4Rug8m/eIeyDzq4Fw= =qimP -----END PGP SIGNATURE----- --bGR76rFJjkSxVeRa--