diff options
author | Rich Salz <rsalz@akamai.com> | 2015-07-31 11:52:57 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-07-31 12:27:27 -0400 |
commit | 740ceb5b0c844f1fe9b96983cc175d19795e7aa0 (patch) | |
tree | a11333c672e09a3a98d9b791be71087a05620a0f /doc/apps/pkcs12.pod | |
parent | 898ea7b855541b5809e25944c8dada7b50775fd3 (diff) |
Various doc fixes from GH pull requests
Thanks folks:
348 Benjamin Kaduk
317 Christian Brueffer
254 Erik Tews
253 Erik Tews
219 Carl Mehner
155 (ghost)
95 mancha
51 DominikNeubauer
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'doc/apps/pkcs12.pod')
-rw-r--r-- | doc/apps/pkcs12.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod index 8e0d91798a..744984838d 100644 --- a/doc/apps/pkcs12.pod +++ b/doc/apps/pkcs12.pod @@ -216,7 +216,7 @@ key is encrypted using triple DES and the certificate using 40 bit RC2. these options allow the algorithm used to encrypt the private key and certificates to be selected. Any PKCS#5 v1.5 or PKCS#12 PBE algorithm name -can be used (see B<NOTES> section for more information). If a a cipher name +can be used (see B<NOTES> section for more information). If a cipher name (as output by the B<list-cipher-algorithms> command is specified then it is used with PKCS#5 v2.0. For interoperability reasons it is advisable to only use PKCS#12 algorithms. |