[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  7f6496275157f8e40f544f75a223c2c0dc6b389e (commit)
      from  7cc5738a561933e38ad0e724f4df7b503c3c8e73 (commit)


- Log -----------------------------------------------------------------
commit 7f6496275157f8e40f544f75a223c2c0dc6b389e
Author: Pauli <pauli at openssl.org>
Date:   Tue Nov 16 10:31:44 2021 +1000

    Add documentation for some of the missing environment variables.
    
    Where document already exists, it has been linked to.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/17044)

-----------------------------------------------------------------------

Summary of changes:
 doc/man7/openssl-env.pod | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/man7/openssl-env.pod b/doc/man7/openssl-env.pod
index f691191b6f..a2443d54d8 100644
--- a/doc/man7/openssl-env.pod
+++ b/doc/man7/openssl-env.pod
@@ -74,6 +74,19 @@ See L<SSL_CTX_load_verify_locations(3)>.
 
 Additional arguments for the L<tsget(1)> command.
 
+=item B<OPENSSL_ia32cap>, B<OPENSSL_sparcv9cap>, B<OPENSSL_ppccap>, B<OPENSSL_armcap>, B<OPENSSL_s390xcap>
+
+OpenSSL supports a number of different algorithm implementations for
+various machines and, by default, it determines which to use based on the
+processor capabilities and run time feature enquiry.  These environment
+variables can be used to exert more control over this selection process.
+See L<OPENSSL_ia32cap(3)>, L<OPENSSL_s390xcap(3)>.
+
+=item B<NO_PROXY>, B<HTTPS_PROXY>, B<HTTP_PROXY>
+
+Specify a proxy hostname.
+See L<OSSL_HTTP_parse_url(3)>.
+
 =back
 
 =head1 COPYRIGHT