The branch OpenSSL_1_1_1-stable has been updated via 85171a929d53fdac4b0da97eb2f4d85ff0ecd986 (commit) from c762f5fa35ce7c2b9edf5bdbe9efd5d45280d35f (commit)
- Log ----------------------------------------------------------------- commit 85171a929d53fdac4b0da97eb2f4d85ff0ecd986 Author: Vladimir Kotal <vladimir.ko...@oracle.com> Date: Fri Jul 19 16:01:13 2019 +0200 mention what happens if OPENSSL_NO_RC2 is defined Reviewed-by: Tomas Mraz <tm...@fedoraproject.org> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9415) (cherry picked from commit 8c47e55ee69500e31e80458682c6e022294cd0be) ----------------------------------------------------------------------- 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 6f890c120f..da887a4699 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>