[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  3ba3e350fd15c133a172095f67e6e0c99ab9b410 (commit)
      from  7bc027d73bc51cfa0ae23fbfd91134be9464d694 (commit)


- Log -----------------------------------------------------------------
commit 3ba3e350fd15c133a172095f67e6e0c99ab9b410
Author: Pauli <pauli at openssl.org>
Date:   Wed May 12 15:19:54 2021 +1000

    doc: remove references to undepreciated commands being deprecated.
    
    The dsa, ec, ecparam, and rsa manual pages refer to themselves are being
    deprecated which they aren't.  Address this and add a note pointing to
    the pkey command equivalents albeit without recommending it.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15239)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/openssl-dsa.pod.in     |  7 +++++--
 doc/man1/openssl-ec.pod.in      |  7 +++++--
 doc/man1/openssl-ecparam.pod.in |  8 ++++++--
 doc/man1/openssl-rsa.pod.in     | 10 +++++++---
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/doc/man1/openssl-dsa.pod.in b/doc/man1/openssl-dsa.pod.in
index b17b49ad0f..68ce5f319c 100644
--- a/doc/man1/openssl-dsa.pod.in
+++ b/doc/man1/openssl-dsa.pod.in
@@ -129,10 +129,13 @@ a public key.
 
 =back
 
+The L<openssl-pkey(1)> command is capable of performing all the operations
+this command can, as well as supporting other public key types.
+
 =head1 EXAMPLES
 
-Examples equivalent to these can be found in the documentation for the
-non-deprecated L<openssl-pkey(1)> command.
+The documentation for the L<openssl-pkey(1)> command contains examples
+equivalent to the ones listed here.
 
 To remove the pass phrase on a DSA private key:
 
diff --git a/doc/man1/openssl-ec.pod.in b/doc/man1/openssl-ec.pod.in
index b3aabcb41a..479485cc80 100644
--- a/doc/man1/openssl-ec.pod.in
+++ b/doc/man1/openssl-ec.pod.in
@@ -147,10 +147,13 @@ This option checks the consistency of an EC private or public key.
 
 =back
 
+The L<openssl-pkey(1)> command is capable of performing all the operations
+this command can, as well as supporting other public key types.
+
 =head1 EXAMPLES
 
-Examples equivalent to these can be found in the documentation for the
-non-deprecated L<openssl-pkey(1)> command.
+The documentation for the L<openssl-pkey(1)> command contains examples
+equivalent to the ones listed here.
 
 To encrypt a private key using triple DES:
 
diff --git a/doc/man1/openssl-ecparam.pod.in b/doc/man1/openssl-ecparam.pod.in
index 2f0968c311..e0bdb75cf3 100644
--- a/doc/man1/openssl-ecparam.pod.in
+++ b/doc/man1/openssl-ecparam.pod.in
@@ -129,10 +129,14 @@ This option will generate an EC private key using the specified parameters.
 
 =back
 
+The L<openssl-genpkey(1)> and L<openssl-pkeyparam(1)> commands are capable
+of performing all the operations this command can, as well as supporting
+other public key types.
+
 =head1 EXAMPLES
 
-Examples equivalent to these can be found in the documentation for the
-non-deprecated L<openssl-genpkey(1)> and L<openssl-pkeyparam(1)> commands.
+The documentation for the L<openssl-genpkey(1)> and L<openssl-pkeyparam(1)>
+commands contains examples equivalent to the ones listed here.
 
 To create EC parameters with the group 'prime192v1':
 
diff --git a/doc/man1/openssl-rsa.pod.in b/doc/man1/openssl-rsa.pod.in
index d67a0f64bb..fab6408f14 100644
--- a/doc/man1/openssl-rsa.pod.in
+++ b/doc/man1/openssl-rsa.pod.in
@@ -57,7 +57,6 @@ various forms and their components printed out.
 
 Print out a usage message.
 
-
 =item B<-inform> B<DER>|B<PEM>|B<P12>|B<ENGINE>
 
 The key input format; unspecified by default.
@@ -140,10 +139,15 @@ Like B<-pubin> and B<-pubout> except B<RSAPublicKey> format is used instead.
 
 =back
 
+=head1 NOTES
+
+The L<openssl-pkey(1)> command is capable of performing all the operations
+this command can, as well as supporting other public key types.
+
 =head1 EXAMPLES
 
-Examples equivalent to these can be found in the documentation for the
-non-deprecated L<openssl-pkey(1)> command.
+The documentation for the L<openssl-pkey(1)> command contains examples
+equivalent to the ones listed here.
 
 To remove the pass phrase on an RSA private key: