From a61ea8b7fd974d34378aeee7030f760fd066de47 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 19 Sep 2018 13:36:02 +0200 Subject: crypto: explicitly dual license Suggested-by: Thomas Gleixner --- src/crypto/zinc/blake2s/blake2s-x86_64-glue.h | 2 +- src/crypto/zinc/blake2s/blake2s-x86_64.S | 2 +- src/crypto/zinc/blake2s/blake2s.c | 2 +- src/crypto/zinc/chacha20/chacha20-arm-glue.h | 2 +- src/crypto/zinc/chacha20/chacha20-arm.S | 2 +- src/crypto/zinc/chacha20/chacha20-arm64.S | 2 +- src/crypto/zinc/chacha20/chacha20-mips-glue.h | 2 +- src/crypto/zinc/chacha20/chacha20-mips.S | 2 +- src/crypto/zinc/chacha20/chacha20-x86_64-glue.h | 2 +- src/crypto/zinc/chacha20/chacha20-x86_64.S | 2 +- src/crypto/zinc/chacha20/chacha20.c | 2 +- src/crypto/zinc/chacha20poly1305.c | 2 +- src/crypto/zinc/curve25519/curve25519-arm-glue.h | 2 +- src/crypto/zinc/curve25519/curve25519-arm.S | 2 +- src/crypto/zinc/curve25519/curve25519-fiat32.h | 2 +- src/crypto/zinc/curve25519/curve25519-hacl64.h | 2 +- src/crypto/zinc/curve25519/curve25519-x86_64-glue.h | 2 +- src/crypto/zinc/curve25519/curve25519-x86_64.h | 2 +- src/crypto/zinc/curve25519/curve25519.c | 2 +- src/crypto/zinc/poly1305/poly1305-arm-glue.h | 2 +- src/crypto/zinc/poly1305/poly1305-arm.S | 2 +- src/crypto/zinc/poly1305/poly1305-arm64.S | 2 +- src/crypto/zinc/poly1305/poly1305-donna32.h | 2 +- src/crypto/zinc/poly1305/poly1305-donna64.h | 2 +- src/crypto/zinc/poly1305/poly1305-mips-glue.h | 2 +- src/crypto/zinc/poly1305/poly1305-mips.S | 2 +- src/crypto/zinc/poly1305/poly1305-mips64.S | 2 +- src/crypto/zinc/poly1305/poly1305-x86_64-glue.h | 2 +- src/crypto/zinc/poly1305/poly1305-x86_64.S | 2 +- src/crypto/zinc/poly1305/poly1305.c | 2 +- src/crypto/zinc/selftest/blake2s.h | 2 +- src/crypto/zinc/selftest/chacha20.h | 2 +- src/crypto/zinc/selftest/chacha20poly1305.h | 2 +- src/crypto/zinc/selftest/curve25519.h | 2 +- src/crypto/zinc/selftest/poly1305.h | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/crypto/zinc') diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h index 92798e2..506d1df 100644 --- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h +++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64.S b/src/crypto/zinc/blake2s/blake2s-x86_64.S index 360be48..c199e67 100644 --- a/src/crypto/zinc/blake2s/blake2s-x86_64.S +++ b/src/crypto/zinc/blake2s/blake2s-x86_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2017 Samuel Neves . All Rights Reserved. diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c index 29382da..4b1cd46 100644 --- a/src/crypto/zinc/blake2s/blake2s.c +++ b/src/crypto/zinc/blake2s/blake2s.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2012 Samuel Neves . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/chacha20/chacha20-arm-glue.h b/src/crypto/zinc/chacha20/chacha20-arm-glue.h index 4d7eb8c..d5327bf 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm-glue.h +++ b/src/crypto/zinc/chacha20/chacha20-arm-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/chacha20/chacha20-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S index f82b67c..9280d71 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm.S +++ b/src/crypto/zinc/chacha20/chacha20-arm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.S b/src/crypto/zinc/chacha20/chacha20-arm64.S index ba6e52a..1be1d90 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm64.S +++ b/src/crypto/zinc/chacha20/chacha20-arm64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. diff --git a/src/crypto/zinc/chacha20/chacha20-mips-glue.h b/src/crypto/zinc/chacha20/chacha20-mips-glue.h index 518deb5..c4bee4b 100644 --- a/src/crypto/zinc/chacha20/chacha20-mips-glue.h +++ b/src/crypto/zinc/chacha20/chacha20-mips-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/chacha20/chacha20-mips.S b/src/crypto/zinc/chacha20/chacha20-mips.S index 1415a77..b52e9a6 100644 --- a/src/crypto/zinc/chacha20/chacha20-mips.S +++ b/src/crypto/zinc/chacha20/chacha20-mips.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2016-2018 René van Dorst . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h index d2b1c4b..a14d73f 100644 --- a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h +++ b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.S b/src/crypto/zinc/chacha20/chacha20-x86_64.S index 2b19b46..637f5c9 100644 --- a/src/crypto/zinc/chacha20/chacha20-x86_64.S +++ b/src/crypto/zinc/chacha20/chacha20-x86_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2017 Samuel Neves . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/chacha20/chacha20.c b/src/crypto/zinc/chacha20/chacha20.c index 72e24da..03e8cad 100644 --- a/src/crypto/zinc/chacha20/chacha20.c +++ b/src/crypto/zinc/chacha20/chacha20.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/chacha20poly1305.c b/src/crypto/zinc/chacha20poly1305.c index e1d17f8..3ac6cf9 100644 --- a/src/crypto/zinc/chacha20poly1305.c +++ b/src/crypto/zinc/chacha20poly1305.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h index a547732..4682aa0 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/curve25519/curve25519-arm.S b/src/crypto/zinc/curve25519/curve25519-arm.S index 51701a2..7e25d50 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm.S +++ b/src/crypto/zinc/curve25519/curve25519-arm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/curve25519/curve25519-fiat32.h b/src/crypto/zinc/curve25519/curve25519-fiat32.h index 13fe11e..4bf36f1 100644 --- a/src/crypto/zinc/curve25519/curve25519-fiat32.h +++ b/src/crypto/zinc/curve25519/curve25519-fiat32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2016 The fiat-crypto Authors. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519-hacl64.h b/src/crypto/zinc/curve25519/curve25519-hacl64.h index a1dfe6f..d234865 100644 --- a/src/crypto/zinc/curve25519/curve25519-hacl64.h +++ b/src/crypto/zinc/curve25519/curve25519-hacl64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2016-2017 INRIA and Microsoft Corporation. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h index 1b9b719..cd32593 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64.h b/src/crypto/zinc/curve25519/curve25519-x86_64.h index 76ba7d9..6fd04d6 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 +/* SPDX-License-Identifier: GPL-2.0 OR LGPL-2.1 * * Copyright (c) 2017 Armando Faz . All Rights Reserved. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c index a02070e..ba9cd92 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/poly1305/poly1305-arm-glue.h b/src/crypto/zinc/poly1305/poly1305-arm-glue.h index 8a3daf8..8a1f87c 100644 --- a/src/crypto/zinc/poly1305/poly1305-arm-glue.h +++ b/src/crypto/zinc/poly1305/poly1305-arm-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/poly1305/poly1305-arm.S b/src/crypto/zinc/poly1305/poly1305-arm.S index 0823963..41cd176 100644 --- a/src/crypto/zinc/poly1305/poly1305-arm.S +++ b/src/crypto/zinc/poly1305/poly1305-arm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. diff --git a/src/crypto/zinc/poly1305/poly1305-arm64.S b/src/crypto/zinc/poly1305/poly1305-arm64.S index 8a6a701..2494cca 100644 --- a/src/crypto/zinc/poly1305/poly1305-arm64.S +++ b/src/crypto/zinc/poly1305/poly1305-arm64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. diff --git a/src/crypto/zinc/poly1305/poly1305-donna32.h b/src/crypto/zinc/poly1305/poly1305-donna32.h index 931ce66..f449b28 100644 --- a/src/crypto/zinc/poly1305/poly1305-donna32.h +++ b/src/crypto/zinc/poly1305/poly1305-donna32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/poly1305/poly1305-donna64.h b/src/crypto/zinc/poly1305/poly1305-donna64.h index 8e82c20..bea0a2e 100644 --- a/src/crypto/zinc/poly1305/poly1305-donna64.h +++ b/src/crypto/zinc/poly1305/poly1305-donna64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/poly1305/poly1305-mips-glue.h b/src/crypto/zinc/poly1305/poly1305-mips-glue.h index 2932bb9..866b022 100644 --- a/src/crypto/zinc/poly1305/poly1305-mips-glue.h +++ b/src/crypto/zinc/poly1305/poly1305-mips-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/poly1305/poly1305-mips.S b/src/crypto/zinc/poly1305/poly1305-mips.S index 48c9506..26c0f1f 100644 --- a/src/crypto/zinc/poly1305/poly1305-mips.S +++ b/src/crypto/zinc/poly1305/poly1305-mips.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2016-2018 René van Dorst All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/poly1305/poly1305-mips64.S b/src/crypto/zinc/poly1305/poly1305-mips64.S index 7da9468..6f8166f 100644 --- a/src/crypto/zinc/poly1305/poly1305-mips64.S +++ b/src/crypto/zinc/poly1305/poly1305-mips64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h index f821f34..2359e5b 100644 --- a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h +++ b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64.S b/src/crypto/zinc/poly1305/poly1305-x86_64.S index a0d4343..e4951c5 100644 --- a/src/crypto/zinc/poly1305/poly1305-x86_64.S +++ b/src/crypto/zinc/poly1305/poly1305-x86_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause * * Copyright (C) 2017 Samuel Neves . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/poly1305/poly1305.c b/src/crypto/zinc/poly1305/poly1305.c index cd6cb9b..a261751 100644 --- a/src/crypto/zinc/poly1305/poly1305.c +++ b/src/crypto/zinc/poly1305/poly1305.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/selftest/blake2s.h b/src/crypto/zinc/selftest/blake2s.h index 67d3114..3b6f330 100644 --- a/src/crypto/zinc/selftest/blake2s.h +++ b/src/crypto/zinc/selftest/blake2s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/selftest/chacha20.h b/src/crypto/zinc/selftest/chacha20.h index f591460..4cb1f0b 100644 --- a/src/crypto/zinc/selftest/chacha20.h +++ b/src/crypto/zinc/selftest/chacha20.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/selftest/chacha20poly1305.h b/src/crypto/zinc/selftest/chacha20poly1305.h index 22e20b2..58df62f 100644 --- a/src/crypto/zinc/selftest/chacha20poly1305.h +++ b/src/crypto/zinc/selftest/chacha20poly1305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/selftest/curve25519.h b/src/crypto/zinc/selftest/curve25519.h index b0cf55a..68052e5 100644 --- a/src/crypto/zinc/selftest/curve25519.h +++ b/src/crypto/zinc/selftest/curve25519.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/selftest/poly1305.h b/src/crypto/zinc/selftest/poly1305.h index 71bee1b..aabc5ec 100644 --- a/src/crypto/zinc/selftest/poly1305.h +++ b/src/crypto/zinc/selftest/poly1305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ -- cgit v1.2.3-59-g8ed1b