summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2023-12-18 15:59:40 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2023-12-18 15:59:40 +0000
commit38f55691cb1b1029d9daac42fc5b6b1850eb19c3 (patch)
treea66568e01138feb4d26caadd0b5532a17f8d58c6 /sshd.c
parentb3ced7f26826767e378a5970a65d875fc1cad61e (diff)
Vendor import of OpenSSH 9.6p1vendor/openssh/9.6p1
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index 8524808f94b9..9cbe92293371 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.600 2023/03/08 04:43:12 guenther Exp $ */
+/* $OpenBSD: sshd.c,v 1.601 2023/12/18 14:45:49 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2405,7 +2405,9 @@ do_ssh2_kex(struct ssh *ssh)
/* start key exchange */
if ((r = kex_setup(ssh, myproposal)) != 0)
fatal_r(r, "kex_setup");
+ kex_set_server_sig_algs(ssh, options.pubkey_accepted_algos);
kex = ssh->kex;
+
#ifdef WITH_OPENSSL
kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;