From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1keEhd-0003tl-Td for mharc-grub-devel@gnu.org; Sun, 15 Nov 2020 04:52:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEhc-0003tc-WF for grub-devel@gnu.org; Sun, 15 Nov 2020 04:52:09 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:48551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keEhb-0004tk-Bz for grub-devel@gnu.org; Sun, 15 Nov 2020 04:52:08 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id DE3125C0110; Sun, 15 Nov 2020 04:52:06 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 15 Nov 2020 04:52:06 -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=xQ7kKVjmq/8+/H5CPpLH8SYC7PO uRRIMRsu95yOtXOo=; b=uBnqvUj2MNkEQw7RCXeSuECj5avq1HmN8aGZ5r/+lvB WjrjU5XbNP4PFE+S37cgGdkEoblmteXfaf1KL8/5TrmswrFhcTHx1YgKkZyvTDek 0DHcfFO27tzQxfHiLfuMUQ7lNwJVi3hTXMkTS9XZ0xiAQhhAaeLpZK9fZg/8W8hz yqrD2PWxNCGQnigslWEVggk2nC9GdqYulmr7Rkbc29yBNdA9VZU/FIvIxabshKpV FZFCEzQJvojiGDVO+XU5hzhkO2BIPWV/kiAfTRnVSU6uVnDXPjW81SztjEIECZ07 Otdd2mMZL+8TfoqGoMdST1z2dnKUfnjrW0AUKIdU5fA== 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=xQ7kKV jmq/8+/H5CPpLH8SYC7POuRRIMRsu95yOtXOo=; b=PpdBHY7Ni7q38pXZuYBygJ grkoJrFj0Z/qGZmKvqJk0Rqnjn9kaSoZHoOVe1mXT+terHqaMwwqTE/D6Ytc4BAY eGghSrlbopSh8SXE1mv4mT29A7BHni0LXqTnMH2umj5jlMkz9A/jVPq7MgFlY1En jrL5QpJPtJdslnOhxzdzOHTP1S6oti6b0MZpKSDHFh5oJ0F/oIlV2XBTep22wTgl hvPA4rgBtHnfN8mi1RwcT5P9DEyWQ95CZI/Bwt05pqw54PE9DWH5RqCSlQg4I+uB 4VoA08P5RWmr/S66K4r6rGcNcMpN2g0XcxCNiHmILn6cIh+WHmxA/VsFtacsNsnQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledguddtucetufdoteggodetrfdotf 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 08E853064AAE; Sun, 15 Nov 2020 04:52:05 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 3ec68151 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Nov 2020 09:52:04 +0000 (UTC) Date: Sun, 15 Nov 2020 10:52:03 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v4 09/15] luks2: Improve error messages in luks2_get_keyslot. Message-ID: References: <8ac7af9194177c3d5bd6d3c4c6d483bc9735ea24.1604723348.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="folLiRRfpQ9D+wf2" Content-Disposition: inline In-Reply-To: <8ac7af9194177c3d5bd6d3c4c6d483bc9735ea24.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:52:09 -0000 --folLiRRfpQ9D+wf2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 06, 2020 at 10:44:29PM -0600, Glenn Washburn wrote: > Error messages now distinguish between indexes and keys. The former > include "index" in the error string, and the later are surrounded in quot= es. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 1a4034f28..9b171bf9d 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -267,7 +267,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > grub_json_getuint64 (&keyslot_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") || > @@ -279,13 +279,13 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > grub_json_getuint64 (&digest_key, &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 index= %"PRIuGRUB_SIZE, i); > =20 > if ((d->keyslots & (1 << keyslot_key))) > break; > } > if (i =3D=3D size) > - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= %"PRIuGRUB_SIZE, keyslot_idx); > + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No digest for keyslot= \"%"PRIuGRUB_UINT64_T"\"", keyslot_key); > =20 > /* Get segment that matches the digest. */ > if (grub_json_getvalue (&segments, root, "segments") || > @@ -297,13 +297,13 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_lu= ks2_digest_t *d, grub_luks2_s > grub_json_getuint64 (&segment_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 << segment_key))) > break; > } > if (i =3D=3D size) > - return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest %= "PRIuGRUB_SIZE); > + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "No segment for digest \= "%"PRIuGRUB_UINT64_T"\"", digest_key); > =20 > return GRUB_ERR_NONE; > } > --=20 > 2.27.0 >=20 --folLiRRfpQ9D+wf2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+w+kIACgkQVbJhu7ck PpTNiQ/+Ld2ulIrO4qgfJwg9ML3cIGPyN+6ivOfqVdSaWjbQrkMO4IpT6aEcI+BM 0O472KqGH+tR7yl4rtoEY119odKnr/llULbuLsl15zUMYuDmnkLThAogyEb0PzED wlsie7s0mO/bKhmTssWm7qbx/4mJQNTwXgIbpfZ0XuSDMWISo0hMDkWzC/ihLrCF fVFCZFqeRoYWQ9gNiWqHe/OTZ3hUnTfHI7c2JfbNaOWja7NNOwWYy3Z/1W5og+Pf 1xTfw+rioX2enZLNqhZzhI53glsHoEJL1I3OsW9a9EVjTCaBNxjLw0H0/cHhDHI+ s/1j28gW3SEFyUMBvNgWo08pCDVYo3iUtee71ckPMLj9A+o5myzEUMJ7xERmUf4O JGdgqZhtH6OAbwaAeOx4VlDBzr1uYg4SZ6+O0kFWILJJpTGaoGjfIx7FUtQqj1Hm vpvL93P2esoK8vDxUm+f3d3SJAN1QmCW5mIexSdgfHnSibet/afcGROIOXKa2XWl TMyI5iBig4TOe1nkfU7Q7RUPgBSLWU/CMdiWUGTCETm6rQhw3eKP3jY5qGCSyOqG wNOm0tnaAJtbm8Mq32hgNICSmZMIBUooAqQoNAZKA0UL7IDFvehxCpNCA//5LUCg 2wNcNl9ZByxmxvM1zTZh8qCh7PJ3C/bMxfeTabp4W0sJVhjYul8= =dzke -----END PGP SIGNATURE----- --folLiRRfpQ9D+wf2--