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: 13270012 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B873C7EE23 for ; Wed, 7 Jun 2023 05:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235562AbjFGFkl (ORCPT ); Wed, 7 Jun 2023 01:40:41 -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-Google-Smtp-Source: ACHHUZ7i/C3qvTrVTqIx5gK3POrOua+3W5+/C7L+eaUPwl4Jsy7NoCk/iX68/iEOiyvSfZ0ts77kug== 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 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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. */ /* From patchwork Wed Jun 7 05:39:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270005 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2772C7EE23 for ; Wed, 7 Jun 2023 05:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234256AbjFGFkM (ORCPT ); Wed, 7 Jun 2023 01:40:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233947AbjFGFkL (ORCPT ); Wed, 7 Jun 2023 01:40:11 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86CA21BC9; Tue, 6 Jun 2023 22:40:05 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-25669acf1b0so6001654a91.0; Tue, 06 Jun 2023 22:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116405; x=1688708405; 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=v/Rzvp7nuogI5Ectr3FY2yXKUolZXQo8yN+TgASj1xc=; b=MRdW5VFR6T30zctQdM6ToETADfjr+NIYOTbXzxRMTnkXkJnGTAKDUX8DYwKWJz31MT IMWgL378x/sh0JVf0p/3cwfdC4T/J+337WiXTKrEU663M9fmQZDMLJG0lG4zMVkZaPoi uvaxht7Hrt0VDtTvzbRbKlF07audtIoM9/TfGPnardXUX2VJxWKwKd/Yt/TqybjN4Nu4 z1Vw0Z137dmhbRuTLajHHRupMJwctKjh5jp2egBgRwOnM7mQhc+XGdBbd7HvQn0j0D7g LQ/pYoQEUWPiNxNCjWlMWbAGt16KyvanCJSPjgfWInHfWM9aCr8Bkh5L5IOLhAPs3Scv l+ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116405; x=1688708405; 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=v/Rzvp7nuogI5Ectr3FY2yXKUolZXQo8yN+TgASj1xc=; b=RTgk27F+zZ5C8L+JfQ9QEh5Z1zw/RtNW1MtSlitxq69lW0aDcpuuPxa4bAOCmenwf9 ZcR061EBbSo2yAgl12QMn5vfycBZtEbuSf91itLBxNotIwtGyujDjbxgZ5UA8nJ4MFgc r7ipWDhmbWM620RcvK/Ibz7s0RM5SSrw6Jpk0aNu4qY3lZ1lBbZupzJXNS/iyQxymLBh yFcCxb9YEBryhGKXHLQFeiijSvq9S8VS+RM6BQLAxtTrl48TVz9qWR8VKfsAA4BGPMGV xnPHT0RsOn6hpozsgjNvpTAk5aZckrZl4h2n0IvP0jMzB6nTV2U1ewpS0ENBDxo8oM3r xEgg== X-Gm-Message-State: AC+VfDziC60uqw+PTV5WP/umUis5osdJBzUgMWdvEqBPxhPnQYlpdP11 afwb10ELags2dkuwt4HKoVI= X-Google-Smtp-Source: ACHHUZ5mhizpDI1GSpP3Pe8ZLSwtX30DWzdzw/ugaG/JesMxJWpE7LEHYCiF048V2NzngDt/CM3F8A== X-Received: by 2002:a17:90a:50:b0:256:35f0:a2b0 with SMTP id 16-20020a17090a005000b0025635f0a2b0mr4167122pjb.0.1686116404968; Tue, 06 Jun 2023 22:40:04 -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 s24-20020a170902989800b001b03b7f8adfsm887243plp.246.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 E96DA1069BF; 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 Subject: [PATCH 2/8] crypto: fcrypt: Replace dual BSD 3-Clause/GPL 2.0+ boilerplate with SPDX identifier Date: Wed, 7 Jun 2023 12:39:43 +0700 Message-ID: <20230607053940.39078-12-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=3010; i=bagasdotme@gmail.com; h=from:subject; bh=unGm1pNbGyn58qqwh1tYYYzr9eXLpvqklZLnWANRr3c=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNErKuC54tXHCL7aHmg5/TT/aalBxOWmyw3Xnesbub7 8wumMrC3lHKwiDGxSArpsgyKZGv6fQuI5EL7WsdYeawMoEMYeDiFICJ+LEzMtwqqZ7R935636ag WddOsIf+fjX3D7f8Mrb/uncO3u35lneP4b9LcvOaXv1Tb35MffZsYagNk4O8QDlfhGzfscoGaZu GVbwA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org fcrypt implementation (crypto/fcrypt.c) have license boilerplate for GPL 2.0+ (as implemented in the kernel) and BSD 3-Clause (from original Royal Institute of Technology code). Replace the boilerplate text with corresponding SPDX license tag. As there is no wording that allows using either license alternatively, use AND operator. Cc: David Howells Signed-off-by: Bagas Sanjaya --- crypto/fcrypt.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c index 95a16e88899baf..ecbd29d0deba6b 100644 --- a/crypto/fcrypt.c +++ b/crypto/fcrypt.c @@ -1,45 +1,15 @@ +// SPDX-License-Identifier: BSD-3-Clause AND GPL-2.0-or-later /* FCrypt encryption algorithm * * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) * - * 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. - * * Based on code: * * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * - * 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, this list of conditions and the following disclaimer. - * - * 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. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS 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 ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. */ #include From patchwork Wed Jun 7 05:39:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270007 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BF6FC77B7A for ; Wed, 7 Jun 2023 05:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234753AbjFGFkO (ORCPT ); Wed, 7 Jun 2023 01:40:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234133AbjFGFkL (ORCPT ); Wed, 7 Jun 2023 01:40:11 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B8AC1BD3; Tue, 6 Jun 2023 22:40:06 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-5144a9c11c7so6382312a12.2; Tue, 06 Jun 2023 22:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116405; x=1688708405; 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=FCWFiUFPUn5eTTeVEYVaJy8+YMLW+6inCvkAAvBu/yM=; b=ZoVD7remziHgcihW3SoqS7YUcNOA1w0Hz6BAAVNweCU4IabFTQ6bb9bZbLZynoc37r 1IC0xUllVyeZ7IyH0hCkoFwmfsfQ0wT1j0lwis9bfB9SQAARPxw/gePiydJTTZi7/wUY QskOw1hq+jk+lQgMGUwv1zYPjypDQTZXowUgAT754i93VjCc1lI/56LykVYsr+jl37Il aNohwCi80aI+YZdFpii/v6MRGHRouyz7jKiphklI/oWoTB2jlGPm8lUHZtKUau/9rJ/K EqUaIBDFU4vmQD1vNPgAG8uOnPfR3EhMTo0ISX7CHq+vPJNXUH6u7HWnMNMMNeRyAwT+ xFKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116405; x=1688708405; 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=FCWFiUFPUn5eTTeVEYVaJy8+YMLW+6inCvkAAvBu/yM=; b=RGWAJ0iQjOX2mKcC9XfKxWQMUnKO1nbapQrlFMv6ubD551wanE27dbnL3braPAlwFY B5My79g3k1KsQyImFNPRe0EhXxlSlSqpZcSbFZi1iPALrWWW1fUBiFAdEX4y+31n6+Cv RKjQ/+xtwuY9oNMUJpGSdAftjVRmawx4bnQS9WsllyPz1gkqowh2SWYerIUAX1SQMktq S6+tydbxhaXDvF1agodW62sS1Sk7qjcLOqHeJGBpcPidzw2waVearL3ak7faBrvUHURF eCjaBIk0I5djAPj0SY43psUeFAbDoDXONx5qoNoKr0xxjz4UeevVAIweOKK1Iv2PlOvT V4Sw== X-Gm-Message-State: AC+VfDx1nN499H6xfFnRuy+JIY4zmpwQbR71Elhcc4vPrtLX5Iv330Bz aHw3eAcW5PB+QtXJbEeS7So= X-Google-Smtp-Source: ACHHUZ4dKn4gtyOqiaxD//vhrhPFtbxwNUIsEVbHCEHCMNldaX5c/0l+jxJj7iztIwby5kdxD44a/w== X-Received: by 2002:a05:6a20:6a03:b0:117:428d:f983 with SMTP id p3-20020a056a206a0300b00117428df983mr2569550pzk.1.1686116405474; 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 q26-20020a62e11a000000b00657fbf81ffbsm4960598pfh.80.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 8F34A1044ED; 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 , Stephan Mueller Subject: [PATCH 3/8] crypto: drbg: Convert dual BSD 3-Clause/GPL-1.0 license boilerplate to SPDX identifier Date: Wed, 7 Jun 2023 12:39:44 +0700 Message-ID: <20230607053940.39078-13-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=2787; i=bagasdotme@gmail.com; h=from:subject; bh=CMhqFfpL0Ha26FzgmqI+vIPR5sC4x/nvpsvCP+iQTxQ=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNErIWnxc2xDuK7fc/kzXV7aGWv+rShPJpUrJX1u9ep MXjXTyto5SFQYyLQVZMkWVSIl/T6V1GIhfa1zrCzGFlAhnCwMUpABNxr2Zk2LZbXMU8QE+kSdxc Qed8nahYzT/Zotq0ybFdm2N4FFXuMjK8uT53l5k2l+ymyAXlXk/FTbUPMB5o1v+0mKM+7MyGyxZ MAA== X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Replace the boilerplate with corresponding SPDX tag. Since there is no explicit GPL version, assume GPL 1.0+. Cc: Stephan Mueller Signed-off-by: Bagas Sanjaya --- crypto/drbg.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/crypto/drbg.c b/crypto/drbg.c index ff4ebbc68efab1..f797deaf3952ef 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-1.0+ /* * DRBG: Deterministic Random Bits Generator * Based on NIST Recommended DRBG from NIST SP800-90A with the following @@ -9,38 +10,6 @@ * * Copyright Stephan Mueller , 2014 * - * 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 GPL 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. - * * DRBG Usage * ========== * The SP 800-90A DRBG allows the user to specify a personalization string From patchwork Wed Jun 7 05:39:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270006 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B83D2C87FDD for ; Wed, 7 Jun 2023 05:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233006AbjFGFkN (ORCPT ); Wed, 7 Jun 2023 01:40:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233925AbjFGFkL (ORCPT ); Wed, 7 Jun 2023 01:40:11 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB6761BCE; Tue, 6 Jun 2023 22:40:05 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-5144a9c11c7so6382310a12.2; Tue, 06 Jun 2023 22:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116405; x=1688708405; 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=6+8UPp0cZHZIddVOMxW5nsY5DBDHJWP3+5gafJdKjQI=; b=YovnA9P62qNMyWJjBcA9I69J6z5SjieW+klJnmPS2c0NJ+9bPaZHJmktJ1JXckJVVv SN4LdeRvIFES24Qc2/s6GRXWPWW5y7sCRGTtLKgmNsIb2IDTjf3OWSPgKgm0ETeCjEm8 89rC96pa7SM4wFXEncmDC2KAyqKlsNeyADRy5wnxTUiTSEauVnuhOchS5p4ZOAHLe+pj JXCKPsWhlBi5QKQy3FHmG5RlSHQdMA2N+H+oHaCA9oA5yCzRd4X8EEld3q4DqZJZyT0D 3XJliktDnlgLZ2RaBJKM76we4c/X3i/RRz/cajZFQyh0cBahVK5TuwEyKMjNUoKmc8oX Sw1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116405; x=1688708405; 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=6+8UPp0cZHZIddVOMxW5nsY5DBDHJWP3+5gafJdKjQI=; b=dyWELoc+GDO3VqKPweyJjE13sB7OglyrxhRR5BLX9Zdb+PVdM41Cy6ogMawy5EAuqA 1eFKprU6zXFyfDwR6n8E1ywF1efkj/Z2A1ZpWO/1+mCcmlu7lA7giNG6TGIwlSRzCr4q 3bT1eFh1sl/jUK86WQg3oMNCm5ccCtmv0cvpiJhViAiyNw6DnGUMrxzHhIaZWyYjwQSR BmVf9sie09GY0M02L/fhtH0riDDJr+ASSVb4+i2arULpPf4dkQbJFi3xrJ6hPb8c2rb8 ox0T6U4gqyob3hyMzybsjf/B5xBCwsHR7iENqsMIv4ZXgQWTbLeWat5bbDJOHb15lM9m mrdA== X-Gm-Message-State: AC+VfDw7kFPXdiTDxw1ZlludY0fZ0huT9AkfiEeEUswdxjDHem2Q6r6Y SEYrgXTgMCCwLpWQODnk4EM= X-Google-Smtp-Source: ACHHUZ5KDCaSA69ynZiyIKoO8lR256jraZo4SDPJo1wNlaDfijTQdbJgkTXjTJ63OEWwV+43YurifA== X-Received: by 2002:a05:6a20:a20d:b0:118:520:765a with SMTP id u13-20020a056a20a20d00b001180520765amr1468885pzk.61.1686116405227; 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 ev21-20020a17090aead500b00256833cd9a4sm468624pjb.54.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 5A2421069B8; 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 , Vitaly Chikunov , Salvatore Benedetto Subject: [PATCH 4/8] crypto: ecc: Replace BSD 2-Clause license boilerplate with SPDX identifier Date: Wed, 7 Jun 2023 12:39:45 +0700 Message-ID: <20230607053940.39078-14-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=2101; i=bagasdotme@gmail.com; h=from:subject; bh=AgbqCTOFLAEDWxVOnLceuGG2uLpV5xnB9bcU418E8tM=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNErKe+jbPV5RnR7h9Y642mcvvtjVr08Uzanlz5rWcP fSI5/y7jlIWBjEuBlkxRZZJiXxNp3cZiVxoX+sIM4eVCWQIAxenAExEQ4rhn02+w8l2HgH7hebt Dm7SH24Fsb+aPeffxoaf7jvTF/jFP2P4w/OU+WSvw82b155qCcmrHPrq4HDJQX7rGTtXC8krm6Z ocgIA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Convert boilerplate text for BSD 2-Clause to corresponding SPDX license identifier. Cc: Vitaly Chikunov Cc: Salvatore Benedetto Signed-off-by: Bagas Sanjaya --- crypto/ecc.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/crypto/ecc.c b/crypto/ecc.c index f53fb4d6af992b..9d86db24ca748c 100644 --- a/crypto/ecc.c +++ b/crypto/ecc.c @@ -1,27 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause /* * Copyright (c) 2013, 2014 Kenneth MacKay. All rights reserved. * Copyright (c) 2019 Vitaly Chikunov * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS 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 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include From patchwork Wed Jun 7 05:39:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270008 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63EF6C77B7A for ; Wed, 7 Jun 2023 05:40:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234850AbjFGFk0 (ORCPT ); Wed, 7 Jun 2023 01:40:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234722AbjFGFkO (ORCPT ); Wed, 7 Jun 2023 01:40:14 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83E811BDC; Tue, 6 Jun 2023 22:40:08 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id 46e09a7af769-6b2041315a5so2024234a34.0; Tue, 06 Jun 2023 22:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116408; x=1688708408; 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=wydK3CwztY8WGZmDLKnIHSNUUittxpAep0EjIDXFXjY=; b=CesD+ICRzyvqAssgHdIongt8Jmy/0FhyMzJ0wigDQV82fZEh3l3kmV+Z9lYB6n8rH7 R8VQbE8T5/eZkdQdJrFEY/pn0mv0I/7D4/SJ0UzHCf/ba3RKkcwu3LOT+t7935Ps+Xgi GOFgWKPYM/uOdaaKCvK8cyIhl20EpcmyBgi8wK+Y8qEd/XIVxJmGwxg4g8f+dOxEMdYt 3JLeKbTlV7vcCa/j6XTGoU3Q9z3zqDPJ1N11IpIIHFToGjNE99t0uU1xTyaJLID3RP9n Sgp/zccl0IDERmkVGgvbcXrzM/3W4ifZezlVtRb6D32Kiz2FpgYmYBtvwgVdamj8BwqK 9v/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116408; x=1688708408; 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=wydK3CwztY8WGZmDLKnIHSNUUittxpAep0EjIDXFXjY=; b=E1XbYM5SEwyaokZaqhNvDr+mawNnq5+MdMy6/yfId27S80CFG3MYtOK49S8apogdds N0zTV8qRSd5Hd2tE0lwM7ixPYlkxAHwh3l85FS6sxZo111rLcvBJ5a++DI5Ce2xp+6oa Sn0WwiVbtG6pasDnqXpDMYqEP2aX6bt+PniMV0e66d/flwPMloLECcd7fT29ep1lWhUb 5vHlajRxht2gM21cR5+hM9uZadlKE1Y2WALNj0kpg55GUsIuE5XjDL9UoWr81J7ZV9vq RST7Q6Af6PjZdl+MxkXRpqC6cvU7+sRPe+ZcbCGOhpgUh1CdHbuY5Qfd9YuDL9CpJvvr DyEA== X-Gm-Message-State: AC+VfDwDVcI495ITHt0G5z0c1w+ZRzDpykqWplZx7i5/TiTRdEvawCCF U7JCH7xzFLsaukjTn1NZzEMX9Qoq4Do= X-Google-Smtp-Source: ACHHUZ7PaoC1qZYBeei0GVEApxz0Zv8+id1JFOxBWs1GKuz0xYbnhkVMj8G1ShF0uzCqwxSE210QMg== X-Received: by 2002:a05:6830:1bd4:b0:6af:8743:daac with SMTP id v20-20020a0568301bd400b006af8743daacmr4168372ota.36.1686116407700; Tue, 06 Jun 2023 22:40:07 -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 m26-20020aa78a1a000000b0065ccd867923sm3781553pfa.12.2023.06.06.22.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:40:07 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id 8DED91069EC; 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 , Alexey Degtyarev , Vitaly Chikunov Subject: [PATCH 5/8] crypto: streebog_generic: Correct SPDX license identifier Date: Wed, 7 Jun 2023 12:39:46 +0700 Message-ID: <20230607053940.39078-15-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=1460; i=bagasdotme@gmail.com; h=from:subject; bh=DU3W9+DKhaZRScsTkm8rgBF3OAAfXNjRmU2s4naxbqo=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNErLrPk9sYJhbknN4b5fKu1dPb2TvW5hTJ5oRrrunr 1Hv9faejlIWBjEuBlkxRZZJiXxNp3cZiVxoX+sIM4eVCWQIAxenAExkAwPD/0zW4Kn2p9VOLRPa fvz6zCJxiY+J+Yvywh0Mcot2Kl/udWP4H8dlUjMjRMLzTuFKHj41pZXMM36vPh8w6YCYsuehxxF XeAA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Streebog hash function implementation (crypto/streebog_generic.c) have GPL 2.0+ license boilerplate, but its SPDX identifier is mistagged as dual BSD/GPL. Correct the tag, while also removing the boilerplate. Fixes: e18957e8e87403 ("crypto: streebog - add Streebog hash function") Cc: Alexey Degtyarev Cc: Vitaly Chikunov Signed-off-by: Bagas Sanjaya --- crypto/streebog_generic.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crypto/streebog_generic.c b/crypto/streebog_generic.c index dc625ffc54ad7f..65d0e6bf5e1992 100644 --- a/crypto/streebog_generic.c +++ b/crypto/streebog_generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause +// SPDX-License-Identifier: GPL-2.0-or-later /* * Streebog hash function as specified by GOST R 34.11-2012 and * described at https://tools.ietf.org/html/rfc6986 @@ -6,10 +6,6 @@ * Copyright (c) 2013 Alexey Degtyarev * Copyright (c) 2018 Vitaly Chikunov * - * 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. */ #include From patchwork Wed Jun 7 05:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270010 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 384ABC83003 for ; Wed, 7 Jun 2023 05:40:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235007AbjFGFke (ORCPT ); Wed, 7 Jun 2023 01:40:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234777AbjFGFkP (ORCPT ); Wed, 7 Jun 2023 01:40:15 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCC041BDD; Tue, 6 Jun 2023 22:40:08 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d24136685so183806b3a.1; Tue, 06 Jun 2023 22:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116408; x=1688708408; 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=ppkNBQmxuYcx/PbkAqfMSVxZ68/cT5Kv/2fTrtmlqEk=; b=B4O5lOCOB3yCh5moxDOr4Jg/b1HnKTE7stRyg3RjipYE83c4pVXan25fygnE67yDsY wnASV+/gFFtNLVKn4jONYOdjqn3q1QuOFSwxJ/9lPMRxWDRR09N3ijPkjwWWaaJG67T/ oQ2VPhl9Jg81TjuGZQqDUvktRIs2e+9w8EntXDaKRtAcP8Zl2jFDOFJ5zcYVWytOM+qd 2emKvR+rzQgMRAWZ9wuHmcBO9+nsUzm++KfEERLUAGdnGxt4Cfp+I4vi+DXFp9mpy1bx mJ+aD38mwQV1bucup+5SwMxE8GK6Gug6CCAifkZkuvNOFm4hXcU4S3jk9EFVYhC8GtPW wCQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116408; x=1688708408; 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=ppkNBQmxuYcx/PbkAqfMSVxZ68/cT5Kv/2fTrtmlqEk=; b=RD5+MZjrrb85WA+vW5cf3erKtfAjtHGYV8eahJbbgzEEh5uUrzfuj69XmBKDhRrVfA gLXN8uS4fcZsjmf99xPtPyqb8hiYmpxPL8GFkfm9vxRk4XeJc4Nrc8Ea1pqiwUcbpUh/ TC1s35nCFn7FRIDYfIPov1jHjA8L9mP03dX0X0n+eRqV4XPY1+VFuvJlSv5K0hGb0Ine bVgKbllYkTH6N63KHVJDKvUkyAooHECwROwT13yve6/+fUK0C7NrQU404zdEhVG0owmt L9gEr8q6R3/CpQQp7RKP0hNbAdxbMRJt607Q47DbMDgg4HbKu7yrXnn3RkNe0U4tpDp0 wpEA== X-Gm-Message-State: AC+VfDyKccLm/+uJKCRsFFvhSyqJkfhlIAacw0luyG6Wo/Kvfez3Oj1Y SsmsCiYA7OBbIoc/+GusA3c= X-Google-Smtp-Source: ACHHUZ5MEl6/JLOskdIYCk20E2uKFLC2K7IVvzzE6m5WKXMFfIfCOxC7ypOQnS/Q1FHTzr88oSRUOw== X-Received: by 2002:a05:6a00:230b:b0:659:f4ed:42bc with SMTP id h11-20020a056a00230b00b00659f4ed42bcmr5029604pfh.4.1686116407965; Tue, 06 Jun 2023 22:40:07 -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 v6-20020a62a506000000b0065007825f51sm7582619pfm.79.2023.06.06.22.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:40:07 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id A6D9D1069F0; 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 , Aaron Grothe , "Martin K. Petersen" , Tim Chen , James Morris Subject: [PATCH 6/8] crypto: Replace GPL 2.0 boilerplate with SPDX license identifier Date: Wed, 7 Jun 2023 12:39:47 +0700 Message-ID: <20230607053940.39078-16-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=8338; i=bagasdotme@gmail.com; h=from:subject; bh=HaKi76264HutMA3mSn1u8pzgQiTvHlhgbaB3QdLtb8A=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNEnJCv5N+hrcdubc74/2MsnL1kNnNcZOTNhwNMdRS0 53gMUWmo5SFQYyLQVZMkWVSIl/T6V1GIhfa1zrCzGFlAhnCwMUpABO5VMXwT8W0jrO6SurFzmgW Fh9et3XOk5b++XYlPjgmuNjV0kzpMCPDqVv7nnZff959arpKZ8P3Y3+im2XjFm/92uTH0hriYpT DBwA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Replace the license boilerplate text with appropriate SPDX tag. Cc: Aaron Grothe Cc: "Martin K. Petersen" Cc: Tim Chen Cc: "David S. Miller" Cc: James Morris Signed-off-by: Bagas Sanjaya --- crypto/anubis.c | 6 +----- crypto/crct10dif_common.c | 15 +-------------- crypto/crct10dif_generic.c | 15 +-------------- crypto/khazad.c | 6 +----- crypto/md4.c | 6 +----- crypto/md5.c | 6 +----- crypto/poly1305_generic.c | 5 +---- crypto/vmac.c | 13 +------------ crypto/wp512.c | 6 +----- 9 files changed, 9 insertions(+), 69 deletions(-) diff --git a/crypto/anubis.c b/crypto/anubis.c index 9f0cf61bbc6e26..c3ca6d87b8a0aa 100644 --- a/crypto/anubis.c +++ b/crypto/anubis.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -22,11 +23,6 @@ * * By Aaron Grothe ajgrothe@yahoo.com, October 28, 2004 * - * 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. - * */ #include diff --git a/crypto/crct10dif_common.c b/crypto/crct10dif_common.c index b2fab366f518bc..0eac9fa1d0088e 100644 --- a/crypto/crct10dif_common.c +++ b/crypto/crct10dif_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -8,20 +9,6 @@ * Copyright (C) 2013 Intel Corporation * Author: Tim Chen * - * 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. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * */ #include diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c index e843982073bb58..aef86b2c7a1e36 100644 --- a/crypto/crct10dif_generic.c +++ b/crypto/crct10dif_generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -8,20 +9,6 @@ * Copyright (C) 2013 Intel Corporation * Author: Tim Chen * - * 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. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * */ #include diff --git a/crypto/khazad.c b/crypto/khazad.c index 70cafe73f97405..42c2ac2603f7d2 100644 --- a/crypto/khazad.c +++ b/crypto/khazad.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -12,11 +13,6 @@ * * By Aaron Grothe ajgrothe@yahoo.com, August 1, 2004 * - * 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. - * */ #include diff --git a/crypto/md4.c b/crypto/md4.c index 2e7f2f319f9503..0ba32634088bd3 100644 --- a/crypto/md4.c +++ b/crypto/md4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -14,11 +15,6 @@ * Copyright (c) 2002 David S. Miller (davem@redhat.com) * Copyright (c) 2002 James Morris * - * 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. - * */ #include #include diff --git a/crypto/md5.c b/crypto/md5.c index 72c0c46fb5eea2..d17cc0180f699f 100644 --- a/crypto/md5.c +++ b/crypto/md5.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -9,11 +10,6 @@ * Copyright (c) Cryptoapi developers. * Copyright (c) 2002 James Morris * - * 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. - * */ #include #include diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c index 94af47eb6fa699..9cd51b6d7d892d 100644 --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Poly1305 authenticator algorithm, RFC7539 * @@ -5,10 +6,6 @@ * * Based on public domain code by Andrew Moon and Daniel J. Bernstein. * - * 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. */ #include diff --git a/crypto/vmac.c b/crypto/vmac.c index 4633b2dda1e0a5..0052c32c3f11b3 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * VMAC: Message Authentication Code using Universal Hashing * @@ -6,18 +7,6 @@ * Copyright (c) 2009, Intel Corporation. * Copyright (c) 2018, Google Inc. * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. */ /* diff --git a/crypto/wp512.c b/crypto/wp512.c index 07994e5ebf4ef2..31040492c98175 100644 --- a/crypto/wp512.c +++ b/crypto/wp512.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -13,11 +14,6 @@ * * By Aaron Grothe ajgrothe@yahoo.com, August 23, 2004 * - * 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. - * */ #include #include From patchwork Wed Jun 7 05:39:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270009 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D150C8300C for ; Wed, 7 Jun 2023 05:40:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235052AbjFGFkf (ORCPT ); Wed, 7 Jun 2023 01:40:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232681AbjFGFkZ (ORCPT ); Wed, 7 Jun 2023 01:40:25 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13CDD19BB; Tue, 6 Jun 2023 22:40:09 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-544c0d768b9so93241a12.0; Tue, 06 Jun 2023 22:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116408; x=1688708408; 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=7lXzDlIRubHlhy/CsxVW+JbBC++SnpeBdmdg3V9XuAw=; b=M0N4V9J5qABc4z4kI0dI186KV3jIeQwuP4SGu26BZ22qK/+FZhuEZCP7v4j7ddJOKG IZKZAO15I9Nou6XZnEnsiJvEl+MYuhOtmz/ZVj8A5bFHRyZk+LUnMRUxzSShH00yz0qi mycXfAybcYzdZ0yqk38otmG6raH0aMtqZkd1XXouqu149JwDZtGn+eSC4VBwm5vVYvJ/ WolsNVhIDBSBvVD+R/uRMApuni9GHClpPvCwpZ3vfRkjnTrD+mfumyHfTCuYD3i+OQU6 Vom0z93+t4gIl0iUg1PLDS5gak6f+aOeTSxPn3nkUx88wxwgFdf1gzgefEVX/J5Mg8uz cQsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116408; x=1688708408; 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=7lXzDlIRubHlhy/CsxVW+JbBC++SnpeBdmdg3V9XuAw=; b=bipW1fNBw22Ei5Zx1vEh2HjA7SZVusQe5ru7KipQQrpiJ4a0clsWIGxhQ2Ci+4UQcw x7vDUo67zayAvuI6leeXyxSP3JrngZ4bVtQpW8OcWFAMoTvuhNad7iwcJ8sQ/zPHizPU GHwKlXdTV7RHkyyxhWfsidQpimvob9gpy7WHh+BdDgKi7epkGiuPSGgORbbqb8edLAP6 ZEgylbJlSwOd6gtUf36RYpyN6qkvaQxj9913+X0bw1uEgPbOGv82+Jh7Wum5qTmTpmh2 mFvG2zbT9ZzqGhy/GEThdDL7WIPcxV7jyvskNWzineoW0rNohCqsAP4ONgSih0Amp06b VaTg== X-Gm-Message-State: AC+VfDwFefRbz7J/NAG5crYD+VHioKAsAZo91bgLLnTzq/2mv6fDzpPf i+t0n5SCmG8ia/3APny0OUU= X-Google-Smtp-Source: ACHHUZ7rnAnMjbTZRqpRUpotHxykkdBK1oSH9hASXDkotGIhtyJB8nawn+ESJVt5ltBjR5eRfNLLlg== X-Received: by 2002:a17:90b:1916:b0:256:c3dc:dae6 with SMTP id mp22-20020a17090b191600b00256c3dcdae6mr4002355pjb.31.1686116408510; Tue, 06 Jun 2023 22:40:08 -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 mv21-20020a17090b199500b00253311d508esm486877pjb.27.2023.06.06.22.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:40:08 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id CCCF31069F2; Wed, 7 Jun 2023 12:40:00 +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 , Vitaly Chikunov Subject: [PATCH 7/8] crypto: ecrdsa: Remove GPL 2.0+ boilerplate Date: Wed, 7 Jun 2023 12:39:48 +0700 Message-ID: <20230607053940.39078-17-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=1481; i=bagasdotme@gmail.com; h=from:subject; bh=NJRi3h9oW9raGN/AaB5tvEhQzCjkBkn8/eUkhYzaXRY=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNEnLTWL5/miDzZ+KE1bvPnfzr8tGqe067r3Lg9R+Fa 8qyP6z36ChlYRDjYpAVU2SZlMjXdHqXkciF9rWOMHNYmUCGMHBxCsBEhM8yMhy/KtZ38W5khLJI eN66L7pFrGHq585YL7FX2e1v+q78xTpGhjVL7y72bk7+37qqdA1Pbvy5CY8DLrblGy9zWG7eaXj ejAsA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Remove the unnecessary license notice since there is already matching SPDX license identifier which does the same job. Cc: Vitaly Chikunov Signed-off-by: Bagas Sanjaya --- crypto/ecrdsa.c | 4 ---- crypto/ecrdsa_defs.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/crypto/ecrdsa.c b/crypto/ecrdsa.c index f3c6b5e15e75ba..4a08ef48e95c5e 100644 --- a/crypto/ecrdsa.c +++ b/crypto/ecrdsa.c @@ -10,10 +10,6 @@ * Historical references: * GOST R 34.10-2001, RFC 4357, ISO/IEC 14888-3:2006/Amd 1:2010. * - * 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. */ #include diff --git a/crypto/ecrdsa_defs.h b/crypto/ecrdsa_defs.h index 0056335b9d03a1..82d4229ea879b6 100644 --- a/crypto/ecrdsa_defs.h +++ b/crypto/ecrdsa_defs.h @@ -4,10 +4,6 @@ * * Copyright (c) 2019 Vitaly Chikunov * - * 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. */ #ifndef _CRYTO_ECRDSA_DEFS_H From patchwork Wed Jun 7 05:39:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 13270011 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDA1AC77B7A for ; Wed, 7 Jun 2023 05:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235070AbjFGFkh (ORCPT ); Wed, 7 Jun 2023 01:40:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234719AbjFGFkZ (ORCPT ); Wed, 7 Jun 2023 01:40:25 -0400 Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF51E19BA; Tue, 6 Jun 2023 22:40:09 -0700 (PDT) Received: by mail-yb1-xb2e.google.com with SMTP id 3f1490d57ef6-ba81ded8d3eso8380200276.3; Tue, 06 Jun 2023 22:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686116409; x=1688708409; 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=XdM99WYdQelOMGpMu+7j5o3NWZCSKwsXsFleMdKpHBQ=; b=kl0HVpuG3bIsZZjUIhRHkDK9g56N+CpBPVg4yZIv0LFNmYpe6Eow4gleIygxXi7HtV qaUkRbqfJt+Kw3r5/bn39/gCvV4PrmARyoO9dG85C/xW0Yqwfy32rFEog0BPU2L3ViWC sC02bhS55fHUODgV90yXpG35Y0taOj+nGerWR63nmIKgiX09+k02akS1s9IVKK/7jKpA 0Qiq+tCWl7XTEzNFKKcFl3xFMXCgpasmy/t46BiM6+3FbDt58jr1VKXEpOQDJg+ovxzp 7ZmzYgzfRtEqIRTFRRYYORh9a6+1nclVqNBvNn7rMHw7Hy0Q0FlkzCOKkSa8pS+5Y3i5 eXjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116409; x=1688708409; 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=XdM99WYdQelOMGpMu+7j5o3NWZCSKwsXsFleMdKpHBQ=; b=dFvIIFGLHj5cNtH48/oaB3ZQelLt9f1DXsmCTy68v9dnd7ZxY+FgbGugzNCtGCC5n/ rBsUwYMe/PrvbHfvkW7pV/3mU+Sc46kKt19ol+rtGzAhF62waEh2EuuSeGZKxsDLvMw6 eJ2HH2QBGIQkGNDyN+7dT6osSys+0zYdjmZUopJuQs4S/DCIQwMKeCxH+efXPX13TKxk yHaJmBpLE7Bh/0QHwXDJTJIeISXQnLeyzaCkHjKQMaCZjFEHEvT4J9fjFSBzIQjVOmGz 31gOim9svZAyxZQIylSRLk8gGyepVM7fgwO82J1u0sOxnupv4OxuLcWXvwquGg95pDfG W9Uw== X-Gm-Message-State: AC+VfDxWUXPdlPKM1X89TaAoJl6U/frc/iybFYnQQFucI12/VANPiV4t zYpif3t/bvrao2uPuO8a98U= X-Google-Smtp-Source: ACHHUZ4mCB3LsFvodVihfPVbGPUZtGL4+R7FasXounRJVMbq1AgF37C39CFk3Jq/lhG0KTzjGFbLUA== X-Received: by 2002:a25:1087:0:b0:bb3:ae54:9fcd with SMTP id 129-20020a251087000000b00bb3ae549fcdmr3584173ybq.23.1686116408773; Tue, 06 Jun 2023 22:40:08 -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 bd5-20020a170902830500b001b06361a38dsm9419509plb.116.2023.06.06.22.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:40:08 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id E009D1069FD; Wed, 7 Jun 2023 12:40:00 +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 Subject: [PATCH 8/8] crypto: cts: Convert MIT boilerplate to corresponding SPDX license identifier Date: Wed, 7 Jun 2023 12:39:49 +0700 Message-ID: <20230607053940.39078-18-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=2001; i=bagasdotme@gmail.com; h=from:subject; bh=EyrSqctQWk7uvoCz1uQF3lpzs3d6S+Uv5OFoI1+90Dk=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDCkNEnI3Xwi2X+f7qSJ0aF5rB7vNi2+XFxqwzFhi9WpLk Le674eVHaUsDGJcDLJiiiyTEvmaTu8yErnQvtYRZg4rE8gQBi5OAZiIzFeG/wlZxRE3Q1fm6aal 7Ilca5ZTrrRg/uQ65oNX+mMivwVP3MrI8O/o7lXfVQR53lrfzTJnETgeKSOR/cr8fkXGedHyuGn mrAA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org License boilerplate in CTS mode implementation (crypto/cts.c) looks like MIT license with advertising clause. Replace it with correspondig SPDX tag. Signed-off-by: Bagas Sanjaya --- crypto/cts.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/crypto/cts.c b/crypto/cts.c index 8f604f6554b1c3..9ec7e9787c0f6a 100644 --- a/crypto/cts.c +++ b/crypto/cts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT /* * CTS: Cipher Text Stealing mode * @@ -5,29 +6,6 @@ * The Regents of the University of Michigan * ALL RIGHTS RESERVED * - * Permission is granted to use, copy, create derivative works - * and redistribute this software and such derivative works - * for any purpose, so long as the name of The University of - * Michigan is not used in any advertising or publicity - * pertaining to the use of distribution of this software - * without specific, written prior authorization. If the - * above copyright notice or any other identification of the - * University of Michigan is included in any copy of any - * portion of this software, then the disclaimer below must - * also be included. - * - * THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION - * FROM THE UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY - * PURPOSE, AND WITHOUT WARRANTY BY THE UNIVERSITY OF - * MICHIGAN OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING - * WITHOUT LIMITATION THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - * REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE - * FOR ANY DAMAGES, INCLUDING SPECIAL, INDIRECT, INCIDENTAL, OR - * CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM ARISING - * OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN - * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGES. */ /* Derived from various: