Following the license change, modify the boilerplates in doc/man7/

[skip ci]

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7831)

diff --git a/doc/man7/EVP_MAC_CMAC.pod b/doc/man7/EVP_MAC_CMAC.pod
index 12c18a8598d2c5a82d4a2a8e1b1c4cac26c5b786..cda3f3f5154d2637c5596a08e1e028b5b57e5bdc 100644 (file)
--- a/doc/man7/EVP_MAC_CMAC.pod
+++ b/doc/man7/EVP_MAC_CMAC.pod
@@ -57,7 +57,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_MAC_GMAC.pod b/doc/man7/EVP_MAC_GMAC.pod
index c35d781475c26da301c98198b326dbf38e2685a2..6e4ba1a740cff24cd93e77c0c0e22d22665a920f 100644 (file)
--- a/doc/man7/EVP_MAC_GMAC.pod
+++ b/doc/man7/EVP_MAC_GMAC.pod
@@ -75,7 +75,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_MAC_HMAC.pod b/doc/man7/EVP_MAC_HMAC.pod
index 3e6f2522eee36097190855468f40f3867806e05d..b5ae94d442679779686be460ca2ed5bece824561 100644 (file)
--- a/doc/man7/EVP_MAC_HMAC.pod
+++ b/doc/man7/EVP_MAC_HMAC.pod
@@ -63,7 +63,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_MAC_KMAC.pod b/doc/man7/EVP_MAC_KMAC.pod
index 0e6d45be73607cc695f9a80bff6406c9ddb43491..4ccaabe6cb09fc631ddec19cef564702f6fd2249 100644 (file)
--- a/doc/man7/EVP_MAC_KMAC.pod
+++ b/doc/man7/EVP_MAC_KMAC.pod
@@ -86,7 +86,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_MAC_POLY1305.pod b/doc/man7/EVP_MAC_POLY1305.pod
index d25e1d51076f916959e2d7ed93e65d831afed1dd..89234b74a4168ff0db7c331611476d0cb890ab0c 100644 (file)
--- a/doc/man7/EVP_MAC_POLY1305.pod
+++ b/doc/man7/EVP_MAC_POLY1305.pod
@@ -47,7 +47,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/EVP_MAC_SIPHASH.pod b/doc/man7/EVP_MAC_SIPHASH.pod
index 0d1349fd47d741914b8379349b1ae70006ac8a34..eeb0cfd14801ccb84ac249c0aab7c1cc47ca816a 100644 (file)
--- a/doc/man7/EVP_MAC_SIPHASH.pod
+++ b/doc/man7/EVP_MAC_SIPHASH.pod
@@ -53,7 +53,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/Ed25519.pod b/doc/man7/Ed25519.pod
index 3f54217918a7159a592c9fb1fb0a58a01691b296..12bc64b3f7aea7d1d26f0b900b2648416913b4af 100644 (file)
--- a/doc/man7/Ed25519.pod
+++ b/doc/man7/Ed25519.pod
@@ -79,7 +79,7 @@ L<EVP_DigestVerifyInit(3)>,
 
 Copyright 2017-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/RAND.pod b/doc/man7/RAND.pod
index 971b3cdb161287a62c6b64191da579ddc8fa53d6..3d4766694eae0026ee1017a20e587aee3546a796 100644 (file)
--- a/doc/man7/RAND.pod
+++ b/doc/man7/RAND.pod
@@ -73,7 +73,7 @@ L<RAND_DRBG(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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/RAND_DRBG.pod b/doc/man7/RAND_DRBG.pod
index ba457f050483e58c35212830db8251462a205ff6..f3fa605ee6f32eed3e485a4e1606437ec6e5a992 100644 (file)
--- a/doc/man7/RAND_DRBG.pod
+++ b/doc/man7/RAND_DRBG.pod
@@ -293,7 +293,7 @@ L<RAND(7)>,
 
 Copyright 2017-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/RSA-PSS.pod b/doc/man7/RSA-PSS.pod
index 29775d86210398c305e32183c532e31b6c26785c..a378121ac1631db905db95e4d025241e30b2bee7 100644 (file)
--- a/doc/man7/RSA-PSS.pod
+++ b/doc/man7/RSA-PSS.pod
@@ -53,7 +53,7 @@ L<EVP_PKEY_derive(3)>
 
 Copyright 2017-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/SM2.pod b/doc/man7/SM2.pod
index 029dc736cbd5dcf793c138201473a8561bd0384f..05c8a345fde4450354c51b53b3d854e4c0be5c7b 100644 (file)
--- a/doc/man7/SM2.pod
+++ b/doc/man7/SM2.pod
@@ -71,7 +71,7 @@ L<EVP_MD_CTX_set_pkey_ctx(3)>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/X25519.pod b/doc/man7/X25519.pod
index 7cb6ff6b3bed09927f7cedb9570ae6ec3972c489..7f0bdff27634601989cc123fa874e388776d7043 100644 (file)
--- a/doc/man7/X25519.pod
+++ b/doc/man7/X25519.pod
@@ -66,7 +66,7 @@ L<EVP_PKEY_derive_set_peer(3)>
 
 Copyright 2017-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/bio.pod b/doc/man7/bio.pod
index 45ef2f77041daff9b44a3e6603db59c4df3eb30c..18f1125045ccf460d9ab1a2988928d5e74ee7856 100644 (file)
--- a/doc/man7/bio.pod
+++ b/doc/man7/bio.pod
@@ -78,7 +78,7 @@ L<BIO_should_retry(3)>
 
 Copyright 2000-2017 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/crypto.pod b/doc/man7/crypto.pod
index e08c5c8aec13e6d1c654698661ffa8222288c9b2..0e8008b33251e6c099228366a051502c98e7e0a7 100644 (file)
--- a/doc/man7/crypto.pod
+++ b/doc/man7/crypto.pod
@@ -52,7 +52,7 @@ L<openssl(1)>, L<ssl(7)>
 
 Copyright 2000-2016 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/ct.pod b/doc/man7/ct.pod
index 355204d2a632cd5dcc6d56b4cb0b939c0367396d..9811de3a5a90d36871e85efa44c67e5cdc0bf82d 100644 (file)
--- a/doc/man7/ct.pod
+++ b/doc/man7/ct.pod
@@ -45,7 +45,7 @@ This library was added in OpenSSL 1.1.0.
 
 Copyright 2016-2017 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/des_modes.pod b/doc/man7/des_modes.pod
index f7415d77f4850978fd029be9db56f906d6e99b78..34f05b3d5d70eeac70175fa37f38958b07f6870a 100644 (file)
--- a/doc/man7/des_modes.pod
+++ b/doc/man7/des_modes.pod
@@ -250,7 +250,7 @@ L<BF_encrypt(3)>, L<DES_crypt(3)>
 
 Copyright 2000-2017 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.pod b/doc/man7/evp.pod
index e493dacd23135e198370bbac2623514a611af85a..3e810f3d3fb96383b1e734b5bed1d2c571bad9de 100644 (file)
--- a/doc/man7/evp.pod
+++ b/doc/man7/evp.pod
@@ -106,7 +106,7 @@ L<ENGINE_by_id(3)>
 
 Copyright 2000-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/openssl_user_macros.pod.in b/doc/man7/openssl_user_macros.pod.in
index dc554b70f4d97c4c55b2c88bcf5dffb47f2f0e1e..30b8121e44c95765f045df6508cd7e16fba36209 100644 (file)
--- a/doc/man7/openssl_user_macros.pod.in
+++ b/doc/man7/openssl_user_macros.pod.in
@@ -89,7 +89,7 @@ C<{- join('', map { my @x = split /=/,$_; $x[1] }
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/ossl_store-file.pod b/doc/man7/ossl_store-file.pod
index 996043b0fb853c69cf839f78e12a173dddb4e1fb..c517503eb7a77c34b184c0ac1357c3819f604515 100644 (file)
--- a/doc/man7/ossl_store-file.pod
+++ b/doc/man7/ossl_store-file.pod
@@ -63,7 +63,7 @@ L<ossl_store(7)>, L<passphrase-encoding(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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/ossl_store.pod b/doc/man7/ossl_store.pod
index 6e75abd314b70380e7031cd7d0489aeb6a51368a..08cb76026a89a9635deb5b34f2aaed9b7c65f6d6 100644 (file)
--- a/doc/man7/ossl_store.pod
+++ b/doc/man7/ossl_store.pod
@@ -79,7 +79,7 @@ L<OSSL_STORE_SEARCH(3)>
 
 Copyright 2016-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/passphrase-encoding.pod b/doc/man7/passphrase-encoding.pod
index 68108445269b7a89fdeba8d80a9e2c3a7e441881..7f2c2a2f80e7ec95eb6171d827a165f0878d2d2d 100644 (file)
--- a/doc/man7/passphrase-encoding.pod
+++ b/doc/man7/passphrase-encoding.pod
@@ -172,7 +172,7 @@ L<d2i_PKCS8PrivateKey_bio(3)>
 
 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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/scrypt.pod b/doc/man7/scrypt.pod
index 94ff3ab53fce79dcadc9c7a455cf62cdd4006a39..eabad5b7b02893c132b211efb75f4d5f793a945c 100644 (file)
--- a/doc/man7/scrypt.pod
+++ b/doc/man7/scrypt.pod
@@ -107,7 +107,7 @@ L<EVP_PKEY_derive(3)>
 
 Copyright 2017-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/ssl.pod b/doc/man7/ssl.pod
index 60b1834f9887116cd0ae285025bd6ffd33fb203d..b53cdb2baf57353f4a262824f068dfc6c0ac716b 100644 (file)
--- a/doc/man7/ssl.pod
+++ b/doc/man7/ssl.pod
@@ -875,7 +875,7 @@ OpenSSL 1.1.0.
 
 Copyright 2000-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man7/x509.pod b/doc/man7/x509.pod
index 065dcb14fbeb87b292b31b2ed3446bfc24194d84..2d4edaa285bc8db8310957c84140ec014069b0c0 100644 (file)
--- a/doc/man7/x509.pod
+++ b/doc/man7/x509.pod
@@ -65,7 +65,7 @@ L<crypto(7)>
 
 Copyright 2003-2017 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>.