summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-07-31 03:07:24 +0000
committerDamien Miller <djm@mindrot.org>2018-07-31 13:13:26 +1000
commit1a66079c0669813306cc69e5776a4acd9fb49015 (patch)
tree892eb2fcddac9189cc1d8e7a9b821bde27ba1014 /sshd.c
parent87f08be054b7eeadbb9cdeb3fb4872be79ccf218 (diff)
upstream: fix some memory leaks spotted by Coverity via Jakub Jelen
in bz#2366 feedback and ok dtucker@ OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sshd.c b/sshd.c
index d7d6f2b26..d3bd8fdaa 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.512 2018/07/11 18:53:29 markus Exp $ */ 1/* $OpenBSD: sshd.c,v 1.513 2018/07/31 03:07:24 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2268,11 +2268,11 @@ do_ssh2_kex(void)
2268 int r; 2268 int r;
2269 2269
2270 myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( 2270 myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
2271 options.kex_algorithms); 2271 options.kex_algorithms, datafellows);
2272 myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal( 2272 myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(
2273 options.ciphers); 2273 options.ciphers, datafellows);
2274 myproposal[PROPOSAL_ENC_ALGS_STOC] = compat_cipher_proposal( 2274 myproposal[PROPOSAL_ENC_ALGS_STOC] = compat_cipher_proposal(
2275 options.ciphers); 2275 options.ciphers, datafellows);
2276 myproposal[PROPOSAL_MAC_ALGS_CTOS] = 2276 myproposal[PROPOSAL_MAC_ALGS_CTOS] =
2277 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; 2277 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
2278 2278
@@ -2286,7 +2286,7 @@ do_ssh2_kex(void)
2286 options.rekey_interval); 2286 options.rekey_interval);
2287 2287
2288 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( 2288 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
2289 list_hostkey_types()); 2289 list_hostkey_types(), datafellows);
2290 2290
2291 /* start key exchange */ 2291 /* start key exchange */
2292 if ((r = kex_setup(active_state, myproposal)) != 0) 2292 if ((r = kex_setup(active_state, myproposal)) != 0)