From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jDtus-0006T9-8j for mharc-grub-devel@gnu.org; Mon, 16 Mar 2020 13:52:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50292) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDtun-0006R2-A0 for grub-devel@gnu.org; Mon, 16 Mar 2020 13:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDtuk-0006V2-RQ for grub-devel@gnu.org; Mon, 16 Mar 2020 13:52:37 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45069) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDtuk-0006Jc-A2 for grub-devel@gnu.org; Mon, 16 Mar 2020 13:52:34 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 4408C5C031C; Mon, 16 Mar 2020 13:52:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 16 Mar 2020 13:52:32 -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=fm3; bh=hhOdOHR97HpDTibX1VwBQz06TEd Q4qF4cwd0KyUjKio=; b=BC7o5A9PZwDVgX7GxO6Euwc69xI72LTj8990YQQwg1P NcMWTZdnHU3K5kPqG4ZoppyCpA0f4a0PJ1OBCxzwKiI7XQ4Dccm7EQ0uH7XHdP1o ucDUi+kiFVl7v37LPj0Mex4gRcKHapFJ3v25FbWB4/beHzyrKJpvJq5zoqJjrA7j IoTGshhzU7ETiDE4JJLtOUJdKBV3CmPZrR+qs1MDAwhfzaZia+EiNQ8hwQbb2ijK uYkff+luDbUhNLwcEzB73ZSoXqZvHDJ++3h7nce18tz0ZsxT5fZaXa/CeHU/q/6R 4ZJapUqA5gtTZDqQcZ6x85qWSZm6HsmqRbSWscvRozA== 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=fm2; bh=hhOdOH R97HpDTibX1VwBQz06TEdQ4qF4cwd0KyUjKio=; b=TLyEoOC+Y5xkRoBKJ/kHZm 0qo11yr5KkW4zHN55AUEJmsHzj64UsSKYjVs2kaJrfyAENY19SUA8loHNX62ID3l ctBkrIMeetqVg8OGKtHNcxbQPPBuCg5ynJfVbdP7mFayAIaVBHnGomIMdHvbG52n 1Yc4jK20CTjngy17JdAdyWUxRYB9rTsQjGKuEDZgpaKF+hXySpG8YqYy1CIaz61E SEdTzJFeOOTDXzmSAZMqrnz5HtrT96W57e3I0XxHmx5XOmfazioBg0ubS8v64thU OyuPAZn4hklaexMxW3oQouHhK5PnjboilJ2X1d8WW0UOWE/8UIIns/IMq3bEDQNw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudeffedguddthecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuffhomhgrihhnpe hgihhthhhusgdrtghomhdptghrvggrthhivhgvtghomhhmohhnshdrohhrghdprghprggt hhgvrdhorhhgnecukfhppeejkedrheehrddukedrkedunecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4e371251.dyn.telefonica.de [78.55.18.81]) by mail.messagingengine.com (Postfix) with ESMTPA id 47F96328005A; Mon, 16 Mar 2020 13:52:30 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id d6b0e724 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 16 Mar 2020 17:52:26 +0000 (UTC) Date: Mon, 16 Mar 2020 18:52:30 +0100 From: Patrick Steinhardt To: Daniel Kiper Cc: grub-devel@gnu.org, Leif Lindholm , agraf@csgraf.de, pjones@redhat.com, mjg59@google.com, phcoder@gmail.com, Milan Broz Subject: Re: [PATCH v3 3/5] argon2: Import Argon2 from cryptsetup Message-ID: <20200316175230.GA4568@ncase> References: <20200313131349.txdyacrwo4bexe4o@tomti.i.net-space.pl> <20200316172106.qyfnfknrm4uiegtv@tomti.i.net-space.pl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: <20200316172106.qyfnfknrm4uiegtv@tomti.i.net-space.pl> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.26 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: Mon, 16 Mar 2020 17:52:38 -0000 --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 16, 2020 at 06:21:06PM +0100, Daniel Kiper wrote: > On Fri, Mar 13, 2020 at 02:13:49PM +0100, Daniel Kiper wrote: > > On Tue, Mar 10, 2020 at 07:58:30PM +0100, Patrick Steinhardt wrote: > > > In order to support the Argon2 key derival function for LUKS2, we > > > obviously need to implement Argon2. It doesn't make a lot of sense to > > > hand-code any crypto, which is why this commit instead imports Argon2 > > > from the cryptsetup project. This commit thus imports the code from t= he > > > official reference implementation located at [1]. The code is licensed > > > under CC0 1.0 Universal/Apache 2.0. Given that both LGPLv2.1+ and Apa= che > > > 2.0 are compatible with GPLv3, it should be fine to import that code. > > > > > > The code is imported from commit 62358ba (Merge pull request #270 from > > > bitmark-property-system/master, 2019-05-20). To make it work for GRUB, > > > several adjustments were required that have beed documented in > > > "grub-dev.texi". > > > > > > [1]: https://github.com/P-H-C/phc-winner-argon2 > > > > > > Signed-off-by: Patrick Steinhardt > > > > [...] > > > > > diff --git a/grub-core/lib/argon2/argon2.c b/grub-core/lib/argon2/arg= on2.c > > > new file mode 100644 > > > index 000000000..c77f7f6ff > > > --- /dev/null > > > +++ b/grub-core/lib/argon2/argon2.c > > > @@ -0,0 +1,232 @@ > > > +/* > > > + * Argon2 reference source code package - reference C implementations > > > + * > > > + * Copyright 2015 > > > + * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Sam= uel Neves > > > + * > > > + * You may use this work under the terms of a Creative Commons CC0 1= =2E0 > > > + * License/Waiver or the Apache Public License 2.0, at your option. = The terms of > > > + * these licenses can be found at: > > > + * > > > + * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zer= o/1.0 > > > + * - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 > > > + * > > > + * You should have received a copy of both of these licenses along w= ith this > > > + * software. If not, they may be obtained at the above URLs. > > > + */ > > > + > > > +#include > > > + > > > +#include "argon2.h" > > > +#include "core.h" > > > + > > > +GRUB_MOD_LICENSE ("GPLv3"); > > > > I think we should change that if the license above is different. > > Anyway, I am trying to get in touch with FSF license team. I have not > > got a reply yet... I will see what is possible in my company... >=20 > Got an unofficial reply that we cannot remove current license from the > Argon2 reference source code package. However, we can add GPLv3 header > after current license header. Hence, I would suggest heading in that > direction. Still waiting for final confirmation. Thanks for handling this issue. So if I got that right, we can keep their header intact, add an additional header for GPLv3 and then we're fine with using `GRUB_MOD_LICENSE ("GPLv3")`? If so, then I'm happy to do that. > Sadly usual turn around is about two weeks... While I could still try to squeeze into v2.04, I think the most sensible way forward would be to defer Argon2 support to v2.06. There's still some open questions, and I'm not sure I feel comfortable with hitting master so close to the pending release. Let me know if you feel otherwise. Patrick --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl5vvNwACgkQVbJhu7ck PpTG7xAAjFbNl+u43vDvTJ5P//lbwxd2K0k24yQdDtG53L84FeKeBkJWxSzTNyCw GB5jK40tl8K4pXSTRMTxSzbPpEayGiytAXjjOhM6SY/hkVPH7RD9dbdnmwxahNJI HIesPeKbKl0iJB8JDgZIm3wkQ+CpYIoJ2kRz2rK2IVEsAQPo0sXbHSAq/hpm6S4j r37z7rx/OM6OBsVLAf0n8UlqudaWuDMDBYv4xnbgbmuYY4J/CHlEwLTeDHyelVdQ X5EsOhk3xxaDijjKDMbK6N8UaO7b+xmpBkEF5aQIQfqA1bQyVJh28BVWcgP21lrr jQWpONrv8xtO0SQK1O7cxv8tLs99exdxjkPTlfuzOJdj8v/awSp30wqlZNsLrgDo vKramOpv7rm1pPAw20+bGn3ZpbQz5sEzU183wA4DNe/w97dZPIXMVpDIc0+CCz7I Y3KN5fEbpC2M+nEumzxb/M3W/zMvBm7V6l1sbJpMQk7hijgpnbesuHMC4x6K3CJ+ Nf7n/Z/jMSoxAqGUZyG6HpdPjucKRfObg8pmlhZXYaZCEyUkNtGjGpK96rEPLT29 dvXqbgk6t3m/vPltb9U3URWOJhP5qZJlvtT9wszGIzPbebLnMe9kfV8Z7pSbVejI pHwK1x8EINwHjbvAcZzax9/WG1b5+8mqfJfnofmQcdj+ISF2vRE= =aAUK -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j--