[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  48c9c139f498076b72eb723dd967b4169a4ba872 (commit)
      from  5a4aa73076f9bda34c051c3628fb378f42c5257a (commit)


- Log -----------------------------------------------------------------
commit 48c9c139f498076b72eb723dd967b4169a4ba872
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Mon Jan 8 13:42:32 2018 -0500

    Document OPENSSL_ENGINES environment variable
    
    In apps/engine.pod and crypto/ENGINE_add.pod
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4956)
    
    (cherry picked from commit c81c38cb2786dd308256c55ce8d5337e6a3f14ce)

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

Summary of changes:
 doc/apps/engine.pod       | 10 ++++++++++
 doc/crypto/ENGINE_add.pod | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/doc/apps/engine.pod b/doc/apps/engine.pod
index 5f805c1..21f9c2a 100644
--- a/doc/apps/engine.pod
+++ b/doc/apps/engine.pod
@@ -93,6 +93,16 @@ To list the capabilities of the I<rsax> engine:
   [RSA]
  (dynamic) Dynamic engine loading support
 
+=head1 ENVIRONMENT
+
+=over 4
+
+=item B<OPENSSL_ENGINES>
+
+The path to the engines directory.
+
+=back
+
 =head1 COPYRIGHT
 
 Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/crypto/ENGINE_add.pod b/doc/crypto/ENGINE_add.pod
index 37384f6..37efe4a 100644
--- a/doc/crypto/ENGINE_add.pod
+++ b/doc/crypto/ENGINE_add.pod
@@ -589,6 +589,16 @@ might query various ENGINEs to see if they implement "FOO_GET_VENDOR_LOGO_GIF" -
 and ENGINE could therefore decide whether or not to support this "foo"-specific
 extension).
 
+=head1 ENVIRONMENT
+
+=over 4
+
+=item B<OPENSSL_ENGINES>
+
+The path to the engines directory.
+
+=back
+
 =head1 SEE ALSO
 
 L<OPENSSL_init_crypto(3)>, L<RSA_new_method(3)>, L<dsa(3)>, L<dh(3)>, L<rand(3)>