diff options
| author |   djm <djm@openbsd.org> | 2017-03-10 04:07:20 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-03-10 04:07:20 +0000 |
| commit | 46f459699014579c32838d7e0b011852ca8f02ed (patch) | |
| tree | fd3da0cd33e8b9c0d06c92e27af0ab8d63810a25 /usr.bin/ssh/ssh.c | |
| parent | Check for NULL return value from key_new. Patch from jjelen at redhat.com (diff) | |
| download | wireguard-openbsd-46f459699014579c32838d7e0b011852ca8f02ed.tar.xz wireguard-openbsd-46f459699014579c32838d7e0b011852ca8f02ed.zip | |
fix regression in 7.4 server-sig-algs, where we were accidentally
excluding SHA2 RSA signature methods. bz#2680, patch from Nuno
Goncalves; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 84e664a0f03..771c2241e0a 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.450 2017/03/08 12:07:47 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.451 2017/03/10 04:07:20 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -653,11 +653,11 @@ main(int ac, char **av) else if (strcmp(optarg, "kex") == 0) cp = kex_alg_list('\n'); else if (strcmp(optarg, "key") == 0) - cp = sshkey_alg_list(0, 0, '\n'); + cp = sshkey_alg_list(0, 0, 0, '\n'); else if (strcmp(optarg, "key-cert") == 0) - cp = sshkey_alg_list(1, 0, '\n'); + cp = sshkey_alg_list(1, 0, 0, '\n'); else if (strcmp(optarg, "key-plain") == 0) - cp = sshkey_alg_list(0, 1, '\n'); + cp = sshkey_alg_list(0, 1, 0, '\n'); else if (strcmp(optarg, "protocol-version") == 0) { #ifdef WITH_SSH1 cp = xstrdup("1\n2"); |