diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-03-03 06:48:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-04 04:54:11 +1100 |
commit | 68d2dfc464fbcdf8d6387884260f9801f4352393 (patch) | |
tree | 73bd299fc3cdec7768d13d519b21becccaf41745 /ssh.1 | |
parent | 39e2f1229562e1195169905607bc12290d21f021 (diff) | |
download | openssh-git-68d2dfc464fbcdf8d6387884260f9801f4352393.tar.gz |
upstream commit
Allow "ssh -Q protocol-version" to list supported SSH
protocol versions. Useful for detecting builds without SSH v.1 support; idea
and ok markus@
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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.355 2015/01/30 11:43:14 djm Exp $ -.Dd $Mdocdate: January 30 2015 $ +.\" $OpenBSD: ssh.1,v 1.356 2015/03/03 06:48:58 djm Exp $ +.Dd $Mdocdate: March 3 2015 $ .Dt SSH 1 .Os .Sh NAME @@ -58,7 +58,7 @@ .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 Q Cm cipher | cipher-auth | mac | kex | key | protocol-version .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 W Ar host : Ns Ar port @@ -497,7 +497,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 Cm cipher | cipher-auth | mac | kex | key +.It Fl Q Cm cipher | cipher-auth | mac | kex | key | protocol-version Queries .Nm for the algorithms supported for the specified version 2. @@ -511,7 +511,9 @@ The available features are: .Ar kex (key exchange algorithms), .Ar key -(key types). +(key types) and +.Ar protocol-version +(supported SSH protocol versions). .It Fl q Quiet mode. Causes most warning and diagnostic messages to be suppressed. |