summaryrefslogtreecommitdiffstats
path: root/sshd.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:20:57 +0000
commitd1667913ba37d7f61712e06dd6dd4919fe36a053 (patch)
tree3b79bcd5316ce3cc395ffa0275b54faded8b2b92 /sshd.c
parentReleasing progress-linux version 1:9.6p1-5~progress7.99u1. (diff)
downloadopenssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.tar.xz
openssh-d1667913ba37d7f61712e06dd6dd4919fe36a053.zip
Merging upstream version 1:9.7p1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 9cbe922..b4f2b97 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.601 2023/12/18 14:45:49 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.602 2024/01/08 00:34:34 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2428,6 +2428,7 @@ do_ssh2_kex(struct ssh *ssh)
kex->sign = sshd_hostkey_sign;
ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &kex->done);
+ kex_proposal_free_entries(myproposal);
#ifdef DEBUG_KEXDH
/* send 1st encrypted/maced/compressed message */
@@ -2437,7 +2438,6 @@ do_ssh2_kex(struct ssh *ssh)
(r = ssh_packet_write_wait(ssh)) != 0)
fatal_fr(r, "send test");
#endif
- kex_proposal_free_entries(myproposal);
debug("KEX done");
}