[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  04fb4ec8facc5555e1e289029c289ebc4b487db8 (commit)
      from  9067cf6ccdce0a73922f06937e54c2fce2752038 (commit)


- Log -----------------------------------------------------------------
commit 04fb4ec8facc5555e1e289029c289ebc4b487db8
Author: Hubert Kario <hkario at redhat.com>
Date:   Mon Jun 14 13:38:02 2021 +0200

    s_server: make -rev option easier to find (mention echo)
    
    Since the service is echo-like (see TCP port 7 from RFC 862 or
    gnutls-serv --echo), make it easier to find by mentioning "echo" in
    the description of it in the help message an man page
    
    Also fixes the man page inconsistency ("sends it back to the server")
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/15739)

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

Summary of changes:
 apps/s_server.c                  | 2 +-
 doc/man1/openssl-s_server.pod.in | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index e32d25e800..9c0c467ed6 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -856,7 +856,7 @@ const OPTIONS s_server_options[] = {
     {"brief", OPT_BRIEF, '-',
      "Restrict output to brief summary of connection parameters"},
     {"rev", OPT_REV, '-',
-     "act as a simple test server which just sends back with the received text reversed"},
+     "act as an echo server that sends back received text reversed"},
     {"debug", OPT_DEBUG, '-', "Print more output"},
     {"msg", OPT_MSG, '-', "Show protocol messages"},
     {"msgfile", OPT_MSGFILE, '>',
diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in
index 97852ae7bf..c4289a12e3 100644
--- a/doc/man1/openssl-s_server.pod.in
+++ b/doc/man1/openssl-s_server.pod.in
@@ -545,9 +545,8 @@ output.
 
 =item B<-rev>
 
-Simple test server which just reverses the text received from the client
-and sends it back to the server. Also sets B<-brief>. Cannot be used in
-conjunction with B<-early_data>.
+Simple echo server that sends back received text reversed. Also sets B<-brief>.
+Cannot be used in conjunction with B<-early_data>.
 
 =item B<-async>