upstream: Add "ssh -Q sig" to allow listing supported signature

algorithms ok markus@

OpenBSD-Commit-ID: 7a8c6eb6c249dc37823ba5081fce64876d10fe2b

1 files changed, 9 insertions, 2 deletions

diff --git a/ssh.c b/ssh.c
index ce628848c..3307a5e34 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.490 2018/07/27 05:34:42 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.491 2018/09/12 01:30:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -739,8 +739,15 @@ main(int ac, char **av)
                                 cp = sshkey_alg_list(1, 0, 0, '\n');
                         else if (strcmp(optarg, "key-plain") == 0)
                                 cp = sshkey_alg_list(0, 1, 0, '\n');
-                        else if (strcmp(optarg, "protocol-version") == 0) {
+                        else if (strcmp(optarg, "sig") == 0)
+                                cp = sshkey_alg_list(0, 0, 1, '\n');
+                        else if (strcmp(optarg, "protocol-version") == 0)
                                 cp = xstrdup("2");
+                        else if (strcmp(optarg, "help") == 0) {
+                                cp = xstrdup(
+                                    "cipher\ncipher-auth\nkex\nkey\n"
+                                    "key-cert\nkey-plain\nmac\n"
+                                    "protocol-version\nsig");
                         }
                         if (cp == NULL)
                                 fatal("Unsupported query \"%s\"", optarg);