diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-03-10 05:07:20 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-03-10 05:35:39 +0100 |
| commit | 183ba55aaaecca0206184b854ad6155df237adbe (patch) | |
| tree | a62c9a5478a8a265d0adf044ccedb2d6b480f16e /kex.c | |
| parent | upstream commit (diff) | |
| download | openssh-183ba55aaaecca0206184b854ad6155df237adbe.tar.xz openssh-183ba55aaaecca0206184b854ad6155df237adbe.zip | |
upstream commit
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@
Upstream-ID: 81ac8bfb30960447740b9b8f6a214dcf322f12e8
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.129 2017/03/10 03:45:40 dtucker Exp $ */ +/* $OpenBSD: kex.c,v 1.130 2017/03/10 04:07:20 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -350,7 +350,7 @@ kex_send_ext_info(struct ssh *ssh) int r; char *algs; - if ((algs = sshkey_alg_list(0, 1, ',')) == NULL) + if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL) return SSH_ERR_ALLOC_FAIL; if ((r = sshpkt_start(ssh, SSH2_MSG_EXT_INFO)) != 0 || (r = sshpkt_put_u32(ssh, 1)) != 0 || |