From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mCjKY-0003Ni-Cy for mharc-grub-devel@gnu.org; Sun, 08 Aug 2021 09:59:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCjKW-0003M2-Qq for grub-devel@gnu.org; Sun, 08 Aug 2021 09:59:09 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCjKH-0004Ed-SE for grub-devel@gnu.org; Sun, 08 Aug 2021 09:59:08 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E99BC5C0129; Sun, 8 Aug 2021 09:58:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 08 Aug 2021 09:58:48 -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=fm1; bh=K+KH0EGzVdaepnPMUl8T2jf3H/H gBMgxui6o/40O9P8=; b=D2jeDQVR7gBHhYxu+PH5JjJXNdrv65xq0yu7IudeXDs LsGV6E7O4ONOkhWzH4mRnfavLFPaiM9/SP4ByvNHCyqgiC8hdY93RUHAgLSrfWzk zHluHTBl+aezl+eZr8RiedfNAHL7DW1NryfSrVr4zM+YNQ+L9qt3QvRV4TQVcB6t qkSYpeLzhpqc4/z5WRZP68q7ngyTwVY3mZdnKEWZjmpGZNmQL9kjoOrRX1OeXxiT 2xt1pvpq6gZQTMoznlqdGpgDlNoSS9dMT4/ZjuVJzMdgLmUMAzlcYIbjgkuSMi6D UcFWLDvSYAox/fD/dGWr6vPmlTis1L4XhygAnUOGF1Q== 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=fm3; bh=K+KH0E GzVdaepnPMUl8T2jf3H/HgBMgxui6o/40O9P8=; b=q1H1uzt1BMtmq2MGCQNQG9 yKyUFOsxyywAIc/icBbrKnUGF2H7F8DaMEL13eEamhWOImY+GvH19DCMhhpGQ70W XFGQRAp4P1s7QxIUT32FG9/Jqm/S0nVCKvysjEJXslDmBASPJy7n2qYqQERw0sc/ otW+8upt8OfO11W44fz9pFGHDadD8NZThaKhT5bOprdK4ejDSWBigTAW7xjrzy3D 5oIrI0I4/148SLGTwXi1wied3dhM9iKcxszDc08anlzeCJ0Hchfxt8v/SeRiDHUs ONCf5bWvDgrAwZ4ULJ+RIu7iBsJKj+ozDLWEB7uaiuFd6/5bylDelsi/ai4GGLng == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrjeehgdejudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhrihgt khcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnh epudegieeuffefgfegudeiueduhfdvffelvdfhkedvleetfeffudegveekieejieeinecu ffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 8 Aug 2021 09:58:47 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 1d80b4a9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 8 Aug 2021 13:58:45 +0000 (UTC) Date: Sun, 8 Aug 2021 15:58:44 +0200 From: Patrick Steinhardt To: grub-devel@gnu.org Cc: Daniel Kiper , Leif Lindholm , agraf@csgraf.de, pjones@redhat.com, mjg59@google.com, phcoder@gmail.com, Milan Broz , petr.vorel@gmail.com, Dmitry Subject: [PATCH v4 1/5] kern: dl: Allow modules under CC0 license Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="n8oTBTIW9zT7Q4q0" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=66.111.4.25; envelope-from=ps@pks.im; helo=out1-smtp.messagingengine.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) 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.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, 08 Aug 2021 13:59:09 -0000 --n8oTBTIW9zT7Q4q0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable We're about to import the reference implementation of Argon2, which is licensed under CC0. Given that this license is compatible with the GPL according to [1], having code under this license alongside with GPL'd code is perfectly fine. [1]: https://www.gnu.org/licenses/license-list.en.html#CC0 Signed-off-by: Patrick Steinhardt --- grub-core/kern/dl.c | 3 ++- util/grub-module-verifierXX.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c index 48f8a7907..7d395096f 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -462,7 +462,8 @@ grub_dl_check_license (Elf_Ehdr *e) Elf_Shdr *s =3D grub_dl_find_section (e, ".module_license"); if (s && (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=3DGPLv3") =3D= =3D 0 || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=3DGPLv3+") =3D=3D= 0 - || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=3DGPLv2+") =3D=3D= 0)) + || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=3DGPLv2+") =3D=3D= 0 + || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=3DCC0") =3D=3D 0)) return GRUB_ERR_NONE; return grub_error (GRUB_ERR_BAD_MODULE, "incompatible license"); } diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c index ceb24309a..284f9026e 100644 --- a/util/grub-module-verifierXX.c +++ b/util/grub-module-verifierXX.c @@ -157,7 +157,8 @@ check_license (const char * const filename, Elf_Shdr *s =3D find_section (arch, e, ".module_license"); if (s && (strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICEN= SE=3DGPLv3") =3D=3D 0 || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE= =3DGPLv3+") =3D=3D 0 - || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE= =3DGPLv2+") =3D=3D 0)) + || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE= =3DGPLv2+") =3D=3D 0 + || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE= =3DCC0") =3D=3D 0)) return; grub_util_error ("%s: incompatible license", filename); } --=20 2.32.0 --n8oTBTIW9zT7Q4q0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmEP4xMACgkQVbJhu7ck PpRSTxAAo3leEk7U47GFerE4CBrrC3CZpkpXjoNdcYuEbvy8rhhZrFzt4+g+8s5w z9BvXArf1G85XY4bvk61oeaLO7A52WOg5qpK3dKfcv6wZheq/MbjrE/JjcDNiLLc yOW/dipv23hXDNRU4xWHchWw792lBcTfO5QqTDhQczTfaze4LLYFt0W7ySuV39ir Q6FIZSLQPJFpH/lAjRJf5CjmDGzkuc6xg+km5NBQIKh695jKUv+H3oBGzmUfcd36 Smv9cM7R7HuyU0y+Uc3nV6IU77H2+gGelvdodHpMPABiKrcsqiU3e347itmjTFRT 7Yy9iThh3biPO6dxzdVGw9BwKeM9fH0Dvja6rQxx1+NkeuM7YGBAlYIe6JV8kYRo TtdjOUtixlfNuqwdYjFMwkAdQWaq0wCebQ9MvF9r0BuiH009u1dmGHHwen3yhzyO xxvk1bsC0B4yjy+Wq5I2r3DZSfr10RensKYxuKyWMDKRSbI2mUk/5/JJDiZlfW+r EIV73GAjURBM/kSS7Bo1MZmjuNcH5oXSJk4PfEOypK7xFbgPX0GM1hilJB1MZQC7 T6EJwe1+WyHkAB5nVFqiPbUM7/xWw4LwQctjLBtJ9JW/+5n/rCAtkUIGOrQIedZg r/lckIxn6ujrKwIu5Rh03eqTIrG5PZ7Uy8LdMut0IOALp25zO7o= =w8r3 -----END PGP SIGNATURE----- --n8oTBTIW9zT7Q4q0--