aboutsummaryrefslogtreecommitdiffstats
path: root/secure/usr.bin/openssl/man/pkcs12.1
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-12-03 21:13:35 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-12-03 21:13:35 +0000
commit80815a778ec9d0fc06b0e000c4608da4b4f3a711 (patch)
treeade84397c16fe1b20cb2a441f603826e49c36cf2 /secure/usr.bin/openssl/man/pkcs12.1
parentf0f6270c40f08bdfcc4a7ad439a2e92b6b47b09f (diff)
parent737d7e8d3945c206c037e139055821aa0c64bb8e (diff)
downloadsrc-80815a778ec9d0fc06b0e000c4608da4b4f3a711.tar.gz
src-80815a778ec9d0fc06b0e000c4608da4b4f3a711.zip
Merge OpenSSL 1.0.2e.
Notes
Notes: svn path=/head/; revision=291719
Diffstat (limited to 'secure/usr.bin/openssl/man/pkcs12.1')
-rw-r--r--secure/usr.bin/openssl/man/pkcs12.16
1 files changed, 3 insertions, 3 deletions
diff --git a/secure/usr.bin/openssl/man/pkcs12.1 b/secure/usr.bin/openssl/man/pkcs12.1
index 85e4b736315d..7f0e7ce641e9 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 2.28 (Pod::Simple 3.30)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "PKCS12 1"
-.TH PKCS12 1 "2015-07-09" "1.0.2d" "OpenSSL"
+.TH PKCS12 1 "2015-12-03" "1.0.2e" "OpenSSL"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -312,7 +312,7 @@ key is encrypted using triple \s-1DES\s0 and the certificate using 40 bit \s-1RC
.IX Item "-keypbe alg, -certpbe alg"
these options allow the algorithm used to encrypt the private key and
certificates to be selected. Any PKCS#5 v1.5 or PKCS#12 \s-1PBE\s0 algorithm name
-can be used (see \fB\s-1NOTES\s0\fR section for more information). If a a cipher name
+can be used (see \fB\s-1NOTES\s0\fR section for more information). If a cipher name
(as output by the \fBlist-cipher-algorithms\fR command is specified then it
is used with PKCS#5 v2.0. For interoperability reasons it is advisable to only
use PKCS#12 algorithms.