diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-06 13:51:50 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-15 20:20:08 +0200 |
| commit | 6d382c74b375f1f8c44f04ec3de95ff781598a3b (patch) | |
| tree | 4991b57879da3810fbf912c3d169232755380432 /doc/man1/openssl-pkey.pod.in | |
| parent | 60d5331350a5e557908eed0ba7420dba2ad3b79f (diff) | |
Use OSSL_STORE for load_{,pub}key() and load_cert() in apps/lib/apps.c
This also adds the more flexible and general load_key_cert_crl()
as well as helper functions get_passwd(), cleanse(), and clear_free()
to be used also in apps/cmp.c etc.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11755)
Diffstat (limited to 'doc/man1/openssl-pkey.pod.in')
| -rw-r--r-- | doc/man1/openssl-pkey.pod.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/man1/openssl-pkey.pod.in b/doc/man1/openssl-pkey.pod.in index a678bd7516..de1bef954c 100644 --- a/doc/man1/openssl-pkey.pod.in +++ b/doc/man1/openssl-pkey.pod.in @@ -13,7 +13,7 @@ openssl-pkey - public or private key processing command B<openssl> B<pkey> [B<-help>] -[B<-inform> B<DER>|B<PEM>] +[B<-inform> B<DER>|B<PEM>|B<P12>|B<ENGINE>] [B<-outform> B<DER>|B<PEM>] [B<-in> I<filename>] [B<-passin> I<arg>] @@ -48,9 +48,15 @@ converted between various forms and their components printed out. Print out a usage message. -=item B<-inform> B<DER>|B<PEM>, B<-outform> B<DER>|B<PEM> +=item B<-inform> B<DER>|B<PEM>|B<P12>|B<ENGINE> -The input and formats; the default is B<PEM>. +The key input format; the default is B<PEM>. +The only value with effect is B<ENGINE>; all others have become obsolete. +See L<openssl(1)/Format Options> for details. + +=item B<-outform> B<DER>|B<PEM> + +The key output formats; the default is B<PEM>. See L<openssl(1)/Format Options> for details. =item B<-in> I<filename> |