diff options
| author | Shourya Shukla <shouryashukla.oo@gmail.com> | 2020-04-27 10:29:50 +0530 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-29 15:27:22 +0200 |
| commit | a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d (patch) | |
| tree | c1dc5c37deab6173f91c51f52dc1df4afdd73252 /doc/man1 | |
| parent | 5e427a435b3b1db0fb0626b26e031f71bde65f7a (diff) | |
| download | openssl-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)
Diffstat (limited to 'doc/man1')
| -rw-r--r-- | doc/man1/openssl-fipsinstall.pod.in | 2 | ||||
| -rw-r--r-- | doc/man1/openssl-kdf.pod.in | 2 | ||||
| -rw-r--r-- | doc/man1/openssl-mac.pod.in | 2 | ||||
| -rw-r--r-- | doc/man1/openssl-rehash.pod.in | 2 |
4 files changed, 4 insertions, 4 deletions
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 |