aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShourya Shukla <shouryashukla.oo@gmail.com>2020-04-27 10:29:50 +0530
committerRichard Levitte <levitte@openssl.org>2020-04-29 15:27:22 +0200
commita6ed19dc9a9fc263a3b2e6b990e2face28a1a70d (patch)
treec1dc5c37deab6173f91c51f52dc1df4afdd73252
parent5e427a435b3b1db0fb0626b26e031f71bde65f7a (diff)
downloadopenssl-a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d.zip
openssl-a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d.tar.gz
openssl-a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d.tar.bz2
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)
-rw-r--r--apps/include/apps_ui.h2
-rw-r--r--apps/include/fmt.h2
-rw-r--r--apps/include/opt.h2
-rw-r--r--apps/kdf.c2
-rw-r--r--apps/lib/apps_ui.c2
-rw-r--r--apps/lib/fmt.c2
-rw-r--r--apps/mac.c2
-rw-r--r--crypto/bn/bn_rsa_fips186_4.c2
-rw-r--r--crypto/modes/siv128.c2
-rw-r--r--crypto/perlasm/s390x.pm2
-rw-r--r--crypto/perlasm/x86_64-support.pl2
-rw-r--r--crypto/rand/rand_vxworks.c2
-rw-r--r--crypto/rsa/rsa_sp800_56b_check.c2
-rw-r--r--crypto/rsa/rsa_sp800_56b_gen.c2
-rw-r--r--doc/man1/openssl-fipsinstall.pod.in2
-rw-r--r--doc/man1/openssl-kdf.pod.in2
-rw-r--r--doc/man1/openssl-mac.pod.in2
-rw-r--r--doc/man1/openssl-rehash.pod.in2
-rw-r--r--doc/man3/SSL_set_async_callback.pod2
-rw-r--r--doc/man7/EVP_KDF-KRB5KDF.pod2
-rw-r--r--doc/man7/EVP_KDF-SSHKDF.pod2
-rw-r--r--include/openssl/self_test.h2
-rw-r--r--providers/fips/self_test.c2
-rw-r--r--providers/fips/self_test.h2
-rw-r--r--providers/fips/self_test_data.inc2
-rw-r--r--providers/fips/self_test_kats.c2
-rw-r--r--providers/implementations/kdfs/krb5kdf.c2
-rw-r--r--providers/implementations/kdfs/sshkdf.c2
-rw-r--r--test/bio_memleak_test.c2
-rw-r--r--test/bn_internal_test.c2
-rw-r--r--test/cmsapitest.c2
-rw-r--r--test/drbg_extra_test.c2
-rw-r--r--test/drbg_extra_test.h2
-rw-r--r--test/recipes/03-test_internal_bn.t2
-rw-r--r--test/recipes/03-test_internal_rsa_sp800_56b.t2
-rwxr-xr-xtest/recipes/20-test_kdf.t2
-rw-r--r--test/recipes/20-test_mac.t2
-rw-r--r--test/recipes/30-test_evp_data/evpaessiv.txt2
-rw-r--r--test/recipes/90-test_bio_memleak.t2
-rw-r--r--test/rsa_sp800_56b_test.c2
-rw-r--r--test/ssl-tests/30-extended-master-secret.cnf.in2
-rw-r--r--test/ssl_ctx_test.c2
-rw-r--r--test/testutil/options.c2
-rw-r--r--test/testutil/test_options.c2
44 files changed, 44 insertions, 44 deletions
diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 55a6b51..8c6a481 100644
--- 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 01acf86..ef18fc0 100644
--- 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 1bf4621..b4753dc 100644
--- 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 9a69682..8d11807 100644
--- 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 bcfe555..ae0f5f2 100644
--- 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 5cb4c04..2cdd55e 100644
--- 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 07a6e91..30f0daa 100644
--- 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 492eb29..624829c 100644
--- 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 7121410..b214011 100644
--- 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 b2fea80..af8ab6a 100644
--- 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 66aeaed..0bacb71 100644
--- 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 8a891d2..427d50d 100644
--- 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 6625021..7cf6241 100644
--- 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 6c30a96..c4c7c08 100644
--- 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 74b2334..1d1cdea 100644
--- 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 4c0825c..9c58532 100644
--- 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 2157c75..4c9cc3b 100644
--- 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 c98f89e..380ad6d 100644
--- 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 3fa05df..4b808dc 100644
--- 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 c75340a..071cb4e 100644
--- 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 1f7f3a5..a935816 100644
--- 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 bfc459e..ff6e1b8 100644
--- 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 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
diff --git a/test/bio_memleak_test.c b/test/bio_memleak_test.c
index 49ee712..beadd79 100644
--- 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 f3e8749..31d51cb 100644
--- 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 2ac330a..697daa8 100644
--- 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 642f744..8d7b8fb 100644
--- 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 4c77157..5153daf 100644
--- 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 8aed18a..0b73314 100644
--- 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 2f5e003..8a37990 100644
--- 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 a03f699..b308ae6 100755
--- 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 6a2c094..cfca431 100644
--- 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 5419918..022aa33 100644
--- 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 93f7f92..061e546 100644
--- 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 b928655..bb14887 100644
--- 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 84d3e3c..281718e 100644
--- 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 58ca60a..9558aeb 100644
--- 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 0b10f7f..35dfa32 100644
--- 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 99e6d29..25774fe 100644
--- 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