Tim, On Wed, Feb 18, 2026 at 05:09:38PM -0700, Tim Bird wrote: > Add SDPX-License-Identifier ID lines to assorted C files in the > crypto directory, that are missing them. Remove licensing text, > except in cases where the text itself says that the notice must > be retained.
You are saying "except" but in at least two cases in this patch you removing the following text: "retain the above copyright notice, this list of conditions and the following disclaimer." Aren't it should be retained? Also, in one case below you skip dual-licensing in SPDX record. Cam you also state in the commit message the reason why you are removing existing license texts at all and not just adding SPDX? > > Signed-off-by: Tim Bird <[email protected]> > > --- > Note that this does not finish adding SPDX id lines to all the > files, as there are a few special cases with weird license texts. > --- > crypto/algif_rng.c | 1 + > crypto/anubis.c | 7 +------ > crypto/drbg.c | 1 + > crypto/ecc.c | 22 +--------------------- > crypto/fcrypt.c | 33 +-------------------------------- > crypto/jitterentropy-kcapi.c | 1 + > crypto/jitterentropy.c | 1 + > crypto/khazad.c | 7 +------ > crypto/md4.c | 7 +------ > crypto/wp512.c | 7 +------ > 10 files changed, 10 insertions(+), 77 deletions(-) > > diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c > index 1a86e40c8372..a9dffe53e85a 100644 > --- a/crypto/algif_rng.c > +++ b/crypto/algif_rng.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * algif_rng: User-space interface for random number generators > * > diff --git a/crypto/anubis.c b/crypto/anubis.c > index 4b01b6ec961a..18b359883d99 100644 > --- a/crypto/anubis.c > +++ b/crypto/anubis.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Cryptographic API. > * > @@ -21,12 +22,6 @@ > * have put this under the GNU General Public License. > * > * By Aaron Grothe [email protected], 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/drbg.c b/crypto/drbg.c > index 5e7ed5f5c192..410cecc45ab9 100644 > --- a/crypto/drbg.c > +++ b/crypto/drbg.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * DRBG: Deterministic Random Bits Generator > * Based on NIST Recommended DRBG from NIST SP800-90A with the > following > diff --git a/crypto/ecc.c b/crypto/ecc.c > index 2808b3d5f483..c38e4bc0d613 100644 > --- a/crypto/ecc.c > +++ b/crypto/ecc.c > @@ -1,27 +1,7 @@ > +// SPDX-License-Identifier: BSD-2-Clause The file also have the line: MODULE_LICENSE("Dual BSD/GPL"); Thanks, > /* > * Copyright (c) 2013, 2014 Kenneth MacKay. All rights reserved. > * Copyright (c) 2019 Vitaly Chikunov <[email protected]> > - * > - * 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 <crypto/ecc_curve.h> > diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c > index 80036835cec5..63c542ec5b85 100644 > --- a/crypto/fcrypt.c > +++ b/crypto/fcrypt.c > @@ -1,45 +1,14 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause > /* FCrypt encryption algorithm > * > * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. > * Written by David Howells ([email protected]) > * > - * 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> > diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c > index 7c880cf34c52..ad1d60252a96 100644 > --- a/crypto/jitterentropy-kcapi.c > +++ b/crypto/jitterentropy-kcapi.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * Non-physical true random number generator based on timing jitter -- > * Linux Kernel Crypto API specific code > diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c > index 3f93cdc9a7af..1ff0d5800b72 100644 > --- a/crypto/jitterentropy.c > +++ b/crypto/jitterentropy.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > /* > * Non-physical true random number generator based on timing jitter -- > * Jitter RNG standalone code. > diff --git a/crypto/khazad.c b/crypto/khazad.c > index dee54ad5f0e4..0868e0fb6ad9 100644 > --- a/crypto/khazad.c > +++ b/crypto/khazad.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Cryptographic API. > * > @@ -11,12 +12,6 @@ > * have put this under the GNU General Public License. > * > * By Aaron Grothe [email protected], 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 55bf47e23c13..3f04b1a2e839 100644 > --- a/crypto/md4.c > +++ b/crypto/md4.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Cryptographic API. > * > @@ -13,12 +14,6 @@ > * Copyright (c) Cryptoapi developers. > * Copyright (c) 2002 David S. Miller ([email protected]) > * Copyright (c) 2002 James Morris <[email protected]> > - * > - * 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/wp512.c b/crypto/wp512.c > index 229b189a7988..1c9acdf007f3 100644 > --- a/crypto/wp512.c > +++ b/crypto/wp512.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Cryptographic API. > * > @@ -12,12 +13,6 @@ > * have put this under the GNU General Public License. > * > * By Aaron Grothe [email protected], 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> > -- > 2.43.0 >
