From b1322259d93cf6b6286f9febcd468b6a9f577d91 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 17 May 2016 14:52:22 -0400 Subject: Copyright consolidation 09/10 Reviewed-by: Richard Levitte --- crypto/blake2/blake2_impl.h | 9 ++++----- crypto/blake2/blake2_locl.h | 9 ++++----- crypto/blake2/blake2b.c | 9 ++++----- crypto/blake2/blake2s.c | 9 ++++----- crypto/blake2/m_blake2b.c | 9 ++++----- crypto/blake2/m_blake2s.c | 9 ++++----- 6 files changed, 24 insertions(+), 30 deletions(-) (limited to 'crypto/blake2') diff --git a/crypto/blake2/blake2_impl.h b/crypto/blake2/blake2_impl.h index 5648019843..8fe5c95915 100644 --- a/crypto/blake2/blake2_impl.h +++ b/crypto/blake2/blake2_impl.h @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_locl.h index e4265515dc..fb7beb976c 100644 --- a/crypto/blake2/blake2_locl.h +++ b/crypto/blake2/blake2_locl.h @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.c index 0edca5ded9..e77bd9ac16 100644 --- a/crypto/blake2/blake2b.c +++ b/crypto/blake2/blake2b.c @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c index a5e6da1e26..0b3503e4f0 100644 --- a/crypto/blake2/blake2s.c +++ b/crypto/blake2/blake2s.c @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ diff --git a/crypto/blake2/m_blake2b.c b/crypto/blake2/m_blake2b.c index f613bfff17..82c6f6bd80 100644 --- a/crypto/blake2/m_blake2b.c +++ b/crypto/blake2/m_blake2b.c @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c index 3fbb232e05..467e91a87b 100644 --- a/crypto/blake2/m_blake2s.c +++ b/crypto/blake2/m_blake2s.c @@ -1,16 +1,15 @@ /* - * Copyright 2012, Samuel Neves . * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL licenses (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html - * or in the file LICENSE in the source distribution. */ /* * Derived from the BLAKE2 reference implementation written by Samuel Neves. + * Copyright 2012, Samuel Neves * More information about the BLAKE2 hash function and its implementations * can be found at https://blake2.net. */ -- cgit v1.2.3