| Message ID | 20190117231501.068505479@linutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | None | expand |
On Thu, Jan 17, 2019 at 9:17 PM Thomas Gleixner <tglx@linutronix.de> wrote: > --- a/include/crypto/morus1280_glue.h > +++ b/include/crypto/morus1280_glue.h > @@ -1,15 +1,10 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ Shouldn't this be: /* SPDX-License-Identifier: GPL-2.0+ */ ? At least this is the form documented in Documentation/process/license-rules.rst: " License identifiers for licenses like [L]GPL with the 'or later' option are constructed by using a "+" for indicating the 'or later' option.:: // SPDX-License-Identifier: GPL-2.0+"
On Thu, Jan 17, 2019 at 10:26:07PM -0200, Fabio Estevam wrote: > On Thu, Jan 17, 2019 at 9:17 PM Thomas Gleixner <tglx@linutronix.de> wrote: > > > --- a/include/crypto/morus1280_glue.h > > +++ b/include/crypto/morus1280_glue.h > > @@ -1,15 +1,10 @@ > > -/* SPDX-License-Identifier: GPL-2.0 */ > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > Shouldn't this be: /* SPDX-License-Identifier: GPL-2.0+ */ ? > > At least this is the form documented in Documentation/process/license-rules.rst: > > " License identifiers for licenses like [L]GPL with the 'or later' option > are constructed by using a "+" for indicating the 'or later' option.:: > > // SPDX-License-Identifier: GPL-2.0+" Either works, please see LICENSES/preferred/GPL-2.0 Personally, I think we should stick with the "+" version as that is the much more prevalent use in the kernel at the moment, but it's Thomas's call, not mine. thanks, greg k-h
pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a): > Precise and non-ambiguous license information is important. The recently > added morus header files have a SPDX license identifier, which is nice, but > at the same time they have a contradictionary license boiler plate text. > > SPDX-License-Identifier: GPL-2.0 > > versus > > * 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 > > Oh well. > > As the other morus related files are licensed under the GPL v2 or later, > it's assumed that the boiler plate code is correct, but the SPDX license > identifier is wrong. > > Fix the SPDX identifier and remove the boiler plate as it is redundant. Thanks, I must have copy-pasted the bits from somewhere and didn't notice the discrepancy... > > Fixes: 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for MORUS") > Fixes: 396be41f16fd ("crypto: morus - Add generic MORUS AEAD implementations") > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Ondrej Mosnacek <omosnacek@gmail.com> > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: linux-crypto@vger.kernel.org Acked-by: Ondrej Mosnacek <omosnacek@gmail.com> (feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form) > --- > > P.S.: This patch is part of a larger cleanup, but independent of other > patches and is intended to be picked up by the maintainer directly. > > --- > --- > include/crypto/morus1280_glue.h | 7 +------ > include/crypto/morus640_glue.h | 7 +------ > include/crypto/morus_common.h | 7 +------ > 3 files changed, 3 insertions(+), 18 deletions(-) > > --- a/include/crypto/morus1280_glue.h > +++ b/include/crypto/morus1280_glue.h > @@ -1,15 +1,10 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * The MORUS-1280 Authenticated-Encryption Algorithm > * Common glue skeleton -- header file > * > * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> > * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. > - * > - * 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 _CRYPTO_MORUS1280_GLUE_H > --- a/include/crypto/morus640_glue.h > +++ b/include/crypto/morus640_glue.h > @@ -1,15 +1,10 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * The MORUS-640 Authenticated-Encryption Algorithm > * Common glue skeleton -- header file > * > * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> > * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. > - * > - * 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 _CRYPTO_MORUS640_GLUE_H > --- a/include/crypto/morus_common.h > +++ b/include/crypto/morus_common.h > @@ -1,15 +1,10 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * The MORUS Authenticated-Encryption Algorithm > * Common definitions > * > * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> > * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. > - * > - * 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 _CRYPTO_MORUS_COMMON_H > >
--- a/include/crypto/morus1280_glue.h +++ b/include/crypto/morus1280_glue.h @@ -1,15 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * The MORUS-1280 Authenticated-Encryption Algorithm * Common glue skeleton -- header file * * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. - * - * 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 _CRYPTO_MORUS1280_GLUE_H --- a/include/crypto/morus640_glue.h +++ b/include/crypto/morus640_glue.h @@ -1,15 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * The MORUS-640 Authenticated-Encryption Algorithm * Common glue skeleton -- header file * * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. - * - * 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 _CRYPTO_MORUS640_GLUE_H --- a/include/crypto/morus_common.h +++ b/include/crypto/morus_common.h @@ -1,15 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * The MORUS Authenticated-Encryption Algorithm * Common definitions * * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. - * - * 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 _CRYPTO_MORUS_COMMON_H
Precise and non-ambiguous license information is important. The recently added morus header files have a SPDX license identifier, which is nice, but at the same time they have a contradictionary license boiler plate text. SPDX-License-Identifier: GPL-2.0 versus * 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 Oh well. As the other morus related files are licensed under the GPL v2 or later, it's assumed that the boiler plate code is correct, but the SPDX license identifier is wrong. Fix the SPDX identifier and remove the boiler plate as it is redundant. Fixes: 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for MORUS") Fixes: 396be41f16fd ("crypto: morus - Add generic MORUS AEAD implementations") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ondrej Mosnacek <omosnacek@gmail.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-crypto@vger.kernel.org --- P.S.: This patch is part of a larger cleanup, but independent of other patches and is intended to be picked up by the maintainer directly. --- --- include/crypto/morus1280_glue.h | 7 +------ include/crypto/morus640_glue.h | 7 +------ include/crypto/morus_common.h | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-)