diff options
| author | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
| commit | 8d77ecefb78a0e7ec702cf614a78dd85de9395ee (patch) | |
| tree | ade84397c16fe1b20cb2a441f603826e49c36cf2 /secure/usr.bin/openssl/man/pkcs12.1 | |
| parent | 5374819b03f4e6dcb332bf2729f9270e5d10b83a (diff) | |
| parent | afd52a5fc90e70242dbb0e7d29987c976eb993e0 (diff) | |
| download | FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.zip FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.tar.gz | |
Merge OpenSSL 1.0.2e.
Diffstat (limited to 'secure/usr.bin/openssl/man/pkcs12.1')
| -rw-r--r-- | secure/usr.bin/openssl/man/pkcs12.1 | 6 |
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 85e4b73..7f0e7ce 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. |
