2019-01-17 23:19:01

by Thomas Gleixner

[permalink] [raw]
Subject: [patch 2/9] crypto: aegis - Cleanup license mess

Precise and non-ambiguous license information is important. The recently
added aegis header file has a SPDX license identifier, which is nice, but
at the same time it has 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 aegis 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: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Ondrej Mosnacek <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
---

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.

---
crypto/aegis.h | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

--- a/crypto/aegis.h
+++ b/crypto/aegis.h
@@ -1,14 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* AEGIS common definitions
*
* Copyright (c) 2018 Ondrej Mosnacek <[email protected]>
* Copyright (c) 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_AEGIS_H




2019-01-18 08:05:22

by Ondrej Mosnáček

[permalink] [raw]
Subject: Re: [patch 2/9] crypto: aegis - Cleanup license mess

pi 18. 1. 2019 o 0:15 Thomas Gleixner <[email protected]> napísal(a):
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has 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 aegis 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: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Ondrej Mosnacek <[email protected]>
> Cc: Herbert Xu <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: [email protected]

Acked-by: Ondrej Mosnacek <[email protected]>
(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.
>
> ---
> crypto/aegis.h | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> --- a/crypto/aegis.h
> +++ b/crypto/aegis.h
> @@ -1,14 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * AEGIS common definitions
> *
> * Copyright (c) 2018 Ondrej Mosnacek <[email protected]>
> * Copyright (c) 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_AEGIS_H
>
>

2019-01-25 10:49:32

by Herbert Xu

[permalink] [raw]
Subject: Re: [patch 2/9] crypto: aegis - Cleanup license mess

On Fri, Jan 18, 2019 at 12:14:18AM +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has 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 aegis 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: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Ondrej Mosnacek <[email protected]>
> Cc: Herbert Xu <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: [email protected]
> ---
>
> 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.
>
> ---
> crypto/aegis.h | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)

Patches 2-5 applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt