[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  dee8eded24fb814e6f1be64b3e8505a3b008a2f9 (commit)
      from  acb934ff55e69d5cc3025d9ba20f4916089d1b83 (commit)


- Log -----------------------------------------------------------------
commit dee8eded24fb814e6f1be64b3e8505a3b008a2f9
Author: Pali Rohár <pali at kernel.org>
Date:   Mon Jul 13 00:52:26 2020 +0200

    Document pkcs12 alg NONE
    
    To generate unencrypted PKCS#12 file it is needed to use options: -keypbe NONE -certpbe NONE
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/12426)

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

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

diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in
index c006396260..adcdc7c1a4 100644
--- a/doc/man1/openssl-pkcs12.pod.in
+++ b/doc/man1/openssl-pkcs12.pod.in
@@ -275,6 +275,8 @@ can be used (see L</NOTES> section for more information). If a cipher name
 is used with PKCS#5 v2.0. For interoperability reasons it is advisable to only
 use PKCS#12 algorithms.
 
+Special value C<NONE> disables encryption of the private key and certificate.
+
 =item B<-keyex>|B<-keysig>
 
 Specifies that the private key is to be used for key exchange or just signing.