diff options
| author | Cory Benfield <lukasaoz@gmail.com> | 2016-06-04 20:46:38 -0700 |
|---|---|---|
| committer | Cory Benfield <lukasaoz@gmail.com> | 2017-06-19 08:42:10 +0100 |
| commit | 729ef85611d2490da8f10ea546279c961e6de4a6 (patch) | |
| tree | 8cd746344b82e010444f7888dbfe250d82990ca8 /doc/man1/s_client.pod | |
| parent | edcdf38bd09f77160f0ec3e5bdd9d9525daf6f25 (diff) | |
s_client accepts host/port as positional argument.
This allows the user to provide the target host and optional port to
openssl s_client as an optional positional argument, rather than as the
argument to the -connect flag. This rationalises the user experience of
s_client: given that the only logical purpose of s_client is to connect
to a host, it is difficult to understand why there is an (effectively
mandatory) command option to pass to make that happen.
This patch forbids providing *both* -connect and the positional
argument, because it would likely be too difficult to reconcile.
Otherwise, using the positional argument behaves exactly the same as
using -connect does.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1171)
Diffstat (limited to 'doc/man1/s_client.pod')
| -rw-r--r-- | doc/man1/s_client.pod | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 57fa920eb8..94356daffb 100644 --- a/doc/man1/s_client.pod +++ b/doc/man1/s_client.pod @@ -113,6 +113,7 @@ B<openssl> B<s_client> [B<-ctlogfile>] [B<-keylogfile file>] [B<-early_data file>] +[B<target>] =head1 DESCRIPTION @@ -135,8 +136,10 @@ Print out a usage message. =item B<-connect host:port> -This specifies the host and optional port to connect to. If not specified -then an attempt is made to connect to the local host on port 4433. +This specifies the host and optional port to connect to. It is possible to +select the host and port using the optional target positional argument instead. +If neither this nor the target positonal argument are specified then an attempt +is made to connect to the local host on port 4433. =item B<-proxy host:port> @@ -592,6 +595,13 @@ Reads the contents of the specified file and attempts to send it as early data to the server. This will only work with resumed sessions that support early data and when the server accepts the early data. +=item B<[target]> + +Rather than providing B<-connect>, the target hostname and optional port may +be provided as a single positional argument after all options. If neither this +nor B<-connect> are provided, falls back to attempting to connect to localhost +on port 4433. + =back =head1 CONNECTED COMMANDS @@ -658,7 +668,7 @@ information whenever a session is renegotiated. L<SSL_CONF_cmd(3)>, L<sess_id(1)>, L<s_server(1)>, L<ciphers(1)>, L<SSL_CTX_set_max_send_fragment(3)>, L<SSL_CTX_set_split_send_fragment(3)> -L<SSL_CTX_set_max_pipelines(3)> +L<SSL_CTX_set_max_pipelines(3)> =head1 HISTORY |