From 083264cd6003a8bc8c32ba3373624734bb4b0111 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 6 Sep 2018 19:59:05 -0600 Subject: crypto: use CRYPTOGAMS license --- src/crypto/zinc/chacha20/chacha20-arm.S | 6 +++--- src/crypto/zinc/chacha20/chacha20-arm64.S | 6 +++--- src/crypto/zinc/chacha20/chacha20-x86_64.S | 6 +++--- src/crypto/zinc/poly1305/poly1305-arm.S | 6 +++--- src/crypto/zinc/poly1305/poly1305-arm64.S | 6 +++--- src/crypto/zinc/poly1305/poly1305-mips64.S | 6 ++++-- src/crypto/zinc/poly1305/poly1305-x86_64.S | 6 +++--- src/crypto/zinc/poly1305/poly1305.c | 6 ++++-- src/crypto/zinc/selftest/poly1305.h | 2 +- 9 files changed, 27 insertions(+), 23 deletions(-) (limited to 'src/crypto') diff --git a/src/crypto/zinc/chacha20/chacha20-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S index 4b2090f..4336524 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm.S +++ b/src/crypto/zinc/chacha20/chacha20-arm.S @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.S b/src/crypto/zinc/chacha20/chacha20-arm64.S index a70df6b..f90162c 100644 --- a/src/crypto/zinc/chacha20/chacha20-arm64.S +++ b/src/crypto/zinc/chacha20/chacha20-arm64.S @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.S b/src/crypto/zinc/chacha20/chacha20-x86_64.S index 2451feb..3f503a3 100644 --- a/src/crypto/zinc/chacha20/chacha20-x86_64.S +++ b/src/crypto/zinc/chacha20/chacha20-x86_64.S @@ -1,10 +1,10 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2017 Samuel Neves . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/poly1305/poly1305-arm.S b/src/crypto/zinc/poly1305/poly1305-arm.S index 277a11a..110f431 100644 --- a/src/crypto/zinc/poly1305/poly1305-arm.S +++ b/src/crypto/zinc/poly1305/poly1305-arm.S @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/poly1305/poly1305-arm64.S b/src/crypto/zinc/poly1305/poly1305-arm64.S index 706e664..c200235 100644 --- a/src/crypto/zinc/poly1305/poly1305-arm64.S +++ b/src/crypto/zinc/poly1305/poly1305-arm64.S @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/poly1305/poly1305-mips64.S b/src/crypto/zinc/poly1305/poly1305-mips64.S index 1a45fbe..66b0aa3 100644 --- a/src/crypto/zinc/poly1305/poly1305-mips64.S +++ b/src/crypto/zinc/poly1305/poly1305-mips64.S @@ -1,7 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. + * + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #if !defined(CONFIG_64BIT) diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64.S b/src/crypto/zinc/poly1305/poly1305-x86_64.S index 4d51f40..26c852e 100644 --- a/src/crypto/zinc/poly1305/poly1305-x86_64.S +++ b/src/crypto/zinc/poly1305/poly1305-x86_64.S @@ -1,10 +1,10 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2017 Samuel Neves . All Rights Reserved. * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. * - * This is based in part on Andy Polyakov's implementation from OpenSSL. + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. */ #include diff --git a/src/crypto/zinc/poly1305/poly1305.c b/src/crypto/zinc/poly1305/poly1305.c index 4b90523..fd662de 100644 --- a/src/crypto/zinc/poly1305/poly1305.c +++ b/src/crypto/zinc/poly1305/poly1305.c @@ -1,7 +1,9 @@ -/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. + * + * This is based in part on Andy Polyakov's implementation from CRYPTOGAMS. * * Implementation of the Poly1305 message authenticator. * diff --git a/src/crypto/zinc/selftest/poly1305.h b/src/crypto/zinc/selftest/poly1305.h index 3381455..2ec8678 100644 --- a/src/crypto/zinc/selftest/poly1305.h +++ b/src/crypto/zinc/selftest/poly1305.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - * Copyright (C) 2016-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright (C) 2006-2017 CRYPTOGAMS by . All Rights Reserved. */ #ifdef DEBUG -- cgit v1.2.3-59-g8ed1b