From: Tomas Mraz Date: Fri, 11 Feb 2022 08:44:52 +0000 (+0100) Subject: Apply the correct Apache v2 license X-Git-Tag: openssl-3.2.0-alpha1~2944 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7585073892af9cffd28b7b5872c2b102b99af807;p=thirdparty%2Fopenssl.git Apply the correct Apache v2 license There were still a few files mentioning the old OpenSSL license. Fixes #17684 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/17686) --- diff --git a/crypto/ec/asm/ecp_nistp521-ppc64.pl b/crypto/ec/asm/ecp_nistp521-ppc64.pl index e97d803d26f..4260e24a1f5 100755 --- a/crypto/ec/asm/ecp_nistp521-ppc64.pl +++ b/crypto/ec/asm/ecp_nistp521-ppc64.pl @@ -1,7 +1,7 @@ #! /usr/bin/env perl -# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2021-2022 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/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in index 3bae43cc356..705baf1dd61 100644 --- a/doc/man1/openssl-cmp.pod.in +++ b/doc/man1/openssl-cmp.pod.in @@ -1239,9 +1239,9 @@ The B<-engine option> was deprecated in OpenSSL 3.0. =head1 COPYRIGHT -Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2007-2022 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/test/dane-cross.in b/test/dane-cross.in index 81252a110e9..63c37fbf330 100644 --- a/test/dane-cross.in +++ b/test/dane-cross.in @@ -1,6 +1,6 @@ -# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2022 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_sm3.t b/test/recipes/03-test_internal_sm3.t index 9cda58d66ee..574a7c41212 100644 --- a/test/recipes/03-test_internal_sm3.t +++ b/test/recipes/03-test_internal_sm3.t @@ -1,8 +1,8 @@ #! /usr/bin/env perl -# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved. # Copyright 2021 [UnionTech](https://www.uniontech.com). 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/sm3_internal_test.c b/test/sm3_internal_test.c index 1497f8476fc..7680d0242ec 100644 --- a/test/sm3_internal_test.c +++ b/test/sm3_internal_test.c @@ -2,7 +2,7 @@ * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2021 UnionTech. All Rights Reserved. * - * Licensed under the Apche License 2.0 (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