[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c81c38cb2786dd308256c55ce8d5337e6a3f14ce (commit)
      from  1a49ff5a4ff290b988cd898b41c8504749a468fc (commit)


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

    Document OPENSSL_ENGINES environment variable
    
    In man1/engine.pod and man3/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)

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

Summary of changes:
 doc/man1/engine.pod     | 14 ++++++++++++++
 doc/man3/ENGINE_add.pod | 13 ++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/doc/man1/engine.pod b/doc/man1/engine.pod
index 506c917..1c96339 100644
--- a/doc/man1/engine.pod
+++ b/doc/man1/engine.pod
@@ -93,6 +93,20 @@ 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 SEE ALSO
+
+L<config(5)>
+
 =head1 COPYRIGHT
 
 Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man3/ENGINE_add.pod b/doc/man3/ENGINE_add.pod
index bac325f..8f5355d 100644
--- a/doc/man3/ENGINE_add.pod
+++ b/doc/man3/ENGINE_add.pod
@@ -561,9 +561,20 @@ 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_new(3)>, L<DH_new(3)>, L<RAND_bytes(3)>
+L<OPENSSL_init_crypto(3)>, L<RSA_new_method(3)>, L<DSA_new(3)>, L<DH_new(3)>,
+L<RAND_bytes(3)>, L<config(5)>
 
 =head1 HISTORY