From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1knzzY-0001Ry-J4 for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:11:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knzzW-0001RN-Qn for grub-devel@gnu.org; Sat, 12 Dec 2020 03:10:58 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:35833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knzzQ-0003HV-TU for grub-devel@gnu.org; Sat, 12 Dec 2020 03:10:58 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 47FE5789; Sat, 12 Dec 2020 03:10:51 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 12 Dec 2020 03:10:51 -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=H1fe0is6wqzxxT3PykCurREU0s3 46QzRxXzA2lkU1f4=; b=bVDjumSO6Kabt92EN41EwxTl4wn+FdKx/GrBKT6mCiM LIpnf5+Ro5JDJohVjy+5oVYDLSWfVSuAzHdo2e2wkVAI+3Ypi7mG/XPAwWA1bx4V eX6LzAOIiR0vt6Sm4zplULCy2bbXsSwYd/VlgJeNjNg6B8Uxha2ktLyG2VVZBxG1 LaSQQ1pWYTPm+YPbrLxEzwFArKWiU41oJE8oqAKzHNRQWElMQ1ztf0Ya/+0hBGOc WhXouTuZnOK/rgz2Jg9I/b2UrF/oQ4Pzmup9dMG55uRunBBH0Ti8snVcHByClxpu z2vIwmLDsBzpbg9NKkjg6O8U1In9Ur5indtFZUBmvPg== 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=H1fe0i s6wqzxxT3PykCurREU0s346QzRxXzA2lkU1f4=; b=Cix/QJCiX836e/Zb+NhzWM BFOjZJLuRpuqoom7EFIQVcl3RVUVG+BP3e9w3HY3sDEEIdH5XQ0tluZIynKS0DS8 T3MIKQaMICx451w93YdA/cZzefTd4wZ3Vci057I5CXeTHm6gjaHRlC7MkzDAYVra kZE64FDmgd+YeEyXlrp7G9cDqL516MNpWiZEXob72pVQbL42zIiIEgLKazoBH3wG KLXlJmXOm2x4S9yl10tsAIDi0ToVyrJp+iFuV5PGqB4JcciQjI1S5/jFhsOPB7NA dkeLvPNSJ4M/grkmfLPRyx4t7Q38MnTP/OMkMaEw5uoInzC7qOBpsBdIfBVsJ90Q == 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 C768724005B; Sat, 12 Dec 2020 03:10:49 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id b78f9529 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:10:49 +0000 (UTC) Date: Sat, 12 Dec 2020 09:10:47 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 08/18] luks2: Rename json index variables to names that they are obviously json indexes Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="w7nCWiZnJBFPrI2O" 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:10:59 -0000 --w7nCWiZnJBFPrI2O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:39PM -0600, Glenn Washburn wrote: > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index b6930b2f5..7e0419a82 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -261,53 +261,53 @@ luks2_parse_digest (grub_luks2_digest_t *out, const= grub_json_t *digest) > =20 > static grub_err_t > luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks2_digest_t *d, grub= _luks2_segment_t *s, > - const grub_json_t *root, grub_size_t keyslot_idx) > + const grub_json_t *root, grub_size_t keyslot_json_idx) > { > grub_json_t keyslots, keyslot, digests, digest, segments, segment; > - grub_size_t i, size; > + grub_size_t json_idx, size; > =20 > /* Get nth keyslot */ > if (grub_json_getvalue (&keyslots, root, "keyslots") || > - grub_json_getchild (&keyslot, &keyslots, keyslot_idx) || > + grub_json_getchild (&keyslot, &keyslots, keyslot_json_idx) || > grub_json_getuint64 (&k->idx, &keyslot, NULL) || > grub_json_getchild (&keyslot, &keyslot, 0) || > luks2_parse_keyslot (k, &keyslot)) > - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %= "PRIuGRUB_SIZE, keyslot_idx); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot %= "PRIuGRUB_SIZE, keyslot_json_idx); > =20 > /* Get digest that matches the keyslot. */ > if (grub_json_getvalue (&digests, root, "digests") || > grub_json_getsize (&size, &digests)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get digests"); > - for (i =3D 0; i < size; i++) > + for (json_idx =3D 0; json_idx < size; json_idx++) > { > - if (grub_json_getchild (&digest, &digests, i) || > + if (grub_json_getchild (&digest, &digests, json_idx) || > grub_json_getuint64 (&d->idx, &digest, NULL) || > grub_json_getchild (&digest, &digest, 0) || > luks2_parse_digest (d, &digest)) > - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRI= uGRUB_SIZE, i); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest %"PRI= uGRUB_SIZE, json_idx); > =20 > if ((d->keyslots & (1 << k->idx))) > break; > } > - if (i =3D=3D size) > + if (json_idx =3D=3D size) > return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= \"%"PRIuGRUB_UINT64_T"\"", k->idx); > =20 > /* Get segment that matches the digest. */ > if (grub_json_getvalue (&segments, root, "segments") || > grub_json_getsize (&size, &segments)) > return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not get segments"); > - for (i =3D 0; i < size; i++) > + for (json_idx =3D 0; json_idx < size; json_idx++) > { > - if (grub_json_getchild (&segment, &segments, i) || > + if (grub_json_getchild (&segment, &segments, json_idx) || > grub_json_getuint64 (&s->idx, &segment, NULL) || > grub_json_getchild (&segment, &segment, 0) || > luks2_parse_segment (s, &segment)) > - return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PR= IuGRUB_SIZE, i); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment %"PR= IuGRUB_SIZE, json_idx); > =20 > if ((d->segments & (1 << s->idx))) > break; > } > - if (i =3D=3D size) > + if (json_idx =3D=3D size) > return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \= "%"PRIuGRUB_UINT64_T"\"", d->idx); > =20 > return GRUB_ERR_NONE; > @@ -542,7 +542,7 @@ luks2_recover_key (grub_disk_t source, > grub_uint8_t candidate_key[GRUB_CRYPTODISK_MAX_KEYLEN]; > char passphrase[MAX_PASSPHRASE], cipher[32]; > char *json_header =3D NULL, *part =3D NULL, *ptr; > - grub_size_t candidate_key_len =3D 0, i, size; > + grub_size_t candidate_key_len =3D 0, json_idx, size; > grub_luks2_header_t header; > grub_luks2_keyslot_t keyslot; > grub_luks2_digest_t digest; > @@ -596,9 +596,9 @@ luks2_recover_key (grub_disk_t source, > } > =20 > /* Try all keyslot */ > - for (i =3D 0; i < size; i++) > + for (json_idx =3D 0; json_idx < size; json_idx++) > { > - ret =3D luks2_get_keyslot (&keyslot, &digest, &segment, json, i); > + ret =3D luks2_get_keyslot (&keyslot, &digest, &segment, json, json= _idx); > if (ret) > goto err; > =20 > --=20 > 2.27.0 >=20 --w7nCWiZnJBFPrI2O Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/UewcACgkQVbJhu7ck PpQikw/+KXLbHwa3kqSOkk2HjwesyU1nMZpgKgmO3hcaI8gaS4ZOniY9Yhue3oWi /bKs6PEGdbf5UjBmAxdUsa9CAfhNWnSJlpXYQa43z/1dnfZiz11ZmcK8WFGCSRDR 1uGw+sCVKaHnKLE2gcm1Jpt74i184hYXnV8WOmsM8+6IqSwvM2gJ4z8r8eVZvYUH CcEQqguueWqu7R5rPArPRVUhwfRpUcTSJQghp5Pkf48Zt9aMy77pkmGGS5ILUn6L 6wTOu3MOFmGd+V7F/P1ZULTsvIgg4XjOoiMZo01YJM175Io63SQoRNdLa3apdf9Y 0dX4JL6/Gv1lZixDB4Q2a4Alljb08eXCtIuj8UrDMX5jC3VGLPBpkfyNM9SQ9nOv NkW5I9r7bW+rSyFWxVlIznw+i646vo50HAVxYxk/FLEM257YTKZJjSew+NxFpAER TZ6o1Ra/NicT2YWkLY8AD0nezzcQMLUEbRU8jEO50jGypQipoIRM0Wnd7LD7RVBw Nd9n8zKWS/2JZG8IHRciZPIejs7kz+f90X3XsoW9SGq4JQYzMXJTdyFfu7qCrR+e cLrUkbAEyiDnHm0ioq+JUyeXp3yFL8D19VufYm/bRSckBEd3E6Zr4PU1tiKK01lz Ct7PbJp5fT1FUCxxf2v9m4Y37HZ431i0ZkJjP5ZVS9BvDpDBO0E= =Ifx9 -----END PGP SIGNATURE----- --w7nCWiZnJBFPrI2O--