diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-09-20 03:31:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-20 14:00:29 +1000 |
commit | aa083aa9624ea7b764d5a81c4c676719a1a3e42b (patch) | |
tree | 94e9fad810cb67e582fcde103cef79d2e6224411 | |
parent | ecac7e1f7add6b28874959a11f2238d149dc2c07 (diff) |
upstream: fix "ssh -Q sig" to show correct signature algorithm list
(it was erroneously showing certificate algorithms); prompted by markus@
OpenBSD-Commit-ID: 1cdee002f2f0c21456979deeb887fc889afb154d
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.491 2018/09/12 01:30:10 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.492 2018/09/20 03:31:49 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -740,7 +740,7 @@ main(int ac, char **av) | |||
740 | else if (strcmp(optarg, "key-plain") == 0) | 740 | else if (strcmp(optarg, "key-plain") == 0) |
741 | cp = sshkey_alg_list(0, 1, 0, '\n'); | 741 | cp = sshkey_alg_list(0, 1, 0, '\n'); |
742 | else if (strcmp(optarg, "sig") == 0) | 742 | else if (strcmp(optarg, "sig") == 0) |
743 | cp = sshkey_alg_list(0, 0, 1, '\n'); | 743 | cp = sshkey_alg_list(0, 1, 1, '\n'); |
744 | else if (strcmp(optarg, "protocol-version") == 0) | 744 | else if (strcmp(optarg, "protocol-version") == 0) |
745 | cp = xstrdup("2"); | 745 | cp = xstrdup("2"); |
746 | else if (strcmp(optarg, "help") == 0) { | 746 | else if (strcmp(optarg, "help") == 0) { |