From a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d Mon Sep 17 00:00:00 2001 From: Shourya Shukla Date: Mon, 27 Apr 2020 10:29:50 +0530 Subject: Amend references to "OpenSSL license" A small number of files contain references to the "OpenSSL license" which has been deprecated and replaced by the "Apache License 2.0". Amend the occurences. Fixes #11649 Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/11663) --- providers/fips/self_test.c | 2 +- providers/fips/self_test.h | 2 +- providers/fips/self_test_data.inc | 2 +- providers/fips/self_test_kats.c | 2 +- providers/implementations/kdfs/krb5kdf.c | 2 +- providers/implementations/kdfs/sshkdf.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'providers') diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index ccc01bd..5c69dfa 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -1,7 +1,7 @@ /* * Copyright 2019-2020 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/providers/fips/self_test.h b/providers/fips/self_test.h index 7367e96..ad693aa 100644 --- a/providers/fips/self_test.h +++ b/providers/fips/self_test.h @@ -1,7 +1,7 @@ /* * Copyright 2019-2020 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/providers/fips/self_test_data.inc b/providers/fips/self_test_data.inc index 43de2aa..431e524 100644 --- a/providers/fips/self_test_data.inc +++ b/providers/fips/self_test_data.inc @@ -1,7 +1,7 @@ /* * Copyright 2019-2020 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/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c index f02dbcd..5ef4474 100644 --- a/providers/fips/self_test_kats.c +++ b/providers/fips/self_test_kats.c @@ -1,7 +1,7 @@ /* * Copyright 2019-2020 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/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 59711ee..0a97b8e 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -1,7 +1,7 @@ /* * Copyright 2018-2020 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/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c index 508fb63..077e451 100644 --- a/providers/implementations/kdfs/sshkdf.c +++ b/providers/implementations/kdfs/sshkdf.c @@ -1,7 +1,7 @@ /* * Copyright 2018-2019 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 -- cgit v1.1