=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.490 retrieving revision 1.491 diff -u -r1.490 -r1.491 --- src/usr.bin/ssh/ssh.c 2018/07/27 05:34:42 1.490 +++ src/usr.bin/ssh/ssh.c 2018/09/12 01:30:10 1.491 @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -715,8 +715,15 @@ 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);