Commit 12ea20f6 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Herbert Xu

crypto: morus - Cleanup license mess

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: 56e8e57f ("crypto: morus - Add common SIMD glue code for MORUS")
Fixes: 396be41f ("crypto: morus - Add generic MORUS AEAD implementations")
Signed-off-by: default avatarThomas 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: default avatarOndrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ea5d8cfa
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* /*
* The MORUS-1280 Authenticated-Encryption Algorithm * The MORUS-1280 Authenticated-Encryption Algorithm
* Common glue skeleton -- header file * Common glue skeleton -- header file
* *
* Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
* Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. * 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 #ifndef _CRYPTO_MORUS1280_GLUE_H
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* /*
* The MORUS-640 Authenticated-Encryption Algorithm * The MORUS-640 Authenticated-Encryption Algorithm
* Common glue skeleton -- header file * Common glue skeleton -- header file
* *
* Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
* Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. * 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 #ifndef _CRYPTO_MORUS640_GLUE_H
......
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* /*
* The MORUS Authenticated-Encryption Algorithm * The MORUS Authenticated-Encryption Algorithm
* Common definitions * Common definitions
* *
* Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
* Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. * 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 #ifndef _CRYPTO_MORUS_COMMON_H
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment