From: Richard Levitte Date: Thu, 6 Dec 2018 13:05:22 +0000 (+0100) Subject: Following the license change, modify the boilerplates in doc/man7/ X-Git-Tag: openssl-3.0.0-alpha1~2768 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3187791ed361adbb7ea04b738a949767d6eb76ed;p=oweals%2Fopenssl.git Following the license change, modify the boilerplates in doc/man7/ [skip ci] Reviewed-by: Matt Caswell (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 12c18a8598..cda3f3f515 100644 --- a/doc/man7/EVP_MAC_CMAC.pod +++ b/doc/man7/EVP_MAC_CMAC.pod @@ -57,7 +57,7 @@ L, L 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. diff --git a/doc/man7/EVP_MAC_GMAC.pod b/doc/man7/EVP_MAC_GMAC.pod index c35d781475..6e4ba1a740 100644 --- a/doc/man7/EVP_MAC_GMAC.pod +++ b/doc/man7/EVP_MAC_GMAC.pod @@ -75,7 +75,7 @@ L, L 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. diff --git a/doc/man7/EVP_MAC_HMAC.pod b/doc/man7/EVP_MAC_HMAC.pod index 3e6f2522ee..b5ae94d442 100644 --- a/doc/man7/EVP_MAC_HMAC.pod +++ b/doc/man7/EVP_MAC_HMAC.pod @@ -63,7 +63,7 @@ L, L 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. diff --git a/doc/man7/EVP_MAC_KMAC.pod b/doc/man7/EVP_MAC_KMAC.pod index 0e6d45be73..4ccaabe6cb 100644 --- a/doc/man7/EVP_MAC_KMAC.pod +++ b/doc/man7/EVP_MAC_KMAC.pod @@ -86,7 +86,7 @@ L, L 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. diff --git a/doc/man7/EVP_MAC_POLY1305.pod b/doc/man7/EVP_MAC_POLY1305.pod index d25e1d5107..89234b74a4 100644 --- a/doc/man7/EVP_MAC_POLY1305.pod +++ b/doc/man7/EVP_MAC_POLY1305.pod @@ -47,7 +47,7 @@ L, L 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. diff --git a/doc/man7/EVP_MAC_SIPHASH.pod b/doc/man7/EVP_MAC_SIPHASH.pod index 0d1349fd47..eeb0cfd148 100644 --- a/doc/man7/EVP_MAC_SIPHASH.pod +++ b/doc/man7/EVP_MAC_SIPHASH.pod @@ -53,7 +53,7 @@ L, L 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. diff --git a/doc/man7/Ed25519.pod b/doc/man7/Ed25519.pod index 3f54217918..12bc64b3f7 100644 --- a/doc/man7/Ed25519.pod +++ b/doc/man7/Ed25519.pod @@ -79,7 +79,7 @@ L, 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. diff --git a/doc/man7/RAND.pod b/doc/man7/RAND.pod index 971b3cdb16..3d4766694e 100644 --- a/doc/man7/RAND.pod +++ b/doc/man7/RAND.pod @@ -73,7 +73,7 @@ L 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. diff --git a/doc/man7/RAND_DRBG.pod b/doc/man7/RAND_DRBG.pod index ba457f0504..f3fa605ee6 100644 --- a/doc/man7/RAND_DRBG.pod +++ b/doc/man7/RAND_DRBG.pod @@ -293,7 +293,7 @@ L, 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. diff --git a/doc/man7/RSA-PSS.pod b/doc/man7/RSA-PSS.pod index 29775d8621..a378121ac1 100644 --- a/doc/man7/RSA-PSS.pod +++ b/doc/man7/RSA-PSS.pod @@ -53,7 +53,7 @@ L 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. diff --git a/doc/man7/SM2.pod b/doc/man7/SM2.pod index 029dc736cb..05c8a345fd 100644 --- a/doc/man7/SM2.pod +++ b/doc/man7/SM2.pod @@ -71,7 +71,7 @@ L 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. diff --git a/doc/man7/X25519.pod b/doc/man7/X25519.pod index 7cb6ff6b3b..7f0bdff276 100644 --- a/doc/man7/X25519.pod +++ b/doc/man7/X25519.pod @@ -66,7 +66,7 @@ L 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. diff --git a/doc/man7/bio.pod b/doc/man7/bio.pod index 45ef2f7704..18f1125045 100644 --- a/doc/man7/bio.pod +++ b/doc/man7/bio.pod @@ -78,7 +78,7 @@ L 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. diff --git a/doc/man7/crypto.pod b/doc/man7/crypto.pod index e08c5c8aec..0e8008b332 100644 --- a/doc/man7/crypto.pod +++ b/doc/man7/crypto.pod @@ -52,7 +52,7 @@ L, L 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. diff --git a/doc/man7/ct.pod b/doc/man7/ct.pod index 355204d2a6..9811de3a5a 100644 --- 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. diff --git a/doc/man7/des_modes.pod b/doc/man7/des_modes.pod index f7415d77f4..34f05b3d5d 100644 --- a/doc/man7/des_modes.pod +++ b/doc/man7/des_modes.pod @@ -250,7 +250,7 @@ L, L 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. diff --git a/doc/man7/evp.pod b/doc/man7/evp.pod index e493dacd23..3e810f3d3f 100644 --- a/doc/man7/evp.pod +++ b/doc/man7/evp.pod @@ -106,7 +106,7 @@ L 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. diff --git a/doc/man7/openssl_user_macros.pod.in b/doc/man7/openssl_user_macros.pod.in index dc554b70f4..30b8121e44 100644 --- 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. diff --git a/doc/man7/ossl_store-file.pod b/doc/man7/ossl_store-file.pod index 996043b0fb..c517503eb7 100644 --- a/doc/man7/ossl_store-file.pod +++ b/doc/man7/ossl_store-file.pod @@ -63,7 +63,7 @@ L, L 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. diff --git a/doc/man7/ossl_store.pod b/doc/man7/ossl_store.pod index 6e75abd314..08cb76026a 100644 --- a/doc/man7/ossl_store.pod +++ b/doc/man7/ossl_store.pod @@ -79,7 +79,7 @@ L 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. diff --git a/doc/man7/passphrase-encoding.pod b/doc/man7/passphrase-encoding.pod index 6810844526..7f2c2a2f80 100644 --- a/doc/man7/passphrase-encoding.pod +++ b/doc/man7/passphrase-encoding.pod @@ -172,7 +172,7 @@ L 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. diff --git a/doc/man7/scrypt.pod b/doc/man7/scrypt.pod index 94ff3ab53f..eabad5b7b0 100644 --- a/doc/man7/scrypt.pod +++ b/doc/man7/scrypt.pod @@ -107,7 +107,7 @@ L 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. diff --git a/doc/man7/ssl.pod b/doc/man7/ssl.pod index 60b1834f98..b53cdb2baf 100644 --- 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. diff --git a/doc/man7/x509.pod b/doc/man7/x509.pod index 065dcb14fb..2d4edaa285 100644 --- a/doc/man7/x509.pod +++ b/doc/man7/x509.pod @@ -65,7 +65,7 @@ L 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.