[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu Dec 6 14:36:09 UTC 2018
The branch master has been updated
via 3187791ed361adbb7ea04b738a949767d6eb76ed (commit)
from b1e979aeec8238ceddc20fc3f7487649fef4ca07 (commit)
- Log -----------------------------------------------------------------
commit 3187791ed361adbb7ea04b738a949767d6eb76ed
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Dec 6 14:05:22 2018 +0100
Following the license change, modify the boilerplates in doc/man7/
[skip ci]
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7831)
-----------------------------------------------------------------------
Summary of changes:
doc/man7/EVP_MAC_CMAC.pod | 2 +-
doc/man7/EVP_MAC_GMAC.pod | 2 +-
doc/man7/EVP_MAC_HMAC.pod | 2 +-
doc/man7/EVP_MAC_KMAC.pod | 2 +-
doc/man7/EVP_MAC_POLY1305.pod | 2 +-
doc/man7/EVP_MAC_SIPHASH.pod | 2 +-
doc/man7/Ed25519.pod | 2 +-
doc/man7/RAND.pod | 2 +-
doc/man7/RAND_DRBG.pod | 2 +-
doc/man7/RSA-PSS.pod | 2 +-
doc/man7/SM2.pod | 2 +-
doc/man7/X25519.pod | 2 +-
doc/man7/bio.pod | 2 +-
doc/man7/crypto.pod | 2 +-
doc/man7/ct.pod | 2 +-
doc/man7/des_modes.pod | 2 +-
doc/man7/evp.pod | 2 +-
doc/man7/openssl_user_macros.pod.in | 2 +-
doc/man7/ossl_store-file.pod | 2 +-
doc/man7/ossl_store.pod | 2 +-
doc/man7/passphrase-encoding.pod | 2 +-
doc/man7/scrypt.pod | 2 +-
doc/man7/ssl.pod | 2 +-
doc/man7/x509.pod | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/doc/man7/EVP_MAC_CMAC.pod b/doc/man7/EVP_MAC_CMAC.pod
index 12c18a8..cda3f3f 100644
--- 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 c35d781..6e4ba1a 100644
--- 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 3e6f252..b5ae94d 100644
--- 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 0e6d45b..4ccaabe 100644
--- 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 d25e1d5..89234b7 100644
--- 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 0d1349f..eeb0cfd 100644
--- 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 3f54217..12bc64b 100644
--- 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 971b3cd..3d47666 100644
--- 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 ba457f0..f3fa605 100644
--- 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 29775d8..a378121 100644
--- 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 029dc73..05c8a34 100644
--- 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 7cb6ff6..7f0bdff 100644
--- 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 45ef2f7..18f1125 100644
--- 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 e08c5c8..0e8008b 100644
--- 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 355204d..9811de3 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<https://www.openssl.org/source/license.html>.
diff --git a/doc/man7/des_modes.pod b/doc/man7/des_modes.pod
index f7415d7..34f05b3 100644
--- 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 e493dac..3e810f3 100644
--- 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 dc554b7..30b8121 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<https://www.openssl.org/source/license.html>.
diff --git a/doc/man7/ossl_store-file.pod b/doc/man7/ossl_store-file.pod
index 996043b..c517503 100644
--- 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 6e75abd..08cb760 100644
--- 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 6810844..7f2c2a2 100644
--- 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 94ff3ab..eabad5b 100644
--- 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 60b1834..b53cdb2 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<https://www.openssl.org/source/license.html>.
diff --git a/doc/man7/x509.pod b/doc/man7/x509.pod
index 065dcb1..2d4edaa 100644
--- 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>.
More information about the openssl-commits
mailing list