Re: [patch 3/9] crypto: morus - Cleanup license mess

[Ondrej MosnÃÄek]

pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxx>
> Cc: Ondrej Mosnacek <omosnacek@xxxxxxxxx>
> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
> Cc: linux-crypto@xxxxxxxxxxxxxxx

Acked-by: Ondrej Mosnacek <omosnacek@xxxxxxxxx>
(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@xxxxxxxxx>
>   * 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@xxxxxxxxx>
>   * 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@xxxxxxxxx>
>   * 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
>
>