From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kW1O5-0000K5-0t for mharc-grub-devel@gnu.org; Fri, 23 Oct 2020 14:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1Ny-0000G7-Ox for grub-devel@gnu.org; Fri, 23 Oct 2020 14:01:54 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:49939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1Nw-0005Bz-Br for grub-devel@gnu.org; Fri, 23 Oct 2020 14:01:54 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id DFFED93E; Fri, 23 Oct 2020 14:01:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 23 Oct 2020 14:01:51 -0400 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=pTXZ6Sjck4StkQlLo8O2ZqvABqt AXhU+Js3WAVedcsU=; b=juaANVj52tS8sW6toJvltFudy+8wM3yxA1acQKZ0NTG Zz40Kcsn256eYSDfEQNqBkd86ccEp2hE23U5EBtmbNTHakT7oGEwSF1y+ZibyeTP dMepAYm7XumQggH4pJmHOWqT5pF2iJuPUsZ1IQcby8EFhnJ+lYixmiah7hcBrFgP gyGv1OmFwjuDgd6bEG7KSqlrOCTZrdJmz3go66eKjz3eTYPPCjwm+4ZsT4AY5Gyj MIx14HFuzMtJeLoscZ7qiFvuSCcelEgFvFc3jEcgebqfSHuxGTq7vYkxon08sxva rUxPB7x0w3/JbNIo0kgqq0dSVdvc5YgZA8U+fCVMJLg== 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=pTXZ6S jck4StkQlLo8O2ZqvABqtAXhU+Js3WAVedcsU=; b=ZtdY5sLfEljKZUK8Amarnf TblPW2BF22BcAKTaW+GLPyWDjnQ8b/MkmJV/SfrnLlUXhcbExljfPhl19wXccF4Y CY21pxA6Z2u09yNvc6wLUbTjDDlS+SVjIItmIJ0LIP9IRKtxdR/qk7i6trZhvq5k IDMKFqDA4Rz1bwhiPpHiYraLuYvLOi0/VzWlhqAih6Ijqm9Q9ASHh8dJSiATA+Tb FAgIKmArO2PW8sKJPU2XggnH15J4a7q3MpV4iVfYqLPZF9qTF4SrYMqAYG0B36qu OCNPMlmdYrFyqQVZnV6EcvYZW7e19UdDvL9w2j7UAA6Kvz0VX1Lj0KHW2L58zPBA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkedtgdduvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrgeeirddvtddtnecuvehluhhsthgvrhfuihiivgepudenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-089-014-046-200.89.14.pool.telefonica.de [89.14.46.200]) by mail.messagingengine.com (Postfix) with ESMTPA id 2BF053064684; Fri, 23 Oct 2020 14:01:49 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 82e489f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 23 Oct 2020 18:01:48 +0000 (UTC) Date: Fri, 23 Oct 2020 20:01:54 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v3 10/10] luks2: Rename source disk variabled named 'disk' to 'source' as in luks.c. Message-ID: <20201023180154.GG810@tanuki> References: <20201009100122.GH2088@tanuki> <738fe0139bde2a2bd36d0c97526309ab8b5a8224.1603148099.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7uYPyRQQ5N0D02nI" Content-Disposition: inline In-Reply-To: <738fe0139bde2a2bd36d0c97526309ab8b5a8224.1603148099.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.20; envelope-from=ps@pks.im; helo=wout4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 13:46:38 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: Fri, 23 Oct 2020 18:01:55 -0000 --7uYPyRQQ5N0D02nI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 19, 2020 at 06:09:58PM -0500, Glenn Washburn wrote: > This makes it more obvious to the reader that the disk referred to is the > source disk, as opposed to say the disk holding the cryptodisk. >=20 > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt Patrick > --- > grub-core/disk/luks2.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index cd573208a..ccb94e80d 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -417,7 +417,7 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_= t *candidate_key, > =20 > static grub_err_t > luks2_decrypt_key (grub_uint8_t *out_key, > - grub_disk_t disk, grub_cryptodisk_t crypt, > + grub_disk_t source, grub_cryptodisk_t crypt, > grub_luks2_keyslot_t *k, > const grub_uint8_t *passphrase, grub_size_t passphraselen) > { > @@ -493,7 +493,7 @@ luks2_decrypt_key (grub_uint8_t *out_key, > } > =20 > grub_errno =3D GRUB_ERR_NONE; > - ret =3D grub_disk_read (disk, 0, k->area.offset, k->area.size, split_k= ey); > + ret =3D grub_disk_read (source, 0, k->area.offset, k->area.size, split= _key); > if (ret) > { > grub_error (GRUB_ERR_IO, "Read error: %s\n", grub_errmsg); > @@ -537,7 +537,7 @@ luks2_decrypt_key (grub_uint8_t *out_key, > } > =20 > static grub_err_t > -luks2_recover_key (grub_disk_t disk, > +luks2_recover_key (grub_disk_t source, > grub_cryptodisk_t crypt) > { > grub_uint8_t candidate_key[GRUB_CRYPTODISK_MAX_KEYLEN]; > @@ -552,7 +552,7 @@ luks2_recover_key (grub_disk_t disk, > grub_json_t *json =3D NULL, keyslots; > grub_err_t ret; > =20 > - ret =3D luks2_read_header (disk, &header); > + ret =3D luks2_read_header (source, &header); > if (ret) > return ret; > =20 > @@ -561,7 +561,7 @@ luks2_recover_key (grub_disk_t disk, > return GRUB_ERR_OUT_OF_MEMORY; > =20 > /* Read the JSON area. */ > - ret =3D grub_disk_read (disk, 0, grub_be_to_cpu64 (header.hdr_offset) = + sizeof (header), > + ret =3D grub_disk_read (source, 0, grub_be_to_cpu64 (header.hdr_offset= ) + sizeof (header), > grub_be_to_cpu64 (header.hdr_size) - sizeof (header), json_header); > if (ret) > goto err; > @@ -578,10 +578,10 @@ luks2_recover_key (grub_disk_t disk, > } > =20 > /* Get the passphrase from the user. */ > - if (disk->partition) > - part =3D grub_partition_get_name (disk->partition); > - grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), disk->name, > - disk->partition ? "," : "", part ? : "", > + if (source->partition) > + part =3D grub_partition_get_name (source->partition); > + grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, > + source->partition ? "," : "", part ? : "", > crypt->uuid); > if (!grub_password_get (passphrase, MAX_PASSPHRASE)) > { > @@ -616,12 +616,12 @@ luks2_recover_key (grub_disk_t disk, > crypt->log_sector_size =3D sizeof (unsigned int) * 8 > - __builtin_clz ((unsigned int) segment.sector_size) - 1; > if (grub_strcmp (segment.size, "dynamic") =3D=3D 0) > - crypt->total_sectors =3D (grub_disk_get_size (disk) >> (crypt->log_sect= or_size - disk->log_sector_size)) > + crypt->total_sectors =3D (grub_disk_get_size (source) >> (crypt->log_se= ctor_size - source->log_sector_size)) > - crypt->offset_sectors; > else > crypt->total_sectors =3D grub_strtoull (segment.size, NULL, 10) >> cryp= t->log_sector_size; > =20 > - ret =3D luks2_decrypt_key (candidate_key, disk, crypt, &keyslot, > + ret =3D luks2_decrypt_key (candidate_key, source, crypt, &keyslot, > (const grub_uint8_t *) passphrase, grub_strlen (passphrase)); > if (ret) > { > --=20 > 2.27.0 >=20 --7uYPyRQQ5N0D02nI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+TGpEACgkQVbJhu7ck PpQIMw/+K8UzTSt/4I1TAhU/015f3kkybjkYCtRfjVzTafzkaxeADuZwPvwFgaOB fbOSL0qcW2zmRnP8tM4hP1p5qRZ+asEcyUvkmWJWo8zSOBowotBpRgS/JrB2pX3B 30nzjrehv1B0mxq+LgiQJsrZ3ph/RfhqWGiqLjfJbFvemVq7wiC48HApfwFHJeNH tSLJfX4K6ZFqUKLrMSZB3SmuzlARYFjnPTkG52Tg8Kqaarc2AvA1V9nLRFTs3vL2 o+dvOlVJpnKRhPRNB3i7HSiD7eerEfMlY43vEvF85U9ihKh2Rxcro3JhgWZyWs15 Z49V9l/1AVY9E4gch++KH0jHdm9hcpN9E/m+gnpR1aMIyT0Lo81ZUEbr+nQFOGVd yvdeGaihXTGWMc+IxEoQibV+rSzWqkKXvI96sRGkZnF5Mhk9DDPpuNVfMugFNjrm 35b3lt6t1LgAcTEf0T+B1YMnXhn5BLkOM6QnHe8wZ7OY0IZhfvzaHMEOOOAz44V7 DDn+V5VEW/yvjVaBo5GZdzEIjO+I+7dUTnP3yKY7x2hG3ZYMdscXqU5Gm37dPI72 lc7VyiiU16vb3nd18pMvtKFldMAZX+O1Z0UroUqirYb0c6blbZL1czyj7U5lFgZo yaUJc9FSI2UhSnhzzy8PU13bBL42wyGJ38gXrHKZzvu8dgQmEjc= =1r9m -----END PGP SIGNATURE----- --7uYPyRQQ5N0D02nI--