diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 842affbd9e4..fc56997f4e4 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -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.341 2013/11/25 18:04:21 deraadt Exp $ -.Dd $Mdocdate: November 25 2013 $ +.\" $OpenBSD: ssh.1,v 1.342 2013/11/26 12:14:54 jmc Exp $ +.Dd $Mdocdate: November 26 2013 $ .Dt SSH 1 .Os .Sh NAME @@ -58,15 +58,14 @@ .Op Fl O Ar ctl_cmd .Op Fl o Ar option .Op Fl p Ar port +.Op Fl Q Cm cipher | cipher-auth | mac | kex | key .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 .Sh DESCRIPTION .Nm (SSH client) is a program for logging into a remote machine and for @@ -496,7 +495,7 @@ 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 cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key +.It Fl Q Cm cipher | cipher-auth | mac | kex | key Queries .Nm for the algorithms supported for the specified version 2. diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index fb932aa5076..a7b4c9ff2eb 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.394 2013/11/25 18:04:21 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.395 2013/11/26 12:14:54 jmc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -187,10 +187,10 @@ usage(void) " [-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] [-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" +" [-O ctl_cmd] [-o option] [-p port]\n" +" [-Q cipher | cipher-auth | mac | kex | key]\n" +" [-R [bind_address:]port:host:hostport] [-S ctl_path] [-W host:port]\n" +" [-w local_tun[:remote_tun]] [user@]hostname [command]\n" ); exit(255); } |