diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-11-26 11:03:24 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-12-01 17:50:56 +0100 |
| commit | 9ab9b16bb795f1081e86f11e16a1606790231400 (patch) | |
| tree | 9a1241e1c18fc64e7238abce37251ca8c2e154a9 /doc/man1 | |
| parent | Fix simpledynamic.c - a typo and missed a header (diff) | |
| download | openssl-9ab9b16bb795f1081e86f11e16a1606790231400.tar.xz openssl-9ab9b16bb795f1081e86f11e16a1606790231400.zip | |
apps/pkcs12.c: Correct default legacy algs and make related doc consistent
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13534)
Diffstat (limited to 'doc/man1')
| -rw-r--r-- | doc/man1/openssl-pkcs12.pod.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in index 6c4fbfb563..e5da1ec980 100644 --- a/doc/man1/openssl-pkcs12.pod.in +++ b/doc/man1/openssl-pkcs12.pod.in @@ -76,6 +76,7 @@ There are a lot of options the meaning of some depends of whether a PKCS#12 file is being created or parsed. By default a PKCS#12 file is parsed. A PKCS#12 file can be created by using the B<-export> option (see below). Many further options such as B<-chain> make sense only with B<-export>. +The default encryption algorithm is AES-256-CBC with PBKDF2 for key derivation. =head1 PARSING OPTIONS @@ -134,7 +135,7 @@ Use DES to encrypt private keys before outputting. =item B<-des3> -Use triple DES to encrypt private keys before outputting, this is the default. +Use triple DES to encrypt private keys before outputting. =item B<-idea> @@ -263,7 +264,7 @@ as well as any untrusted CA certificates given with the B<-untrusted> option. 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 AES and the certificate using triple DES unless +key and the certificates are encrypted using AES-256-CBC unless the '-legacy' option is used. If '-descert' is used with the '-legacy' then both, the private key and the certificate are encrypted using triple DES. @@ -405,7 +406,7 @@ Include some extra certificates: openssl pkcs12 -export -in file.pem -out file.p12 -name "My Certificate" \ -certfile othercerts.pem -Export a PKCS#12 file with default encryption algorithms as in the legacy provider: +Export a PKCS#12 file with default algorithms as in the legacy provider: openssl pkcs12 -export -in cert.pem -inkey key.pem -out file.p12 -legacy |