提交 7477c83e 编写于 作者: T Tomas Mraz 提交者: Rich Salz

Add missing documentation of the default format for commands.

Reviewed-by: NAndy Polyakov <appro@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4122)
上级 3cb6a4d6
...@@ -42,8 +42,8 @@ the DER form with header and footer lines. ...@@ -42,8 +42,8 @@ the DER form with header and footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -33,13 +33,13 @@ Print out a usage message. ...@@ -33,13 +33,13 @@ Print out a usage message.
This specifies the CRL input format. B<DER> format is DER encoded CRL This specifies the CRL input format. B<DER> format is DER encoded CRL
structure.B<PEM> (the default) is a base64 encoded version of structure.B<PEM> (the default) is a base64 encoded version of
the DER form with header and footer lines. the DER form with header and footer lines. The default format is PEM.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the PKCS#7 structure output format. B<DER> format is DER This specifies the PKCS#7 structure output format. B<DER> format is DER
encoded PKCS#7 structure.B<PEM> (the default) is a base64 encoded version of encoded PKCS#7 structure.B<PEM> (the default) is a base64 encoded version of
the DER form with header and footer lines. the DER form with header and footer lines. The default format is PEM.
=item B<-in filename> =item B<-in filename>
......
...@@ -45,8 +45,8 @@ additional header and footer lines. ...@@ -45,8 +45,8 @@ additional header and footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in> I<filename> =item B<-in> I<filename>
......
...@@ -62,8 +62,8 @@ PKCS#8 format is also accepted. ...@@ -62,8 +62,8 @@ PKCS#8 format is also accepted.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -42,8 +42,8 @@ of the B<DER> format base64 encoded with additional header and footer lines. ...@@ -42,8 +42,8 @@ of the B<DER> format base64 encoded with additional header and footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -55,8 +55,8 @@ PKCS#8 format is also accepted. ...@@ -55,8 +55,8 @@ PKCS#8 format is also accepted.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -47,8 +47,8 @@ header and footer lines. ...@@ -47,8 +47,8 @@ header and footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -38,7 +38,7 @@ standard output is used. ...@@ -38,7 +38,7 @@ standard output is used.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format DER or PEM. This specifies the output format DER or PEM. The default format is PEM.
=item B<-pass arg> =item B<-pass arg>
......
...@@ -37,8 +37,8 @@ the DER form with header and footer lines. ...@@ -37,8 +37,8 @@ the DER form with header and footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -52,11 +52,13 @@ reversed: it reads a private key and writes a PKCS#8 format key. ...@@ -52,11 +52,13 @@ reversed: it reads a private key and writes a PKCS#8 format key.
=item B<-inform DER|PEM> =item B<-inform DER|PEM>
This specifies the input format: see L<KEY FORMATS> for more details. This specifies the input format: see L<KEY FORMATS> for more details. The default
format is PEM.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format: see L<KEY FORMATS> for more details. This specifies the output format: see L<KEY FORMATS> for more details. The default
format is PEM.
=item B<-traditional> =item B<-traditional>
......
...@@ -38,12 +38,12 @@ Print out a usage message. ...@@ -38,12 +38,12 @@ Print out a usage message.
=item B<-inform DER|PEM> =item B<-inform DER|PEM>
This specifies the input format DER or PEM. This specifies the input format DER or PEM. The default format is PEM.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -71,8 +71,8 @@ footer lines. ...@@ -71,8 +71,8 @@ footer lines.
=item B<-outform DER|PEM> =item B<-outform DER|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -63,8 +63,8 @@ section. ...@@ -63,8 +63,8 @@ section.
=item B<-outform DER|NET|PEM> =item B<-outform DER|NET|PEM>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
...@@ -42,8 +42,8 @@ format base64 encoded with additional header and footer lines. ...@@ -42,8 +42,8 @@ format base64 encoded with additional header and footer lines.
=item B<-outform DER|PEM|NSS> =item B<-outform DER|PEM|NSS>
This specifies the output format. The B<PEM> and B<DER> options have the same meaning This specifies the output format. The B<PEM> and B<DER> options have the same meaning
as the B<-inform> option. The B<NSS> option outputs the session id and the master key and default as the B<-inform> option. The B<NSS> option outputs the session id and
in NSS keylog format. the master key in NSS keylog format.
=item B<-in filename> =item B<-in filename>
......
...@@ -92,12 +92,12 @@ certificate but this can change if other options such as B<-req> are ...@@ -92,12 +92,12 @@ certificate but this can change if other options such as B<-req> are
present. The DER format is the DER encoding of the certificate and PEM present. The DER format is the DER encoding of the certificate and PEM
is the base64 encoding of the DER encoding with header and footer lines is the base64 encoding of the DER encoding with header and footer lines
added. The NET option is an obscure Netscape server format that is now added. The NET option is an obscure Netscape server format that is now
obsolete. obsolete. The default format is PEM.
=item B<-outform DER|PEM|NET> =item B<-outform DER|PEM|NET>
This specifies the output format, the options have the same meaning as the This specifies the output format, the options have the same meaning and default
B<-inform> option. as the B<-inform> option.
=item B<-in filename> =item B<-in filename>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册