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 <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11663)

diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 55a6b510a44e583b9b1b719d8668709b3d7e98ed..8c6a48113d3aff3079047ad43b4f061291f734dc 100644 (file)
--- a/apps/include/apps_ui.h
+++ b/apps/include/apps_ui.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/apps/include/fmt.h b/apps/include/fmt.h
index 01acf8669430c87791d05a46b2a5755253fb91df..ef18fc0dd0b5a4a1180afe28502ec22c29fd0dc4 100644 (file)
--- a/apps/include/fmt.h
+++ b/apps/include/fmt.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/apps/include/opt.h b/apps/include/opt.h
index 1bf46215d5a276ed815d79dee773a53f5cb6a3ad..b4753dc42ec64a5cfdeed1e92a3546da7a2563a2 100644 (file)
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -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/apps/kdf.c b/apps/kdf.c
index 9a69682b575db004bc1e040e71a4e4a55752a0a4..8d11807f5f405089cc7ae24faeb2e3ea102fd23b 100644 (file)
--- a/apps/kdf.c
+++ b/apps/kdf.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/apps/lib/apps_ui.c b/apps/lib/apps_ui.c
index bcfe555478e15245f5c5b67aea319b7fc49eea78..ae0f5f217c28b17904de7052d6ae4ee0b009a99e 100644 (file)
--- a/apps/lib/apps_ui.c
+++ b/apps/lib/apps_ui.c
@@ -1,7 +1,7 @@
 /*
  * 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/apps/lib/fmt.c b/apps/lib/fmt.c
index 5cb4c041a8d7c89aa5975a830d0218fe32af76ef..2cdd55e9248a911fb67e4c39479ba9d86fad43c1 100644 (file)
--- a/apps/lib/fmt.c
+++ b/apps/lib/fmt.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/apps/mac.c b/apps/mac.c
index 07a6e915e3ede15f6d3776e1831d3f10670c8f34..30f0daabcc003769ec68e56a29835d4f6eb0a0ce 100644 (file)
--- a/apps/mac.c
+++ b/apps/mac.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/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c
index 492eb297c3ca722ccd6149b13d9f77095a7f6060..624829c6848f6ae64bc13ccea5363f43d3ed4904 100644 (file)
--- a/crypto/bn/bn_rsa_fips186_4.c
+++ b/crypto/bn/bn_rsa_fips186_4.c
@@ -2,7 +2,7 @@
  * Copyright 2018-2019 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2019, Oracle and/or its affiliates.  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/modes/siv128.c b/crypto/modes/siv128.c
index 712141032db578461b321674ccd92449f760a899..b214011f348771453c3646d827d232ec2060b20b 100644 (file)
--- a/crypto/modes/siv128.c
+++ b/crypto/modes/siv128.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/perlasm/s390x.pm b/crypto/perlasm/s390x.pm
index b2fea8012f09398ea890e15b02f1c0fd5e8bec76..af8ab6ab7d592d5d7f1e224cef27c47386b5f465 100644 (file)
--- a/crypto/perlasm/s390x.pm
+++ b/crypto/perlasm/s390x.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # Copyright 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/perlasm/x86_64-support.pl b/crypto/perlasm/x86_64-support.pl
index 66aeaedab44c41f914de607e7d193e55ff1a5c3a..0bacb7186469c862fecc06e65c5986779b335f46 100644 (file)
--- a/crypto/perlasm/x86_64-support.pl
+++ b/crypto/perlasm/x86_64-support.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/crypto/rand/rand_vxworks.c b/crypto/rand/rand_vxworks.c
index 8a891d2fb8aca48daffc7a8149d75947cea3b19f..427d50d2637e7361e21bbfa654eb242e02636dbc 100644 (file)
--- a/crypto/rand/rand_vxworks.c
+++ b/crypto/rand/rand_vxworks.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/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c
index 662502190e9b9bf39ac9ee542684877190696edf..7cf6241dee6126177f06d95806dfc366690ad2ff 100644 (file)
--- a/crypto/rsa/rsa_sp800_56b_check.c
+++ b/crypto/rsa/rsa_sp800_56b_check.c
@@ -2,7 +2,7 @@
  * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2019, Oracle and/or its affiliates.  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/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index 6c30a967b8cf1cc6a0e67d0bfb66acf763344413..c4c7c08e945df3cee1ab581efc75937ba85c35d0 100644 (file)
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c
@@ -2,7 +2,7 @@
  * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2019, Oracle and/or its affiliates.  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/doc/man1/openssl-fipsinstall.pod.in b/doc/man1/openssl-fipsinstall.pod.in
index 74b23341e311702086396773dc0aa3286c750773..1d1cdea71559afab7defd42b0cc05142b4a82bb6 100644 (file)
--- a/doc/man1/openssl-fipsinstall.pod.in
+++ b/doc/man1/openssl-fipsinstall.pod.in
@@ -168,7 +168,7 @@ L<EVP_MAC(3)>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man1/openssl-kdf.pod.in b/doc/man1/openssl-kdf.pod.in
index 4c0825c9b3f67ebf392af0407baa443c19ff89c5..9c585325ba50f49ef2a8b5c520f26f85872480c2 100644 (file)
--- a/doc/man1/openssl-kdf.pod.in
+++ b/doc/man1/openssl-kdf.pod.in
@@ -167,7 +167,7 @@ Added in OpenSSL 3.0
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man1/openssl-mac.pod.in b/doc/man1/openssl-mac.pod.in
index 2157c75cf74ae2a4d37d9ac035de1150cf878db1..4c9cc3bc31bed834587c0e6581086d6e7377414f 100644 (file)
--- a/doc/man1/openssl-mac.pod.in
+++ b/doc/man1/openssl-mac.pod.in
@@ -158,7 +158,7 @@ L<EVP_MAC-Poly1305(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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man1/openssl-rehash.pod.in b/doc/man1/openssl-rehash.pod.in
index c98f89eb4814041d13f7fe2bef4a2d7abf6616b9..380ad6dd2a46f33a0e70b8bc8e0aabb0f4345f46 100644 (file)
--- a/doc/man1/openssl-rehash.pod.in
+++ b/doc/man1/openssl-rehash.pod.in
@@ -2,7 +2,7 @@
 {- OpenSSL::safe::output_do_not_edit_headers(); -}
 
 =for comment
-Original text by James Westby, contributed under the OpenSSL license.
+Original text by James Westby.
 
 =head1 NAME
 

diff --git a/doc/man3/SSL_set_async_callback.pod b/doc/man3/SSL_set_async_callback.pod
index 3fa05dff3aea03cfc0a64227c70b7ba28ac6d8b2..4b808dc33a1d8ec902336dfe0d77664566e5116b 100644 (file)
--- a/doc/man3/SSL_set_async_callback.pod
+++ b/doc/man3/SSL_set_async_callback.pod
@@ -123,7 +123,7 @@ SSL_get_async_status() were first added to OpenSSL 3.0.
 
 Copyright 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_KDF-KRB5KDF.pod b/doc/man7/EVP_KDF-KRB5KDF.pod
index c75340ac995c7bda269689ffa1c1aea1a3d4b621..071cb4e8e455e3cf00830b3fd5267141d07196ea 100644 (file)
--- a/doc/man7/EVP_KDF-KRB5KDF.pod
+++ b/doc/man7/EVP_KDF-KRB5KDF.pod
@@ -110,7 +110,7 @@ This functionality was added to OpenSSL 3.0.
 
 Copyright 2016-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_KDF-SSHKDF.pod b/doc/man7/EVP_KDF-SSHKDF.pod
index 1f7f3a55ecaa7bc0cb617c3a74ddfa9fffe94e02..a9358168c62dcd5170dec06f037d707a7a773bd6 100644 (file)
--- a/doc/man7/EVP_KDF-SSHKDF.pod
+++ b/doc/man7/EVP_KDF-SSHKDF.pod
@@ -150,7 +150,7 @@ L<EVP_KDF(3)/PARAMETERS>
 
 Copyright 2016-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h
index bfc459e037663e6fad9659f6bf177b23e1afbe77..ff6e1b8e0890c87f64b886ed3563b5c641a34399 100644 (file)
--- a/include/openssl/self_test.h
+++ b/include/openssl/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.c b/providers/fips/self_test.c
index ccc01bd3bd9e9dea59d991d4af23fac7c046b75a..5c69dfa691ab45466720d6936013c82295847a5a 100644 (file)
--- 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 7367e96a313e9667191421057012ae2909b43496..ad693aa9a24534a5434361b25d8b7ec10bf01b14 100644 (file)
--- 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 43de2aa3f2cad869d575bd408d5439769c0da7ac..431e52467c43aa43769a6e2850c1f861fa88e339 100644 (file)
--- 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 f02dbcd85cfad696d1ed7cd1b2d3aa0f989808fb..5ef4474a1cd3bcc1017a64a820f471d990f3a03a 100644 (file)
--- 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 59711eef96bd6bed91097dc4f90fd123730864b3..0a97b8e3f952610923e96380917172c250a84daf 100644 (file)
--- 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 508fb6350ade9d24362ae3f946bf60ec0282340f..077e451562ce596f206c9b7150fe82dbf8209860 100644 (file)
--- 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

diff --git a/test/bio_memleak_test.c b/test/bio_memleak_test.c
index 49ee712a49b53088c658764f5d927972ac4b3f77..beadd79c43ad6fe45e6bc1c37b1a81d9dbaec1ea 100644 (file)
--- a/test/bio_memleak_test.c
+++ b/test/bio_memleak_test.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/test/bn_internal_test.c b/test/bn_internal_test.c
index f3e874960db747965f29e23e24046728151a4cd1..31d51cb80432cc0bd128832305ce50d79a482f6b 100644 (file)
--- a/test/bn_internal_test.c
+++ b/test/bn_internal_test.c
@@ -1,7 +1,7 @@
 /*
  * 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/test/cmsapitest.c b/test/cmsapitest.c
index 2ac330a8fa3c6d0cc9b8a4e4a55bbbf063305a8f..697daa814d184aa7ca5c6702424558cc23d01a70 100644 (file)
--- a/test/cmsapitest.c
+++ b/test/cmsapitest.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/test/drbg_extra_test.c b/test/drbg_extra_test.c
index 642f7449320267f5a28b2a849a2b0130e2a91da6..8d7b8fbf8f4b3d4e3242755badfc050e896e2864 100644 (file)
--- a/test/drbg_extra_test.c
+++ b/test/drbg_extra_test.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/test/drbg_extra_test.h b/test/drbg_extra_test.h
index 4c771573d129f336cddf2a19161f6caca6f76247..5153dafe239400ab7ff693d9d899e555ac9f1e42 100644 (file)
--- a/test/drbg_extra_test.h
+++ b/test/drbg_extra_test.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/test/recipes/03-test_internal_bn.t b/test/recipes/03-test_internal_bn.t
index 8aed18ac30c1f43fd9cd99ec2ac9eb78ec363002..0b73314988042835ea5a96c06e3af45acdfc77ac 100644 (file)
--- a/test/recipes/03-test_internal_bn.t
+++ b/test/recipes/03-test_internal_bn.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/test/recipes/03-test_internal_rsa_sp800_56b.t b/test/recipes/03-test_internal_rsa_sp800_56b.t
index 2f5e003492869cec8640e94d8d339729797fee40..8a379908fce69740082b0a5b54272249e15d216c 100644 (file)
--- a/test/recipes/03-test_internal_rsa_sp800_56b.t
+++ b/test/recipes/03-test_internal_rsa_sp800_56b.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/test/recipes/20-test_kdf.t b/test/recipes/20-test_kdf.t
index a03f6997b4f5a8d3af0b467c8100ac6e42b86bc3..b308ae6d6bc6fdfbcbb554491733fda4ab2113e7 100755 (executable)
--- a/test/recipes/20-test_kdf.t
+++ b/test/recipes/20-test_kdf.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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

diff --git a/test/recipes/20-test_mac.t b/test/recipes/20-test_mac.t
index 6a2c094a0f70a439eaca4380a67fc6e22b936f98..cfca431fcc20cfadbf34fb79156f9ee712314e78 100644 (file)
--- a/test/recipes/20-test_mac.t
+++ b/test/recipes/20-test_mac.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/test/recipes/30-test_evp_data/evpaessiv.txt b/test/recipes/30-test_evp_data/evpaessiv.txt
index 54199183526f9f77fc2862eabe9eb8e0ba685a44..022aa33281b5910867862ebd32abe8feb7e9abab 100644 (file)
--- a/test/recipes/30-test_evp_data/evpaessiv.txt
+++ b/test/recipes/30-test_evp_data/evpaessiv.txt
@@ -1,7 +1,7 @@
 #
 # Copyright 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/test/recipes/90-test_bio_memleak.t b/test/recipes/90-test_bio_memleak.t
index 93f7f928a73ea2578a813411b7c2ad8ffb9fb252..061e5460ad1723f4016e5c8e953e2e3b447d261c 100644 (file)
--- a/test/recipes/90-test_bio_memleak.t
+++ b/test/recipes/90-test_bio_memleak.t
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c
index b9286557940d9c46da5f4b552a17fd763e718142..bb14887e98ade29dd57cdde49e05c05fbcf9880a 100644 (file)
--- a/test/rsa_sp800_56b_test.c
+++ b/test/rsa_sp800_56b_test.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

diff --git a/test/ssl-tests/30-extended-master-secret.cnf.in b/test/ssl-tests/30-extended-master-secret.cnf.in
index 84d3e3cfd2fa0d4ce1cdeb031d8b42a3ba5f98a7..281718e6b5501bb52c57e9cbd455a9e96dad3e4f 100644 (file)
--- a/test/ssl-tests/30-extended-master-secret.cnf.in
+++ b/test/ssl-tests/30-extended-master-secret.cnf.in
@@ -1,7 +1,7 @@
 # -*- mode: perl; -*-
 # Copyright 2016-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/test/ssl_ctx_test.c b/test/ssl_ctx_test.c
index 58ca60a788bda6c296c1c8e058598b4175d558d7..9558aebe713a2585eb078d1c545ab46829bafa89 100644 (file)
--- a/test/ssl_ctx_test.c
+++ b/test/ssl_ctx_test.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/test/testutil/options.c b/test/testutil/options.c
index 0b10f7f0d4d0f53ccaa32d34b060a1ad12393ac9..35dfa320c48bcb3505ceb0b60f3e9b22e7b43807 100644 (file)
--- a/test/testutil/options.c
+++ b/test/testutil/options.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/test/testutil/test_options.c b/test/testutil/test_options.c
index 99e6d2940a8c1026d45acd54bc7f8152ded42c65..25774fe0f98f773b9476f43c504525d84eb41e95 100644 (file)
--- a/test/testutil/test_options.c
+++ b/test/testutil/test_options.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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