From a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d Mon Sep 17 00:00:00 2001 From: Shourya Shukla Date: Mon, 27 Apr 2020 10:29:50 +0530 Subject: [PATCH] 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) --- apps/include/apps_ui.h | 2 +- apps/include/fmt.h | 2 +- apps/include/opt.h | 2 +- apps/kdf.c | 2 +- apps/lib/apps_ui.c | 2 +- apps/lib/fmt.c | 2 +- apps/mac.c | 2 +- crypto/bn/bn_rsa_fips186_4.c | 2 +- crypto/modes/siv128.c | 2 +- crypto/perlasm/s390x.pm | 2 +- crypto/perlasm/x86_64-support.pl | 2 +- crypto/rand/rand_vxworks.c | 2 +- crypto/rsa/rsa_sp800_56b_check.c | 2 +- crypto/rsa/rsa_sp800_56b_gen.c | 2 +- doc/man1/openssl-fipsinstall.pod.in | 2 +- doc/man1/openssl-kdf.pod.in | 2 +- doc/man1/openssl-mac.pod.in | 2 +- doc/man1/openssl-rehash.pod.in | 2 +- doc/man3/SSL_set_async_callback.pod | 2 +- doc/man7/EVP_KDF-KRB5KDF.pod | 2 +- doc/man7/EVP_KDF-SSHKDF.pod | 2 +- include/openssl/self_test.h | 2 +- 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 +- test/bio_memleak_test.c | 2 +- test/bn_internal_test.c | 2 +- test/cmsapitest.c | 2 +- test/drbg_extra_test.c | 2 +- test/drbg_extra_test.h | 2 +- test/recipes/03-test_internal_bn.t | 2 +- test/recipes/03-test_internal_rsa_sp800_56b.t | 2 +- test/recipes/20-test_kdf.t | 2 +- test/recipes/20-test_mac.t | 2 +- test/recipes/30-test_evp_data/evpaessiv.txt | 2 +- test/recipes/90-test_bio_memleak.t | 2 +- test/rsa_sp800_56b_test.c | 2 +- test/ssl-tests/30-extended-master-secret.cnf.in | 2 +- test/ssl_ctx_test.c | 2 +- test/testutil/options.c | 2 +- test/testutil/test_options.c | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h index 55a6b510a4..8c6a48113d 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 01acf86694..ef18fc0dd0 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 1bf46215d5..b4753dc42e 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 9a69682b57..8d11807f5f 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 bcfe555478..ae0f5f217c 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 5cb4c041a8..2cdd55e924 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 07a6e915e3..30f0daabcc 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 492eb297c3..624829c684 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 712141032d..b214011f34 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 b2fea8012f..af8ab6ab7d 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 66aeaedab4..0bacb71864 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 8a891d2fb8..427d50d263 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 662502190e..7cf6241dee 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 6c30a967b8..c4c7c08e94 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 74b23341e3..1d1cdea715 100644 --- a/doc/man1/openssl-fipsinstall.pod.in +++ b/doc/man1/openssl-fipsinstall.pod.in @@ -168,7 +168,7 @@ L 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. diff --git a/doc/man1/openssl-kdf.pod.in b/doc/man1/openssl-kdf.pod.in index 4c0825c9b3..9c585325ba 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. diff --git a/doc/man1/openssl-mac.pod.in b/doc/man1/openssl-mac.pod.in index 2157c75cf7..4c9cc3bc31 100644 --- a/doc/man1/openssl-mac.pod.in +++ b/doc/man1/openssl-mac.pod.in @@ -158,7 +158,7 @@ L 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. diff --git a/doc/man1/openssl-rehash.pod.in b/doc/man1/openssl-rehash.pod.in index c98f89eb48..380ad6dd2a 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 3fa05dff3a..4b808dc33a 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. diff --git a/doc/man7/EVP_KDF-KRB5KDF.pod b/doc/man7/EVP_KDF-KRB5KDF.pod index c75340ac99..071cb4e8e4 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. diff --git a/doc/man7/EVP_KDF-SSHKDF.pod b/doc/man7/EVP_KDF-SSHKDF.pod index 1f7f3a55ec..a9358168c6 100644 --- a/doc/man7/EVP_KDF-SSHKDF.pod +++ b/doc/man7/EVP_KDF-SSHKDF.pod @@ -150,7 +150,7 @@ L 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. diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h index bfc459e037..ff6e1b8e08 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 ccc01bd3bd..5c69dfa691 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 7367e96a31..ad693aa9a2 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 43de2aa3f2..431e52467c 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 f02dbcd85c..5ef4474a1c 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 59711eef96..0a97b8e3f9 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 508fb6350a..077e451562 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 49ee712a49..beadd79c43 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 f3e874960d..31d51cb804 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 2ac330a8fa..697daa814d 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 642f744932..8d7b8fbf8f 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 4c771573d1..5153dafe23 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 8aed18ac30..0b73314988 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 2f5e003492..8a379908fc 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 a03f6997b4..b308ae6d6b 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 6a2c094a0f..cfca431fcc 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 5419918352..022aa33281 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 93f7f928a7..061e5460ad 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 b928655794..bb14887e98 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 84d3e3cfd2..281718e6b5 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 58ca60a788..9558aebe71 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 0b10f7f0d4..35dfa320c4 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 99e6d2940a..25774fe0f9 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 -- 2.39.2