summaryrefslogtreecommitdiffstats
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-04-23 11:24:32 +0200
committerDamien Miller <djm@mindrot.org>2013-04-23 11:24:32 +0200
commitea11119eee3c5e2429b1f5f8688b25b028fa991a (patch)
tree5916295fcefb8665088f59a5431cb0c792fbf327 /ssh.1
parent - djm@cvs.openbsd.org 2013/04/19 01:03:01 (diff)
downloadopenssh-ea11119eee3c5e2429b1f5f8688b25b028fa991a.tar.xz
openssh-ea11119eee3c5e2429b1f5f8688b25b028fa991a.zip
- djm@cvs.openbsd.org 2013/04/19 01:06:50
[authfile.c cipher.c cipher.h kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c] [key.c key.h mac.c mac.h packet.c ssh.1 ssh.c] add the ability to query supported ciphers, MACs, key type and KEX algorithms to ssh. Includes some refactoring of KEX and key type handling to be table-driven; ok markus@
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.121
1 files changed, 19 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index d77494b83..dc7af4864 100644
--- a/ssh.1
+++ b/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.331 2013/04/07 02:10:33 dtucker Exp $
-.Dd $Mdocdate: April 7 2013 $
+.\" $OpenBSD: ssh.1,v 1.332 2013/04/19 01:06:50 djm Exp $
+.Dd $Mdocdate: April 19 2013 $
.Dt SSH 1
.Os
.Sh NAME
@@ -65,6 +65,8 @@
.Oo Ar user Ns @ Oc Ns Ar hostname
.Op Ar command
.Ek
+.Nm
+.Fl Q Ar protocol_feature
.Sh DESCRIPTION
.Nm
(SSH client) is a program for logging into a remote machine and for
@@ -487,6 +489,21 @@ 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 protocol_feature
+Queries
+.Nm
+for the algorithms supported for the specified version 2
+.Ar protocol_feature .
+The queriable features are:
+.Dq cipher
+(supported symmetric ciphers),
+.Dq MAC
+(supported message integrity codes),
+.Dq KEX
+(key exchange algorithms),
+.Dq key
+(key types).
+Protocol features are treated case-insensitively.
.It Fl q
Quiet mode.
Causes most warning and diagnostic messages to be suppressed.