From patchwork Wed Jun 7 05:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 104246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp32297vqr; Tue, 6 Jun 2023 22:53:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ48HowoR12G5M1u7KGDDFC/VYbJ/mIhB5w6ERKqjvimRaukXypIkcaHVh5boErcVVsdgozv X-Received: by 2002:a05:6358:1aa5:b0:129:b907:d8e9 with SMTP id gm37-20020a0563581aa500b00129b907d8e9mr2917169rwb.7.1686117196105; Tue, 06 Jun 2023 22:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686117196; cv=none; d=google.com; s=arc-20160816; b=zpZGyW5niFSkxjxky75NSnXgc2sN6FVcSevGkQE9VWB8bkO2PTXVfBDHQejiU2eTLh XkU291tVpQSP6MMFlx3CjR87XGyeyYxVn0XvI/G9Bifihs97od5Qk8PT3t/qoc40kUUi fY3HVmqxFr+wBr5UWPkcx9Dl2uToClSanlWdl6OzYsza8huT+wCLzrX/4Y300FWGEqG5 /k3b8yI1CzPm7bLAYOvKG7Fax+edZle4mwqOobz9uX1gKv9RHsGQPeh1zvpiGHtvDovP cFz/vub7xp6P5E/HxUBxQo3bRkkOAUdiW5GtujlwUZxu+RFnY//UtUK2D1/ENTPb4D7a azcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RI1ycIqHoKnexGdlh2o5GfDSY8FILvsQd+bsdPeolfw=; b=O7fivtcJl9FlGqmtmeWIXEdKSZUOK7DvVIYi9zsGxzMlrT0Q8cp1if9yscdwmmJCKV kMwbWCzotJxZ0SNvKSq30ezW5gMWkSYboaFggZXT/zATWn6HeKIuuhesy0az5B85/x4o YrNyGUNuAT/6dc1ril9pwg9zrkm+neEKO5H3tzncerdKOXDoFlExVZpUrH+/HHvHfi62 mBnHFp5zgaKB8faOeh0Db7jAq8Pe9oKnmdiII2J2vFOyIOTU2O5XU1p4CNYtVpFQsZ78 PzmSTOyA0L+yCeBU6YtI/b6AcWOXXWo89LvdmG4dXfHiO9FNVKqWJ6XdtoZF9YghW3/E GzAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nJbs4Dvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q27-20020a63751b000000b0054294720d57si5605805pgc.617.2023.06.06.22.53.01; Tue, 06 Jun 2023 22:53:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=nJbs4Dvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235138AbjFGFkz (ORCPT + 99 others); Wed, 7 Jun 2023 01:40:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234928AbjFGFkd (ORCPT ); Wed, 7 Jun 2023 01:40:33 -0400 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 837F81BD9; Tue, 6 Jun 2023 22:40:07 -0700 (PDT) Received: by mail-ot1-x334.google.com with SMTP id 46e09a7af769-6b28fc7a6dcso2027076a34.0; Tue, 06 Jun 2023 22:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116406; x=1688708406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RI1ycIqHoKnexGdlh2o5GfDSY8FILvsQd+bsdPeolfw=; b=nJbs4DvuwBu7Kp2b5WhBiL86TiBxZwGvvQDUoyuoV97Lti0Qj6gV+wVxweVS4FGtam WKb/2g54ueC+0YYgp/bwJx7LNRm4r/bJAsD3nHQO44W+NdtEGYo+/ndnOXnRi6cPlYYQ 621Ty+vxt5eHYeDtk5A/w6ANDuMQK6yUcR2+VIHvPPH47T/EuE6t4izY3+T9DOQJQEEw b7bNS2ES+sheL2tUlt69noySV+9SBl9OhQCFx+CJ0LHpF7clmatiCSItg9HQyMp7oVzl up4zJkAzXAtKUo1Zbjm5gtvqgJS7T/h+mEsNxziOa57QuC6bJFAcOp9KjBgPGsdxyF6n 0RJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116406; x=1688708406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RI1ycIqHoKnexGdlh2o5GfDSY8FILvsQd+bsdPeolfw=; b=cvbOPh0riRTtILh3ls+sFLoHXi35N2yV2lMoqVOsU0DAl5cYEOB/PwTulpfjdZKlFM ifI535n8leMt+RwDuJwgI7VUcJB5RvD9DEAVafpkhG3dccx1shz0Oq/Wq9pIvYa61ljA EQE62FrSfBzLlFkNbkjh4fCNvEkTp+qtn4l/R0UOMhnmQacu2XBupHNE+d2UGY6NxFk9 7NFbEod6el48ANNWk+n5y9uH4RMP72bbSiFwEF2CbiDCYzxg1y845n9k7INromHG8Dhg poZfMVh/mGAZjr6LYrima46p/X2xVAustteBIcTPOHHAP0CdC6TO4p+sVnpDKnMQm5cz 9hUg== X-Gm-Message-State: AC+VfDye8YPfuJVxm8ltUVdimIzNL4ZRzCFU/XutrhWiI/sb0V9/YzLX Gamz2tGyVkDzMeoIzJCCFxU= X-Received: by 2002:a05:6358:c09b:b0:129:d05d:691e with SMTP id fa27-20020a056358c09b00b00129d05d691emr2701521rwb.19.1686116405772; Tue, 06 Jun 2023 22:40:05 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id y11-20020a17090a474b00b00250d670306esm470827pjg.35.2023.06.06.22.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:40:04 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id 1E3B11069BB; Wed, 7 Jun 2023 12:39:59 +0700 (WIB) From: Bagas Sanjaya To: Herbert Xu , "David S. Miller" , Franziska Naepelt , Greg Kroah-Hartman Cc: Linux SPDX Licenses , Linux Kernel Janitors , Linux Crypto , Linux Kernel Mailing List , David Howells , Jarkko Sakkinen , Dan Carpenter , Bagas Sanjaya , Alexander Kjeldaas , Herbert Valerio Riedel , Kyle McMartin , "Adam J . Richter" , Dr Brian Gladman , Stephan Mueller Subject: [PATCH 1/8] crypto: Convert dual BSD 3-Clause/GPL 2.0 boilerplate to SPDX identifier Date: Wed, 7 Jun 2023 12:39:42 +0700 Message-ID: <20230607053940.39078-11-bagasdotme@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230607053940.39078-10-bagasdotme@gmail.com> References: <20230607053940.39078-10-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=12265; i=bagasdotme@gmail.com; h=from:subject; bh=zunGFpf+o9LHHfcgeq3K0XbT2pkfIf201354tPEgDJk=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNEjIctS4ReexPdZ7yvXn8Yt3W0Lp1+eHtLytcOyr+V iz0NzrXUcrCIMbFICumyDIpka/p9C4jkQvtax1h5rAygQxh4OIUgIm4RTEy/DQ6G2LO/LaZ79Kz fZfj9J5UN1a2xa5kenN0x+NPnhpbNjAyvHl8S0V1kXndHqdpRZHMjyX6dbVKzgddULY19eOOZOd gAQA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768022024811021315?= X-GMAIL-MSGID: =?utf-8?q?1768022024811021315?= Replace license boilerplate for dual BSD-3-Clause/GPL 2.0 (only or later) with corresponding SPDX license identifier. Cc: Alexander Kjeldaas Cc: Herbert Valerio Riedel Cc: Kyle McMartin Cc: Adam J. Richter Cc: Dr Brian Gladman Cc: Stephan Mueller Signed-off-by: Bagas Sanjaya --- crypto/aes_generic.c | 31 +------------------------------ crypto/algif_rng.c | 33 +-------------------------------- crypto/jitterentropy-kcapi.c | 32 +------------------------------- crypto/jitterentropy.c | 35 +---------------------------------- crypto/keywrap.c | 32 +------------------------------- 5 files changed, 5 insertions(+), 158 deletions(-) diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c index 666474b81c6aa5..2e042bd306f9c5 100644 --- a/crypto/aes_generic.c +++ b/crypto/aes_generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later /* * Cryptographic API. * @@ -11,39 +12,9 @@ * Kyle McMartin * Adam J. Richter (conversion to 2.5 API). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * --------------------------------------------------------------------------- * Copyright (c) 2002, Dr Brian Gladman , Worcester, UK. * All rights reserved. - * - * LICENSE TERMS - * - * The free distribution and use of this software in both source and binary - * form is allowed (with or without changes) provided that: - * - * 1. distributions of this source code include the above copyright - * notice, this list of conditions and the following disclaimer; - * - * 2. distributions in binary form include the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other associated materials; - * - * 3. the copyright holder's name is not used to endorse products - * built using this software without specific written permission. - * - * ALTERNATIVELY, provided that this notice is retained in full, this product - * may be distributed under the terms of the GNU General Public License (GPL), - * in which case the provisions of the GPL apply INSTEAD OF those given above. - * - * DISCLAIMER - * - * This software is provided 'as is' with no explicit or implied warranties - * in respect of its properties, including, but not limited to, correctness - * and/or fitness for purpose. * --------------------------------------------------------------------------- */ diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c index 407408c437308f..4d4b9e60f72c19 100644 --- a/crypto/algif_rng.c +++ b/crypto/algif_rng.c @@ -1,41 +1,10 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only /* * algif_rng: User-space interface for random number generators * * This file provides the user-space API for random number generators. * * Copyright (C) 2014, Stephan Mueller - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU General Public License, in which case the provisions of the GPL2 - * are required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF - * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. */ #include diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c index 7d1463a1562acb..78230ce74fc840 100644 --- a/crypto/jitterentropy-kcapi.c +++ b/crypto/jitterentropy-kcapi.c @@ -1,40 +1,10 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only /* * Non-physical true random number generator based on timing jitter -- * Linux Kernel Crypto API specific code * * Copyright Stephan Mueller , 2015 - 2023 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU General Public License, in which case the provisions of the GPL2 are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF - * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. */ #include diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c index c7d7f2caa7793b..c8437bd20dc903 100644 --- a/crypto/jitterentropy.c +++ b/crypto/jitterentropy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only /* * Non-physical true random number generator based on timing jitter -- * Jitter RNG standalone code. @@ -9,40 +10,6 @@ * * See https://www.chronox.de/jent.html * - * License - * ======= - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU General Public License, in which case the provisions of the GPL2 are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF - * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. */ /* diff --git a/crypto/keywrap.c b/crypto/keywrap.c index 054d9a216fc9f3..8c51235a91a9ae 100644 --- a/crypto/keywrap.c +++ b/crypto/keywrap.c @@ -1,39 +1,9 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only /* * Key Wrapping: RFC3394 / NIST SP800-38F * * Copyright (C) 2015, Stephan Mueller * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, and the entire permission notice in its entirety, - * including the disclaimer of warranties. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU General Public License, in which case the provisions of the GPL2 - * are required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF - * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. */ /*