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>
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 [thread overview]
Message-ID: <20230607053940.39078-12-bagasdotme@gmail.com> (raw)
In-Reply-To: <20230607053940.39078-10-bagasdotme@gmail.com>
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 <dhowells@redhat.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
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 <asm/byteorder.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 ` Bagas Sanjaya [this message]
2023-06-07 5:39 ` [PATCH 3/8] crypto: drbg: Convert dual BSD 3-Clause/GPL-1.0 license " 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 ` [PATCH 6/8] crypto: Replace GPL 2.0 boilerplate with " Bagas Sanjaya
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-12-bagasdotme@gmail.com \
--to=bagasdotme@gmail.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=kernel-janitors@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spdx@vger.kernel.org \
/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