diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -75,6 +75,9 @@ | |||
75 | add the ability to query supported ciphers, MACs, key type and KEX | 75 | add the ability to query supported ciphers, MACs, key type and KEX |
76 | algorithms to ssh. Includes some refactoring of KEX and key type handling | 76 | algorithms to ssh. Includes some refactoring of KEX and key type handling |
77 | to be table-driven; ok markus@ | 77 | to be table-driven; ok markus@ |
78 | - djm@cvs.openbsd.org 2013/04/19 11:10:18 | ||
79 | [ssh.c] | ||
80 | add -Q to usage; reminded by jmc@ | ||
78 | 81 | ||
79 | 20130418 | 82 | 20130418 |
80 | - (djm) [config.guess config.sub] Update to last versions before they switch | 83 | - (djm) [config.guess config.sub] Update to last versions before they switch |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.376 2013/04/19 01:06:50 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.377 2013/04/19 11:10:18 djm 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,7 +199,7 @@ 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]\n" | 202 | " [-L [bind_address:]port:host:hostport] [-Q protocol_feature]\n" |
203 | " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" | 203 | " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" |
204 | " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" | 204 | " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" |
205 | " [-W host:port] [-w local_tun[:remote_tun]]\n" | 205 | " [-W host:port] [-w local_tun[:remote_tun]]\n" |