aboutsummaryrefslogtreecommitdiffstats
path: root/secure/usr.bin/openssl/man/pkcs12.1
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2019-09-10 21:13:37 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2019-09-10 21:13:37 +0000
commitf3f95f0b065dacaab75954c55a9221d72d9c19e4 (patch)
tree335aafb20b0d8c555ca146def61b2c8f0bae6cb7 /secure/usr.bin/openssl/man/pkcs12.1
parent6760dc6f1db0a6dbe23eebce3172a0dae5dd9d56 (diff)
downloadsrc-f3f95f0b065dacaab75954c55a9221d72d9c19e4.tar.gz
src-f3f95f0b065dacaab75954c55a9221d72d9c19e4.zip
MFC: r352191
Merge OpenSSL 1.1.1d.
Notes
Notes: svn path=/stable/12/; revision=352192
Diffstat (limited to 'secure/usr.bin/openssl/man/pkcs12.1')
-rw-r--r--secure/usr.bin/openssl/man/pkcs12.17
1 files changed, 4 insertions, 3 deletions
diff --git a/secure/usr.bin/openssl/man/pkcs12.1 b/secure/usr.bin/openssl/man/pkcs12.1
index eb3dbf848307..3d7d8e3e2b25 100644
--- a/secure/usr.bin/openssl/man/pkcs12.1
+++ b/secure/usr.bin/openssl/man/pkcs12.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "PKCS12 1"
-.TH PKCS12 1 "2019-05-28" "1.1.1c" "OpenSSL"
+.TH PKCS12 1 "2019-09-10" "1.1.1d" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -320,7 +320,8 @@ for this search. If the search fails it is considered a fatal error.
.IX Item "-descert"
Encrypt the certificate using triple \s-1DES,\s0 this may render the PKCS#12
file unreadable by some \*(L"export grade\*(R" software. By default the private
-key is encrypted using triple \s-1DES\s0 and the certificate using 40 bit \s-1RC2.\s0
+key is encrypted using triple \s-1DES\s0 and the certificate using 40 bit \s-1RC2\s0
+unless \s-1RC2\s0 is disabled in which case triple \s-1DES\s0 is used.
.IP "\fB\-keypbe alg\fR, \fB\-certpbe alg\fR" 4
.IX Item "-keypbe alg, -certpbe alg"
These options allow the algorithm used to encrypt the private key and