[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Wed Aug 9 18:57:21 UTC 2017
The branch master has been updated
via 7477c83e150ace0df91df92bc935ccaebddf8dd8 (commit)
from 3cb6a4d6d66d566937c08d2d3fc933275e70f73e (commit)
- Log -----------------------------------------------------------------
commit 7477c83e150ace0df91df92bc935ccaebddf8dd8
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date: Wed Aug 9 15:20:43 2017 +0200
Add missing documentation of the default format for commands.
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4122)
-----------------------------------------------------------------------
Summary of changes:
doc/man1/crl.pod | 4 ++--
doc/man1/crl2pkcs7.pod | 4 ++--
doc/man1/dhparam.pod | 4 ++--
doc/man1/dsa.pod | 4 ++--
doc/man1/dsaparam.pod | 4 ++--
doc/man1/ec.pod | 4 ++--
doc/man1/ecparam.pod | 4 ++--
doc/man1/genpkey.pod | 2 +-
doc/man1/pkcs7.pod | 4 ++--
doc/man1/pkcs8.pod | 6 ++++--
doc/man1/pkey.pod | 6 +++---
doc/man1/req.pod | 4 ++--
doc/man1/rsa.pod | 4 ++--
doc/man1/sess_id.pod | 4 ++--
doc/man1/x509.pod | 6 +++---
15 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/doc/man1/crl.pod b/doc/man1/crl.pod
index 14150fd..9d1dcf4 100644
--- a/doc/man1/crl.pod
+++ b/doc/man1/crl.pod
@@ -42,8 +42,8 @@ the DER form with header and footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/crl2pkcs7.pod b/doc/man1/crl2pkcs7.pod
index 11d7cc9..3bf1fac 100644
--- a/doc/man1/crl2pkcs7.pod
+++ b/doc/man1/crl2pkcs7.pod
@@ -33,13 +33,13 @@ Print out a usage message.
This specifies the CRL input format. B<DER> format is DER encoded CRL
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>
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
-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>
diff --git a/doc/man1/dhparam.pod b/doc/man1/dhparam.pod
index 852469d..2395aa1 100644
--- a/doc/man1/dhparam.pod
+++ b/doc/man1/dhparam.pod
@@ -45,8 +45,8 @@ additional header and footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in> I<filename>
diff --git a/doc/man1/dsa.pod b/doc/man1/dsa.pod
index 2f8df0c..523c533 100644
--- a/doc/man1/dsa.pod
+++ b/doc/man1/dsa.pod
@@ -62,8 +62,8 @@ PKCS#8 format is also accepted.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/dsaparam.pod b/doc/man1/dsaparam.pod
index 4c07463..f97a673 100644
--- a/doc/man1/dsaparam.pod
+++ b/doc/man1/dsaparam.pod
@@ -42,8 +42,8 @@ of the B<DER> format base64 encoded with additional header and footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/ec.pod b/doc/man1/ec.pod
index 99cf9d0..f386877 100644
--- a/doc/man1/ec.pod
+++ b/doc/man1/ec.pod
@@ -55,8 +55,8 @@ PKCS#8 format is also accepted.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/ecparam.pod b/doc/man1/ecparam.pod
index 3f76dc0..ecafedc 100644
--- a/doc/man1/ecparam.pod
+++ b/doc/man1/ecparam.pod
@@ -47,8 +47,8 @@ header and footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/genpkey.pod b/doc/man1/genpkey.pod
index 50a7b1b..8e22ab2 100644
--- a/doc/man1/genpkey.pod
+++ b/doc/man1/genpkey.pod
@@ -38,7 +38,7 @@ standard output is used.
=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>
diff --git a/doc/man1/pkcs7.pod b/doc/man1/pkcs7.pod
index 184ac14..a5f96ac 100644
--- a/doc/man1/pkcs7.pod
+++ b/doc/man1/pkcs7.pod
@@ -37,8 +37,8 @@ the DER form with header and footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/pkcs8.pod b/doc/man1/pkcs8.pod
index 42e2468..9d1dd31 100644
--- a/doc/man1/pkcs8.pod
+++ b/doc/man1/pkcs8.pod
@@ -52,11 +52,13 @@ reversed: it reads a private key and writes a PKCS#8 format key.
=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>
-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>
diff --git a/doc/man1/pkey.pod b/doc/man1/pkey.pod
index a09736d..4d37c92 100644
--- a/doc/man1/pkey.pod
+++ b/doc/man1/pkey.pod
@@ -38,12 +38,12 @@ Print out a usage message.
=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>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/req.pod b/doc/man1/req.pod
index e15434a..aec2ada 100644
--- a/doc/man1/req.pod
+++ b/doc/man1/req.pod
@@ -71,8 +71,8 @@ footer lines.
=item B<-outform DER|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/rsa.pod b/doc/man1/rsa.pod
index 6fce46c..ee504e6 100644
--- a/doc/man1/rsa.pod
+++ b/doc/man1/rsa.pod
@@ -63,8 +63,8 @@ section.
=item B<-outform DER|NET|PEM>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
diff --git a/doc/man1/sess_id.pod b/doc/man1/sess_id.pod
index 5084b3f..ca3dd7e 100644
--- a/doc/man1/sess_id.pod
+++ b/doc/man1/sess_id.pod
@@ -42,8 +42,8 @@ format base64 encoded with additional header and footer lines.
=item B<-outform DER|PEM|NSS>
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
-in NSS keylog format.
+and default as the B<-inform> option. The B<NSS> option outputs the session id and
+the master key in NSS keylog format.
=item B<-in filename>
diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod
index 5b2fc0e..d31460b 100644
--- a/doc/man1/x509.pod
+++ b/doc/man1/x509.pod
@@ -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
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
-obsolete.
+obsolete. The default format is PEM.
=item B<-outform DER|PEM|NET>
-This specifies the output format, the options have the same meaning as the
-B<-inform> option.
+This specifies the output format, the options have the same meaning and default
+as the B<-inform> option.
=item B<-in filename>
More information about the openssl-commits
mailing list