Commit d937dc08 authored by Damien Miller's avatar Damien Miller

- deraadt@cvs.openbsd.org 2013/11/25 18:04:21

     [ssh.1 ssh.c]
     improve -Q usage and such.  One usage change is that the option is now
     case-sensitive
     ok dtucker markus djm
parent dec0393f
......@@ -3,6 +3,11 @@
- jmc@cvs.openbsd.org 2013/11/21 08:05:09
[ssh_config.5 sshd_config.5]
no need for .Pp before displays;
- deraadt@cvs.openbsd.org 2013/11/25 18:04:21
[ssh.1 ssh.c]
improve -Q usage and such. One usage change is that the option is now
case-sensitive
ok dtucker markus djm
20131121
- (djm) OpenBSD CVS Sync
......
......@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh.1,v 1.340 2013/11/21 00:45:44 djm Exp $
.Dd $Mdocdate: November 21 2013 $
.\" $OpenBSD: ssh.1,v 1.341 2013/11/25 18:04:21 deraadt Exp $
.Dd $Mdocdate: November 25 2013 $
.Dt SSH 1
.Os
.Sh NAME
......@@ -60,13 +60,13 @@
.Op Fl p Ar port
.Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
.Op Fl S Ar ctl_path
.Op Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
.Op Fl W Ar host : Ns Ar port
.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Ek
.Nm
.Fl Q Ar protocol_feature
.Sh DESCRIPTION
.Nm
(SSH client) is a program for logging into a remote machine and for
......@@ -496,23 +496,21 @@ For full details of the options listed below, and their possible values, see
Port to connect to on the remote host.
This can be specified on a
per-host basis in the configuration file.
.It Fl Q Ar protocol_feature
.It Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
Queries
.Nm
for the algorithms supported for the specified version 2
.Ar protocol_feature .
The queriable features are:
.Dq cipher
for the algorithms supported for the specified version 2.
The available features are:
.Ar cipher
(supported symmetric ciphers),
.Dq cipher-auth
.Ar cipher-auth
(supported symmetric ciphers that support authenticated encryption),
.Dq MAC
.Ar mac
(supported message integrity codes),
.Dq KEX
.Ar kex
(key exchange algorithms),
.Dq key
.Ar key
(key types).
Protocol features are treated case-insensitively.
.It Fl q
Quiet mode.
Causes most warning and diagnostic messages to be suppressed.
......
/* $OpenBSD: ssh.c,v 1.393 2013/11/21 00:45:44 djm Exp $ */
/* $OpenBSD: ssh.c,v 1.394 2013/11/25 18:04:21 deraadt Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
......@@ -199,9 +199,9 @@ usage(void)
"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
" [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
" [-F configfile] [-I pkcs11] [-i identity_file]\n"
" [-L [bind_address:]port:host:hostport] [-Q protocol_feature]\n"
" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n"
" [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n"
" [-O ctl_cmd] [-o option] [-p port] [-R [bind_address:]port:host:hostport]\n"
" [-S ctl_path] [-Q cipher | cipher-auth | mac | kex | key]\n"
" [-W host:port] [-w local_tun[:remote_tun]]\n"
" [user@]hostname [command]\n"
);
......@@ -517,17 +517,17 @@ main(int ac, char **av)
case 'P': /* deprecated */
options.use_privileged_port = 0;
break;
case 'Q': /* deprecated */
case 'Q':
cp = NULL;
if (strcasecmp(optarg, "cipher") == 0)
if (strcmp(optarg, "cipher") == 0)
cp = cipher_alg_list('\n', 0);
else if (strcasecmp(optarg, "cipher-auth") == 0)
else if (strcmp(optarg, "cipher-auth") == 0)
cp = cipher_alg_list('\n', 1);
else if (strcasecmp(optarg, "mac") == 0)
else if (strcmp(optarg, "mac") == 0)
cp = mac_alg_list('\n');
else if (strcasecmp(optarg, "kex") == 0)
else if (strcmp(optarg, "kex") == 0)
cp = kex_alg_list('\n');
else if (strcasecmp(optarg, "key") == 0)
else if (strcmp(optarg, "key") == 0)
cp = key_alg_list();
if (cp == NULL)
fatal("Unsupported query \"%s\"", optarg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment