diff options
author | EasySec <Easy.Sec@free.fr> | 2016-11-12 21:08:32 +0100 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-11-12 21:33:24 -0500 |
commit | a22f9c84b468eed83c651cb5f2c68c7ad4103ffd (patch) | |
tree | cb749f091ab0ef053ceeb13cf835e84ba5e96391 | |
parent | e330f55d008ab99ee6c99b383061337fc4e7359d (diff) | |
download | openssl-a22f9c84b468eed83c651cb5f2c68c7ad4103ffd.tar.gz |
Update s_client and s_server documentation about some missing arguments
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1837)
-rw-r--r-- | apps/s_client.c | 2 | ||||
-rw-r--r-- | apps/s_server.c | 2 | ||||
-rw-r--r-- | doc/man1/s_client.pod | 15 | ||||
-rw-r--r-- | doc/man1/s_server.pod | 29 |
4 files changed, 44 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index a407303a07..cfd7cbd79d 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -567,7 +567,7 @@ const OPTIONS s_client_options[] = { {"proxy", OPT_PROXY, 's', "Connect to via specified proxy to the real server"}, #ifdef AF_UNIX - {"unix", OPT_UNIX, 's', "Connect over unix domain sockets"}, + {"unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket"}, #endif {"4", OPT_4, '-', "Use IPv4 only"}, #ifdef AF_INET6 diff --git a/apps/s_server.c b/apps/s_server.c index 985841352d..ee6631809c 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -684,7 +684,7 @@ const OPTIONS s_server_options[] = { {"port", OPT_PORT, 'p', "TCP/IP port to listen on for connections (default is " PORT ")"}, {"accept", OPT_ACCEPT, 's', - "TCP/IP optional host and port to accept on (default is " PORT ")"}, + "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")"}, #ifdef AF_UNIX {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"}, #endif diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 4f21ea4093..03b5cdaf8e 100644 --- a/doc/man1/s_client.pod +++ b/doc/man1/s_client.pod @@ -10,6 +10,9 @@ B<openssl> B<s_client> [B<-help>] [B<-connect host:port>] [B<-proxy host:port>] +[B<-unix path>] +[B<-4>] +[B<-6>] [B<-servername name>] [B<-verify depth>] [B<-verify_return_error>] @@ -132,6 +135,18 @@ When used with the B<-connect> flag, the program uses the host and port specified with this flag and issues an HTTP CONNECT command to connect to the desired server. +=item B<-unix path> + +Connect over the specified Unix-domain socket. + +=item B<-4> + +Use IPv4 only. + +=item B<-6> + +Use IPv6 only. + =item B<-servername name> Set the TLS SNI (Server Name Indication) extension in the ClientHello message. diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod index b6c5659972..94065ba753 100644 --- a/doc/man1/s_server.pod +++ b/doc/man1/s_server.pod @@ -8,8 +8,13 @@ s_server - SSL/TLS server program B<openssl> B<s_server> [B<-help>] -[B<-accept port>] +[B<-port port>] +[B<-accept val>] [B<-naccept count>] +[B<-unix val>] +[B<-unlink>] +[B<-4>] +[B<-6>] [B<-context id>] [B<-verify depth>] [B<-Verify depth>] @@ -125,14 +130,34 @@ manual page. Print out a usage message. -=item B<-accept port> +=item B<-port port> The TCP port to listen on for connections. If not specified 4433 is used. +=item B<-accept val> + +The optional TCP host and port to listen on for connections. If not specified, *:4433 is used. + =item B<-naccept count> The server will exit after receiving B<number> connections, default unlimited. +=item B<-unix val> + +Unix domain socket to accept on. + +=item B<-unlink> + +For -unix, unlink existing socket first. + +=item B<-4> + +Use IPv4 only. + +=item B<-6> + +Use IPv6 only. + =item B<-context id> Sets the SSL context id. It can be given any string value. If this option |