diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -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); |