upstream: revert compat.[ch] section of the following change. It

causes double-free under some circumstances.

--

date: 2018/07/31 03:07:24;  author: djm;  state: Exp;  lines: +33 -18;  commitid: f7g4UI8eeOXReTPh;
fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366
feedback and ok dtucker@

OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137

1 files changed, 5 insertions, 5 deletions

diff --git a/sshd.c b/sshd.c
index d3bd8fdaa..a738c3ab6 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.513 2018/07/31 03:07:24 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.514 2018/08/13 02:41:05 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2268,11 +2268,11 @@ do_ssh2_kex(void)
         int r;
 
         myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
-            options.kex_algorithms, datafellows);
+            options.kex_algorithms);
         myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(
-            options.ciphers, datafellows);
+            options.ciphers);
         myproposal[PROPOSAL_ENC_ALGS_STOC] = compat_cipher_proposal(
-            options.ciphers, datafellows);
+            options.ciphers);
         myproposal[PROPOSAL_MAC_ALGS_CTOS] =
             myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
 
@@ -2286,7 +2286,7 @@ do_ssh2_kex(void)
                     options.rekey_interval);
 
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
-            list_hostkey_types(), datafellows);
+            list_hostkey_types());
 
         /* start key exchange */
         if ((r = kex_setup(active_state, myproposal)) != 0)