From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ko00W-0001tO-9D for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:12:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko00U-0001tI-Od for grub-devel@gnu.org; Sat, 12 Dec 2020 03:11:58 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:50839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko00R-0003jE-Sx for grub-devel@gnu.org; Sat, 12 Dec 2020 03:11:58 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9455476A; Sat, 12 Dec 2020 03:11:54 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 12 Dec 2020 03:11:54 -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=9WxCYsHx2wCSpH/fHU0UdeDafDi 2MQ4KJAJLHYGkFW0=; b=M9H4MCw7ZrZtqJxXZaBuQpKCIMiZU0GYrS6pWtPw0MQ 27kbYy056S8sG9FsE+xA8UZLE3PV2P91clHg6wj0T+FVDhvz0ncQfzY0BErj3p4k 5gesTRppZbj9J3KqahH0MzUyQVHi8XPCTJfC5zfj5AhpZb4NUPOClFYjSjPGlj72 yWXzfA1t8HrV3oqfIISqQf9GV6pV997JUx8pnNwRHR2Fxk62GS3jEKzP7lIunLWx dNZ1lwFZIwr6mL2Hsv5lbmF6klVqoypbFCAw67goZvofJxRpjiQnfL/ZJ+p55MKC frtfB0uSUajPVXa9QK/lgb3eIbequ0we7fOGu2bepDg== 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=9WxCYs Hx2wCSpH/fHU0UdeDafDi2MQ4KJAJLHYGkFW0=; b=naPKoiJKW++ZAhGSdILiRT +Q3i2vtgFH9t3NqXAq95pWBXu9PKCs8Thq4UiWZMu1K+xAR6xDp8NkgH/NTK6qIv 0opf1NzgZ6o8KhkHCSwCGB/Q03iJ/qL1ikdoEI1QU4rvJ+KK7vcgaSiwC3m+6iP0 Yb9YQYDIkJ3VRFo44FYAS8vccahfzHswgMjPlBSkiS+feCIAmfEw97ZYYSF+BsRn 9JKXuM3aa6velinOD/bqVBwB1gf00i0MMa9WcLTvsXGQs7bP4cO1T4ltaWjnJ1+m Xe0J7h1VgCuPvWx4BFibZ3h+nyr9fxXe07DU0Z1nMPa1sVyhKbsHU2JXemWdoyGw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudekfedguddukecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepheeghfdtfeeuffehkefgffduleffjedthfdvjeektdfhhedvlefgtefgvdettdfh necukfhppeejjedrudeluddruddtrdduleegnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4dbf0ac2.dyn.telefonica.de [77.191.10.194]) by mail.messagingengine.com (Postfix) with ESMTPA id D5A6D108005C; Sat, 12 Dec 2020 03:11:52 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id ab824ea2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:11:52 +0000 (UTC) Date: Sat, 12 Dec 2020 09:11:50 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 09/18] luks2: Add string "index" to user strings using a json index. Message-ID: References: <9841667705da8873cdb16eae524001eee90ebcc1.1607466704.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lx1sRZzNmtSWZ4f4" Content-Disposition: inline In-Reply-To: <9841667705da8873cdb16eae524001eee90ebcc1.1607466704.git.development@efficientek.com> 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:11:58 -0000 --lx1sRZzNmtSWZ4f4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:40PM -0600, Glenn Washburn wrote: > This allows error messages to be more easily distinguishable between inde= xes > and slot keys. The former include the string "index" in the error/debug > string, and the later are surrounded in quotes. >=20 > Signed-off-by: Glenn Washburn Nit: the commit subject still has a trailing dot. I guess Daniel can fix it when applying, though. So: Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 7e0419a82..ebf03e77b 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -272,7 +272,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > 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_json_idx); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse keyslot i= ndex %"PRIuGRUB_SIZE, keyslot_json_idx); > =20 > /* Get digest that matches the keyslot. */ > if (grub_json_getvalue (&digests, root, "digests") || > @@ -284,7 +284,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > 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, json_idx); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse digest index= %"PRIuGRUB_SIZE, json_idx); > =20 > if ((d->keyslots & (1 << k->idx))) > break; > @@ -302,7 +302,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > 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, json_idx); > + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Could not parse segment inde= x %"PRIuGRUB_SIZE, json_idx); > =20 > if ((d->segments & (1 << s->idx))) > break; > --=20 > 2.27.0 >=20 --lx1sRZzNmtSWZ4f4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/Ue0YACgkQVbJhu7ck PpQT8hAAiqHxymKGckrlkzNEz54YYDZaU+/K8Ewe1/MFZ9hBaEtH1Y7VDUb7peGy s8RoxbT5DeDhi+DrhwV04aRTnyBPxxcLzk746M03QNTcnNYoqnQvJyFR/oqLJxMe Q/EgOgkE0MovQEbJGGUmYcFCP8j6rBF7jIfv9Ulue5bhY4K4im3EKN5kASWc+UpE Y3gG/YgDvLtZ6qPVPOkeHaZ4zxgAuC62otJDnDWhNUU5gMe/fJapYdK42tri6ldp RoSuwvzSTBJXPYxMaJ5Uwmiq81sXBm3PeELtMDFthORo11+QrSlWwW5EiyzhPJmT 1pJoqvEmMUF0SuXTQ4odkWxhwKed4yxDXzy4zwidhHT6WgO/7cS0XWnznvj9COVN aTlFBI/KGaq2BzdzvnNvr4Dr+rHXocj1tCgUecNfwYwBCx2O0m6rNPqUhOGDyOL3 lE9vENFAUZOsswIzko4sdXjqS0ywWrw5YG1LjbaJVLFMSGLjscd8eB3usBEcSn9Q DaqO2qzw537T2kVmMAnwulqpYYgMjauzisjHurTkcbL53lgDZ3Ny76LGRqwCBKqg vHQq4NpuVMBBJu1gt0A4bRm7xockxgd0zagw+d54DhjEzOdXGIClh3uqMvo5nyOe deBGm32nI9o7iEBz+0wH4fw2Y/U6dCjRMbeANxwC4n3iXq8acm8= =dUsb -----END PGP SIGNATURE----- --lx1sRZzNmtSWZ4f4--