diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-09-11 03:42:32 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-09-16 17:52:04 +1000 |
| commit | c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41 (patch) | |
| tree | 655beaa52174245dbfb0751168121e21d6b900ee /ssh.1 | |
| parent | cfffbdb10fdf0f02d3f4232232eef7ec3876c383 (diff) | |
| download | openssh-git-c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41.tar.gz | |
upstream commit
mention -Q key-plain and -Q key-cert; bz#2455 pointed out
by Jakub Jelen
Upstream-ID: c8f1f8169332e4fa73ac96b0043e3b84e01d4896
Diffstat (limited to 'ssh.1')
| -rw-r--r-- | ssh.1 | 14 |
1 files changed, 9 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.361 2015/07/20 18:44:12 millert Exp $ -.Dd $Mdocdate: July 20 2015 $ +.\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $ +.Dd $Mdocdate: September 11 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 | protocol-version +.Op Fl Q Ar query_option .Op Fl R Ar address .Op Fl S Ar ctl_path .Op Fl W Ar host : Ns Ar port @@ -550,7 +550,7 @@ Port to connect to on the remote host. This can be specified on a per-host basis in the configuration file. .Pp -.It Fl Q Cm cipher | cipher-auth | mac | kex | key | protocol-version +.It Fl Q Ar query_option Queries .Nm for the algorithms supported for the specified version 2. @@ -564,7 +564,11 @@ The available features are: .Ar kex (key exchange algorithms), .Ar key -(key types) and +(key types), +.Ar key-cert +(certificate key types), +.Ar key-plain +(non-certificate key types), and .Ar protocol-version (supported SSH protocol versions). .Pp |