From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1knzyG-00011N-Uk for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:09:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knzyF-00011H-U4 for grub-devel@gnu.org; Sat, 12 Dec 2020 03:09:39 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:56519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knzyD-0002WZ-Vz for grub-devel@gnu.org; Sat, 12 Dec 2020 03:09:39 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id C019A76A; Sat, 12 Dec 2020 03:09:34 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 12 Dec 2020 03:09:35 -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=eohFBUQQYiYwFZClQV6Ke+MHsy5 qhzATjrellfJ9+/Q=; b=TuLtBH6+620ToIKrWk1XDyttVozOtwvTyvD8mw6npwB TarhGnmDFbLFP9unfN2JQQ2fzNj8iEO1O6y4kT/R2L4xqON7ZtA/6qtve0uCewfE 0GoWHY0RA1O7Uu4OpHOZTunXX/a5d6wDDNZM0I4OXDxm2keYIk7AIL+CG1CzBKQw kCsJ42XeTzP4EW7PoPDvq25fOH8pOzWQGjDmv5B1dC8Vlu5FWJprhF9FUR6aksNf lnjDxD7/M8wvwkpZmH+DaO+ziQgNcFFLVyDy/IDFHbtf5NiVuIaXfwtlhksuk1Vx bxUCIR3TWzfM4nrcikwBjJfy3Yi38wokK8+UAe7nIqQ== 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=eohFBU QQYiYwFZClQV6Ke+MHsy5qhzATjrellfJ9+/Q=; b=VS0V1Mz8r7yvrcW+v3pl18 LYd/kGIbBQM0si4Lt1lmJBmJMY6joJh7yRslbTRQDuT3YKHqXk/tp1J/QP3NrN0S CO1cYYwNlQY/0pokOWYsCmzPitZuo1GRF/6RU5lUtFlXuS8gp22kqTqY6ej2dwgw pr5igFFrwer3nDdtmlMwDvN5LMFwV8tK/FkMyxZGCiGffBkSm9KNmbpwkYrnm5ZM /I49K8pRXJHVIYAvkIoB8CFRUfQDAVuDXzKtQMHclWbjk5/Coju0zaZgegbCpmx+ QRaR6x4ATcJ/447/PqkknHN1jRF1KlRjq2iGZ6xToX11aMp78ibbZ24Pcb3OrHDg == 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 EB97B108005C; Sat, 12 Dec 2020 03:09:32 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id ff24c381 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:09:32 +0000 (UTC) Date: Sat, 12 Dec 2020 09:09:31 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 07/18] luks2: Use more intuitive object name instead of json index in user messages Message-ID: References: <1991eca5ae78d76ec70cd600cdf0b54031ebce6a.1607466704.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="qElDFvN+ilQv2ShA" Content-Disposition: inline In-Reply-To: <1991eca5ae78d76ec70cd600cdf0b54031ebce6a.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:09:40 -0000 --qElDFvN+ilQv2ShA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:38PM -0600, Glenn Washburn wrote: > Use the object name in the json array rather than the 0 based index in the > json array for keyslots, segments, and digests. This is less confusing for > the end user. For example, say you have a LUKS2 device with a key in slot= 1 > and slot 4. When using the password for slot 4 to unlock the device, the > messages using the index of the keyslot will mention keyslot 1 (its a > zero-based index). Furthermore, with this change the keyslot number will > align with the number used to reference the keyslot when using the > --key-slot argument to cryptsetup. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 67b1823d3..b6930b2f5 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -290,7 +290,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > 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"\"", k->idx); > =20 > /* Get segment that matches the digest. */ > if (grub_json_getvalue (&segments, root, "segments") || > @@ -308,7 +308,7 @@ luks2_get_keyslot (grub_luks2_keyslot_t *k, grub_luks= 2_digest_t *d, grub_luks2_s > 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"\"", d->idx); > =20 > return GRUB_ERR_NONE; > } > @@ -604,11 +604,11 @@ luks2_recover_key (grub_disk_t source, > =20 > if (keyslot.priority =3D=3D 0) > { > - grub_dprintf ("luks2", "Ignoring keyslot %"PRIuGRUB_SIZE" due to prio= rity\n", i); > + grub_dprintf ("luks2", "Ignoring keyslot \"%"PRIuGRUB_UINT64_T"\" due= to priority\n", keyslot.idx); > continue; > } > =20 > - grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_SIZE"\n", i); > + grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n"= , keyslot.idx); > =20 > /* Set up disk according to keyslot's segment. */ > crypt->offset_sectors =3D grub_divmod64 (segment.offset, segment.s= ector_size, NULL); > @@ -623,16 +623,16 @@ luks2_recover_key (grub_disk_t source, > (const grub_uint8_t *) passphrase, grub_strlen (passphrase)); > if (ret) > { > - grub_dprintf ("luks2", "Decryption with keyslot %"PRIuGRUB_SIZE" fail= ed: %s\n", > - i, grub_errmsg); > + grub_dprintf ("luks2", "Decryption with keyslot \"%"PRIuGRUB_UINT64_T= "\" failed: %s\n", > + keyslot.idx, grub_errmsg); > continue; > } > =20 > ret =3D luks2_verify_key (&digest, candidate_key, keyslot.key_size= ); > if (ret) > { > - grub_dprintf ("luks2", "Could not open keyslot %"PRIuGRUB_SIZE": %s\n= ", > - i, grub_errmsg); > + grub_dprintf ("luks2", "Could not open keyslot \"%"PRIuGRUB_UINT64_T"= \": %s\n", > + keyslot.idx, grub_errmsg); > continue; > } > =20 > @@ -640,7 +640,7 @@ luks2_recover_key (grub_disk_t source, > * TRANSLATORS: It's a cryptographic key slot: one element of an a= rray > * where each element is either empty or holds a key. > */ > - grub_printf_ (N_("Slot %"PRIuGRUB_SIZE" opened\n"), i); > + grub_printf_ (N_("Slot \"%"PRIuGRUB_UINT64_T"\" opened\n"), keyslo= t.idx); > =20 > candidate_key_len =3D keyslot.key_size; > break; > --=20 > 2.27.0 >=20 --qElDFvN+ilQv2ShA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/UeroACgkQVbJhu7ck PpQa3A/8DFNLM4xGn7FJgSNYGQnpUapRprtTrj0D19xyj4dh0htQUvYKN1qejWMJ 7MHh9hA7Hkm/TJ3U4pVgWOLzXvO/FnczurlzfyQrt7r7rvA4EVpCJm7s3C0fUQyq eQHPFlL7vY8AE2jRMJL97MoFBcO3Bwm4GaJHyZkvjE/4i19CamMd+WTjd5Mzf4FA INdm/BKS28JmcI+ipUjGaa/HSv8J+gTnHztzg7LmU8wagUV+3/NeztEqJ0enIW2H MFDBdxsOEOs6OCvRRbKI7zMLaJbIDcXDT3da+fGeYPoEPrnwHloCa+BuZignvSZn Xo21PENXIebkHCIXrkJDHLctvB16mLc4/xkNR4KvKEu/DdDdOzz/ykqlpJy7BaVH JkrhBXDZte4U3xMlLIA0D8lSvaJWXKREzv8RJBuNsT/n/bu+17mlQrEKAy/8nzl9 RKkZFPyWezpemAtnzwt0G4CcxANqDxp6871pGpFCuyOEqiq88zhC8FrmVdS7ZT7/ nYre22QEseMFhroMGfjZWeVNhJtGa1QfbZxu30XkPMryAiLF2aGPNKeLhHc+Jf89 g2vaV8YnfIvNE45BHIEteSEA4VhIQDnb859QhHwGNbiy0nTgOpg8Ty5Z6sIeiWKC K71ZxCMmnZPVfGcblyQy5eR1L54H6ohwKGQLkuQDvUzTP0Bmz1M= =S3lt -----END PGP SIGNATURE----- --qElDFvN+ilQv2ShA--