From 9bffe974f201e4a521a8377b6bd88bb85973f2cf Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 16 Sep 2018 05:00:17 +0200 Subject: crypto: make MIT --- 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/chacha20poly1305.h | 2 +- src/crypto/zinc/selftest/curve25519.h | 2 +- src/crypto/zinc/selftest/poly1305.h | 2 +- 34 files changed, 34 insertions(+), 34 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 9dadaa3..f0b43e8 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: GPL-2.0 +/* SPDX-License-Identifier: 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 6a84b9f..360be48 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: GPL-2.0 +/* SPDX-License-Identifier: 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 13765d3..d0b9bb9 100644 --- a/src/crypto/zinc/blake2s/blake2s.c +++ b/src/crypto/zinc/blake2s/blake2s.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 d323615..e661ed2 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: GPL-2.0 +/* SPDX-License-Identifier: 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 0ea1db1..f82b67c 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 f90162c..ba6e52a 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 5b2c8ce..ef8e4ab 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: GPL-2.0 +/* SPDX-License-Identifier: 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 77da2c2..1415a77 100644 --- a/src/crypto/zinc/chacha20/chacha20-mips.S +++ b/src/crypto/zinc/chacha20/chacha20-mips.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 616813d..5a44988 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: GPL-2.0 +/* SPDX-License-Identifier: 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 3f503a3..2b19b46 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 1d9168e..fdfccdc 100644 --- a/src/crypto/zinc/chacha20/chacha20.c +++ b/src/crypto/zinc/chacha20/chacha20.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 4b00c83..ee9434b 100644 --- a/src/crypto/zinc/chacha20poly1305.c +++ b/src/crypto/zinc/chacha20poly1305.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 36e8002..494fd3e 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: GPL-2.0 +/* SPDX-License-Identifier: 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 ad6690b..6b9eebf 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm.S +++ b/src/crypto/zinc/curve25519/curve25519-arm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 8fa327c..13fe11e 100644 --- a/src/crypto/zinc/curve25519/curve25519-fiat32.h +++ b/src/crypto/zinc/curve25519/curve25519-fiat32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 ebe88fc..a1dfe6f 100644 --- a/src/crypto/zinc/curve25519/curve25519-hacl64.h +++ b/src/crypto/zinc/curve25519/curve25519-hacl64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 7011ad0..3996b48 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: GPL-2.0 +/* SPDX-License-Identifier: 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 15c2e43..76ba7d9 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: GPL-2.0 +/* SPDX-License-Identifier: 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 183eeb5..a20b295 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 53f8fec..82135e2 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: GPL-2.0 +/* SPDX-License-Identifier: 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 110f431..0823963 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 c200235..8a6a701 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 dc32123..931ce66 100644 --- a/src/crypto/zinc/poly1305/poly1305-donna32.h +++ b/src/crypto/zinc/poly1305/poly1305-donna32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 de7ab12..8e82c20 100644 --- a/src/crypto/zinc/poly1305/poly1305-donna64.h +++ b/src/crypto/zinc/poly1305/poly1305-donna64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 e29f859..0d841ff 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: GPL-2.0 +/* SPDX-License-Identifier: 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 32d8558..48c9506 100644 --- a/src/crypto/zinc/poly1305/poly1305-mips.S +++ b/src/crypto/zinc/poly1305/poly1305-mips.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 66b0aa3..7da9468 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 e24bee7..8cf3ac9 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: GPL-2.0 +/* SPDX-License-Identifier: 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 26c852e..a0d4343 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 OR GPL-2.0 +/* SPDX-License-Identifier: 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 9a71ac1..51bbfb2 100644 --- a/src/crypto/zinc/poly1305/poly1305.c +++ b/src/crypto/zinc/poly1305/poly1305.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 ddd6a86..61f09b8 100644 --- a/src/crypto/zinc/selftest/blake2s.h +++ b/src/crypto/zinc/selftest/blake2s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 9d170a2..f0ad51c 100644 --- a/src/crypto/zinc/selftest/chacha20poly1305.h +++ b/src/crypto/zinc/selftest/chacha20poly1305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 b9ac989..2679120 100644 --- a/src/crypto/zinc/selftest/curve25519.h +++ b/src/crypto/zinc/selftest/curve25519.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: 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 8138a93..0f439db 100644 --- a/src/crypto/zinc/selftest/poly1305.h +++ b/src/crypto/zinc/selftest/poly1305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ -- cgit v1.2.3-59-g8ed1b