From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klu8q-00074y-Rz for mharc-grub-devel@gnu.org; Sun, 06 Dec 2020 08:31:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu8j-00072i-Oq for grub-devel@gnu.org; Sun, 06 Dec 2020 08:31:50 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:59541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu8g-0003v5-8e for grub-devel@gnu.org; Sun, 06 Dec 2020 08:31:49 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id DFF90A1E; Sun, 6 Dec 2020 08:31:44 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 06 Dec 2020 08:31:45 -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=9djhdV6cym3SLCu2mDImZkErXIN K7Lco6AOxMdNsdhw=; b=DRfwryoSwCPSA4JNhChujjaZNghFp7plcx83U0XPpLP PKfxdqQHDnPxnVvARC30ZmmMzkvs7iNoAEe2uA7VXBPKHrhK4olDBtzv5aw6vf+b Sm7u1yW2G+YHv8/8Tu05s6CdAy2VjvDvEQvtPxmHbU+sz/VhO22mvyPwxlfaR6LX ZwENyZG0DDePflXJg7tLZWbSUOxk2aToX37BI1BtuRibP6quP5Y5dIAp7hZ4Zsc+ CoRmX/8xOHcE7iCcETjecjhRn9BqKENX+rSrqDk3HD8tQ3PMaz6XV1kdcfqo3yp1 kxQaVIO5eYzbfw2Brav2+4Oz2Opujydpkiy6PGTmhzw== 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=9djhdV 6cym3SLCu2mDImZkErXINK7Lco6AOxMdNsdhw=; b=jC946wMFy/4eulsVJl/s02 e37q3wLoQ/o9X+8fXNTv9mJkQBnfiIsL7AlBiKMJlGx3FiEc2qsJRQUtKzWJb15B 3v6bwRmulLQI9/A3RjSBvvrpxdqMYZWxCG1IRSMgTse1zaJdXblvULmXjVzvV3X7 8W8y1Pb0dkCIVhGzJ7LnK/KTyb9P6pa3JNr6daO6Cv3x6EHcICY2g3AHTVrFKfMt J+q4Lxuw3poNdFOWc+9NhuSXmDivuLpbMV60TIIXlaT1WaPIaZcG/ZQeWh93Sp4f ic2DIodO9Psnf3JRgr0vMzwoStogZgkWaE3mYvPqkUM0wbfzp+17PWSwcJ8ffACA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejvddgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrddukeefrddujedruddutdenucevlhhushhtvghrufhiiigvpedunecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail (x4db7116e.dyn.telefonica.de [77.183.17.110]) by mail.messagingengine.com (Postfix) with ESMTPA id E400D108005F; Sun, 6 Dec 2020 08:31:43 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id 0a2e5d02 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 6 Dec 2020 13:31:42 +0000 (UTC) Date: Sun, 6 Dec 2020 14:31:41 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v7 07/17] luks2: Add string "index" to user strings using a json index. Message-ID: References: <43e3b6cceb7890128f77526d96ff2808c1e6a2d5.1607098915.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5ldBx8D6sdbulSLI" Content-Disposition: inline In-Reply-To: <43e3b6cceb7890128f77526d96ff2808c1e6a2d5.1607098915.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.24; envelope-from=ps@pks.im; helo=wout1-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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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, 06 Dec 2020 13:31:50 -0000 --5ldBx8D6sdbulSLI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 04, 2020 at 10:43:36AM -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 Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index ea1065bcf..4be40b22b 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->json_slot_key, &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 i= ndex %"PRIuGRUB_SIZE, keyslot_idx); > =20 > /* Get digest that matches the keyslot. */ > if (grub_json_getvalue (&digests, root, "digests") || > @@ -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->json_slot_key, &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 inde= x %"PRIuGRUB_SIZE, i); > =20 > if ((d->segments & (1 << s->json_slot_key))) > break; > --=20 > 2.27.0 >=20 --5ldBx8D6sdbulSLI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/M3T0ACgkQVbJhu7ck PpTRtw/7BNCKJmJCevI/rdRBxNFvK6QAsAPsb2yaLz8EHWnPTWCx4I1hG7+1ebBn xHuJ077WKBHfwnv0XEfARySXY34el46j+3E6wdB7H6fZb7cz+t0TpHtebSsV/2Uv AEvNHklQ3DzBlo8JmQCiZFu1Aj8ZV2PkNPG5wq81c22C1/K7TFH8ijH96ReyS87E tnAYU0fYLykPpoXrC4KEmlJ9dH22YnFvWXLCWlGR2Kl3YuRDhnMph2iVWgKwrgWT wVkYNWNwouVfYQEfeoNnQJn9DPHbUjFU+JCnaXomDNxicifXgv2ehtRTdOzohDm6 tWpu0afHw6JOegA0lUqj7owDRQgLCuG7C/B0AwppwS7Kpnh8z7xykWx6oWRxONJp wDJ4lg/rsNJ6IpvD3Fo94X0kNsmfIWJYt/mH4kiNHXCc87nEoQ0PnJIU1/4qsF4I tOUWvORmJNkpya9oj46E57Nu54DfXA41ZkM6wb25D05MoqVCJ8WzhrqbGCIXm/U8 kMYn2Y3CiqjkZXy4pnvAYofHqr2A9g86UXJJTaepB+GHFHQGXgj0hERdYkWgYG5S ecWRngQqwxvdihkedmhQqC6rSERhpBAk2PPpy+Ci4QX5uEiyYWNMIbdgRYFz1/Wc Dqbh4YDuSQQNPOeZk/e3X9RjxTKzVCsI9O6yIcR7Y6ztqxPk1WQ= =ITDz -----END PGP SIGNATURE----- --5ldBx8D6sdbulSLI--