[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8c47e55ee69500e31e80458682c6e022294cd0be (commit)
      from  c8edb04fac976e653ee441fae66842b4a33ad5b6 (commit)


- Log -----------------------------------------------------------------
commit 8c47e55ee69500e31e80458682c6e022294cd0be
Author: Vladimir Kotal <vladimir.kotal at oracle.com>
Date:   Fri Jul 19 16:01:13 2019 +0200

    mention what happens if OPENSSL_NO_RC2 is defined
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9415)

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

Summary of changes:
 doc/man1/pkcs12.pod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod
index b1b688449e..f18f3b9c3a 100644
--- a/doc/man1/pkcs12.pod
+++ b/doc/man1/pkcs12.pod
@@ -225,7 +225,8 @@ for this search. If the search fails it is considered a fatal error.
 
 Encrypt the certificate using triple DES, this may render the PKCS#12
 file unreadable by some "export grade" software. By default the private
-key is encrypted using triple DES and the certificate using 40 bit RC2.
+key is encrypted using triple DES and the certificate using 40 bit RC2
+unless RC2 is disabled in which case triple DES is used.
 
 =item B<-keypbe alg>, B<-certpbe alg>