From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Franziska Naepelt <franziska.naepelt@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linux SPDX Licenses <linux-spdx@vger.kernel.org>,
Linux Kernel Janitors <kernel-janitors@vger.kernel.org>,
Linux Crypto <linux-crypto@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Dan Carpenter <dan.carpenter@linaro.org>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Aaron Grothe <ajgrothe@yahoo.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Tim Chen <tim.c.chen@linux.intel.com>,
James Morris <jmorris@intercode.com.au>
Subject: [PATCH 6/8] crypto: Replace GPL 2.0 boilerplate with SPDX license identifier
Date: Wed, 7 Jun 2023 12:39:47 +0700 [thread overview]
Message-ID: <20230607053940.39078-16-bagasdotme@gmail.com> (raw)
In-Reply-To: <20230607053940.39078-10-bagasdotme@gmail.com>
Replace the license boilerplate text with appropriate SPDX tag.
Cc: Aaron Grothe <ajgrothe@yahoo.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Morris <jmorris@intercode.com.au>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
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 <crypto/algapi.h>
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 <tim.c.chen@linux.intel.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.
- *
- * 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 <linux/crc-t10dif.h>
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 <tim.c.chen@linux.intel.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.
- *
- * 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 <linux/module.h>
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 <crypto/algapi.h>
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 <jmorris@intercode.com.au>
*
- * 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 <crypto/internal/hash.h>
#include <linux/init.h>
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 <jmorris@intercode.com.au>
*
- * 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 <crypto/internal/hash.h>
#include <crypto/md5.h>
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 <crypto/algapi.h>
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 <crypto/internal/hash.h>
#include <linux/init.h>
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2023-06-07 5:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 5:39 [PATCH 0/8] SPDX conversion for cryptographic algorithms Bagas Sanjaya
2023-06-07 5:39 ` [PATCH 1/8] crypto: Convert dual BSD 3-Clause/GPL 2.0 boilerplate to SPDX identifier Bagas Sanjaya
2023-06-07 14:10 ` Richard Fontana
2023-06-08 5:56 ` Bagas Sanjaya
2023-06-08 8:37 ` Ard Biesheuvel
2023-06-08 9:05 ` Greg Kroah-Hartman
2023-06-08 9:07 ` Ard Biesheuvel
2023-06-07 5:39 ` [PATCH 2/8] crypto: fcrypt: Replace dual BSD 3-Clause/GPL 2.0+ boilerplate with " Bagas Sanjaya
2023-06-07 5:39 ` [PATCH 3/8] crypto: drbg: Convert dual BSD 3-Clause/GPL-1.0 license boilerplate to " Bagas Sanjaya
2023-06-07 13:56 ` Richard Fontana
2023-06-08 5:45 ` Bagas Sanjaya
2023-06-07 5:39 ` [PATCH 4/8] crypto: ecc: Replace BSD 2-Clause license boilerplate with " Bagas Sanjaya
2023-06-07 5:39 ` [PATCH 5/8] crypto: streebog_generic: Correct SPDX license identifier Bagas Sanjaya
2023-06-07 5:39 ` Bagas Sanjaya [this message]
2023-06-07 5:39 ` [PATCH 7/8] crypto: ecrdsa: Remove GPL 2.0+ boilerplate Bagas Sanjaya
2023-06-07 5:39 ` [PATCH 8/8] crypto: cts: Convert MIT boilerplate to corresponding SPDX license identifier Bagas Sanjaya
2023-06-07 13:47 ` Richard Fontana
2023-06-08 5:32 ` Bagas Sanjaya
2023-06-08 5:40 ` Greg Kroah-Hartman
2023-06-08 6:49 ` Bagas Sanjaya
2023-06-08 6:54 ` Greg Kroah-Hartman
2023-06-08 11:12 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230607053940.39078-16-bagasdotme@gmail.com \
--to=bagasdotme@gmail.com \
--cc=ajgrothe@yahoo.com \
--cc=dan.carpenter@linaro.org \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=franziska.naepelt@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=jmorris@intercode.com.au \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spdx@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=tim.c.chen@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox