The branch master has been updated via 7bb803e85b8c64a5a4ed65d7a07efd8596a8438f (commit) from aa2d9a76b4dcbcf45f2a9dadbace2ddff9c55288 (commit)
- Log ----------------------------------------------------------------- commit 7bb803e85b8c64a5a4ed65d7a07efd8596a8438f Author: Richard Levitte <levi...@openssl.org> Date: Thu Dec 6 13:41:54 2018 +0100 Following the license change, modify the boilerplates in crypto/kdf/ [skip ci] Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7796) ----------------------------------------------------------------------- Summary of changes: crypto/kdf/hkdf.c | 2 +- crypto/kdf/kdf_err.c | 2 +- crypto/kdf/scrypt.c | 2 +- crypto/kdf/tls1_prf.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/kdf/hkdf.c b/crypto/kdf/hkdf.c index ae46fad..dc2ead6 100644 --- a/crypto/kdf/hkdf.c +++ b/crypto/kdf/hkdf.c @@ -1,7 +1,7 @@ /* * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/crypto/kdf/kdf_err.c b/crypto/kdf/kdf_err.c index 1627c0a..92e6a0c 100644 --- a/crypto/kdf/kdf_err.c +++ b/crypto/kdf/kdf_err.c @@ -2,7 +2,7 @@ * Generated by util/mkerr.pl DO NOT EDIT * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/crypto/kdf/scrypt.c b/crypto/kdf/scrypt.c index 61fd390..6b35b77 100644 --- a/crypto/kdf/scrypt.c +++ b/crypto/kdf/scrypt.c @@ -1,7 +1,7 @@ /* * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c index 49f7ecc..c3be7dd 100644 --- a/crypto/kdf/tls1_prf.c +++ b/crypto/kdf/tls1_prf.c @@ -1,7 +1,7 @@ /* * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits