tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

mention -Q key-plain and -Q key-cert; bz#2455 pointed out
 by Jakub Jelen

Upstream-ID: c8f1f8169332e4fa73ac96b0043e3b84e01d4896
This commit is contained in:
djm@openbsd.org 2015-09-11 03:42:32 +00:00 committed by Damien Miller
parent cfffbdb10f
commit c0f55db7ee
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh.1,v 1.362 2015/09/11 03:42:32 djm Exp $
.Dd $Mdocdate: July 20 2015 $ .Dd $Mdocdate: September 11 2015 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -58,7 +58,7 @@
.Op Fl O Ar ctl_cmd .Op Fl O Ar ctl_cmd
.Op Fl o Ar option .Op Fl o Ar option
.Op Fl p Ar port .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 R Ar address
.Op Fl S Ar ctl_path .Op Fl S Ar ctl_path
.Op Fl W Ar host : Ns Ar port .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 This can be specified on a
per-host basis in the configuration file. per-host basis in the configuration file.
.Pp .Pp
.It Fl Q Cm cipher | cipher-auth | mac | kex | key | protocol-version .It Fl Q Ar query_option
Queries Queries
.Nm .Nm
for the algorithms supported for the specified version 2. for the algorithms supported for the specified version 2.
@ -564,7 +564,11 @@ The available features are:
.Ar kex .Ar kex
(key exchange algorithms), (key exchange algorithms),
.Ar key .Ar key
(key types) and (key types),
.Ar key-cert
(certificate key types),
.Ar key-plain
(non-certificate key types), and
.Ar protocol-version .Ar protocol-version
(supported SSH protocol versions). (supported SSH protocol versions).
.Pp .Pp