summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.124
-rw-r--r--ssh.c20
3 files changed, 26 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f2fb1017..71f5dfe34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
3 - jmc@cvs.openbsd.org 2013/11/21 08:05:09 3 - jmc@cvs.openbsd.org 2013/11/21 08:05:09
4 [ssh_config.5 sshd_config.5] 4 [ssh_config.5 sshd_config.5]
5 no need for .Pp before displays; 5 no need for .Pp before displays;
6 - deraadt@cvs.openbsd.org 2013/11/25 18:04:21
7 [ssh.1 ssh.c]
8 improve -Q usage and such. One usage change is that the option is now
9 case-sensitive
10 ok dtucker markus djm
6 11
720131121 1220131121
8 - (djm) OpenBSD CVS Sync 13 - (djm) OpenBSD CVS Sync
diff --git a/ssh.1 b/ssh.1
index 73e208693..842affbd9 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.340 2013/11/21 00:45:44 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.341 2013/11/25 18:04:21 deraadt Exp $
37.Dd $Mdocdate: November 21 2013 $ 37.Dd $Mdocdate: November 25 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -60,13 +60,13 @@
60.Op Fl p Ar port 60.Op Fl p Ar port
61.Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport 61.Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport
62.Op Fl S Ar ctl_path 62.Op Fl S Ar ctl_path
63.Op Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
63.Op Fl W Ar host : Ns Ar port 64.Op Fl W Ar host : Ns Ar port
64.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun 65.Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun
65.Oo Ar user Ns @ Oc Ns Ar hostname 66.Oo Ar user Ns @ Oc Ns Ar hostname
66.Op Ar command 67.Op Ar command
67.Ek 68.Ek
68.Nm 69.Nm
69.Fl Q Ar protocol_feature
70.Sh DESCRIPTION 70.Sh DESCRIPTION
71.Nm 71.Nm
72(SSH client) is a program for logging into a remote machine and for 72(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
496Port to connect to on the remote host. 496Port to connect to on the remote host.
497This can be specified on a 497This can be specified on a
498per-host basis in the configuration file. 498per-host basis in the configuration file.
499.It Fl Q Ar protocol_feature 499.It Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key
500Queries 500Queries
501.Nm 501.Nm
502for the algorithms supported for the specified version 2 502for the algorithms supported for the specified version 2.
503.Ar protocol_feature . 503The available features are:
504The queriable features are: 504.Ar cipher
505.Dq cipher
506(supported symmetric ciphers), 505(supported symmetric ciphers),
507.Dq cipher-auth 506.Ar cipher-auth
508(supported symmetric ciphers that support authenticated encryption), 507(supported symmetric ciphers that support authenticated encryption),
509.Dq MAC 508.Ar mac
510(supported message integrity codes), 509(supported message integrity codes),
511.Dq KEX 510.Ar kex
512(key exchange algorithms), 511(key exchange algorithms),
513.Dq key 512.Ar key
514(key types). 513(key types).
515Protocol features are treated case-insensitively.
516.It Fl q 514.It Fl q
517Quiet mode. 515Quiet mode.
518Causes most warning and diagnostic messages to be suppressed. 516Causes most warning and diagnostic messages to be suppressed.
diff --git a/ssh.c b/ssh.c
index 58becd708..ea5d6edc7 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.393 2013/11/21 00:45:44 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.394 2013/11/25 18:04:21 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -199,9 +199,9 @@ usage(void)
199"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" 199"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
200" [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" 200" [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
201" [-F configfile] [-I pkcs11] [-i identity_file]\n" 201" [-F configfile] [-I pkcs11] [-i identity_file]\n"
202" [-L [bind_address:]port:host:hostport] [-Q protocol_feature]\n" 202" [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n"
203" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" 203" [-O ctl_cmd] [-o option] [-p port] [-R [bind_address:]port:host:hostport]\n"
204" [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" 204" [-S ctl_path] [-Q cipher | cipher-auth | mac | kex | key]\n"
205" [-W host:port] [-w local_tun[:remote_tun]]\n" 205" [-W host:port] [-w local_tun[:remote_tun]]\n"
206" [user@]hostname [command]\n" 206" [user@]hostname [command]\n"
207 ); 207 );
@@ -517,17 +517,17 @@ main(int ac, char **av)
517 case 'P': /* deprecated */ 517 case 'P': /* deprecated */
518 options.use_privileged_port = 0; 518 options.use_privileged_port = 0;
519 break; 519 break;
520 case 'Q': /* deprecated */ 520 case 'Q':
521 cp = NULL; 521 cp = NULL;
522 if (strcasecmp(optarg, "cipher") == 0) 522 if (strcmp(optarg, "cipher") == 0)
523 cp = cipher_alg_list('\n', 0); 523 cp = cipher_alg_list('\n', 0);
524 else if (strcasecmp(optarg, "cipher-auth") == 0) 524 else if (strcmp(optarg, "cipher-auth") == 0)
525 cp = cipher_alg_list('\n', 1); 525 cp = cipher_alg_list('\n', 1);
526 else if (strcasecmp(optarg, "mac") == 0) 526 else if (strcmp(optarg, "mac") == 0)
527 cp = mac_alg_list('\n'); 527 cp = mac_alg_list('\n');
528 else if (strcasecmp(optarg, "kex") == 0) 528 else if (strcmp(optarg, "kex") == 0)
529 cp = kex_alg_list('\n'); 529 cp = kex_alg_list('\n');
530 else if (strcasecmp(optarg, "key") == 0) 530 else if (strcmp(optarg, "key") == 0)
531 cp = key_alg_list(); 531 cp = key_alg_list();
532 if (cp == NULL) 532 if (cp == NULL)
533 fatal("Unsupported query \"%s\"", optarg); 533 fatal("Unsupported query \"%s\"", optarg);