root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
EasySec 2016-11-12 21:08:32 +01:00 committed by Rich Salz
parent e330f55d00
commit a22f9c84b4
4 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_client.c
View File

@ -567,7 +567,7 @@ const OPTIONS s_client_options[] = {
{"proxy", OPT_PROXY, 's', {"proxy", OPT_PROXY, 's',
"Connect to via specified proxy to the real server"}, "Connect to via specified proxy to the real server"},
#ifdef AF_UNIX #ifdef AF_UNIX
{"unix", OPT_UNIX, 's', "Connect over unix domain sockets"}, {"unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket"},
#endif #endif
{"4", OPT_4, '-', "Use IPv4 only"}, {"4", OPT_4, '-', "Use IPv4 only"},
#ifdef AF_INET6 #ifdef AF_INET6

2
apps/s_server.c
View File

@ -684,7 +684,7 @@ const OPTIONS s_server_options[] = {
{"port", OPT_PORT, 'p', {"port", OPT_PORT, 'p',
"TCP/IP port to listen on for connections (default is " PORT ")"}, "TCP/IP port to listen on for connections (default is " PORT ")"},
{"accept", OPT_ACCEPT, 's', {"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 #ifdef AF_UNIX
{"unix", OPT_UNIX, 's', "Unix domain socket to accept on"}, {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"},
#endif #endif

15
doc/man1/s_client.pod
View File

@ -10,6 +10,9 @@ B<openssl> B<s_client>
[B<-help>] [B<-help>]
[B<-connect host:port>] [B<-connect host:port>]
[B<-proxy host:port>] [B<-proxy host:port>]
[B<-unix path>]
[B<-4>]
[B<-6>]
[B<-servername name>] [B<-servername name>]
[B<-verify depth>] [B<-verify depth>]
[B<-verify_return_error>] [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 specified with this flag and issues an HTTP CONNECT command to connect
to the desired server. 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> =item B<-servername name>
Set the TLS SNI (Server Name Indication) extension in the ClientHello message. Set the TLS SNI (Server Name Indication) extension in the ClientHello message.

29
doc/man1/s_server.pod
View File

@ -8,8 +8,13 @@ s_server - SSL/TLS server program
B<openssl> B<s_server> B<openssl> B<s_server>
[B<-help>] [B<-help>]
[B<-accept port>] [B<-port port>]
[B<-accept val>]
[B<-naccept count>] [B<-naccept count>]
[B<-unix val>]
[B<-unlink>]
[B<-4>]
[B<-6>]
[B<-context id>] [B<-context id>]
[B<-verify depth>] [B<-verify depth>]
[B<-Verify depth>] [B<-Verify depth>]
@ -125,14 +130,34 @@ manual page.
Print out a usage message. 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. 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> =item B<-naccept count>
The server will exit after receiving B<number> connections, default unlimited. 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> =item B<-context id>
Sets the SSL context id. It can be given any string value. If this option Sets the SSL context id. It can be given any string value. If this option