summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2016-09-06 09:14:05 +0000
committerDarren Tucker <dtucker@zip.com.au>2016-09-12 13:39:30 +1000
commite5e8d9114ac6837a038f4952994ca95a97fafe8d (patch)
treeb2c4a75f573ca5d639127e18a6c13ed16599f296 /kex.c
parentda95318dbedbaa1335323dba370975c2f251afd8 (diff)
upstream commit
update ext_info_c every time we receive a kexinit msg; fixes sending of ext_info if privsep is disabled; report Aris Adamantiadis & Mancha; ok djm@ Upstream-ID: 2ceaa1076e19dbd3542254b4fb8e42d608f28856
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kex.c b/kex.c
index 50c7a0f9b..1e3bdad55 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.c,v 1.118 2016/05/02 10:26:04 djm Exp $ */ 1/* $OpenBSD: kex.c,v 1.119 2016/09/06 09:14:05 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -775,10 +775,8 @@ kex_choose_conf(struct ssh *ssh)
775 char *ext; 775 char *ext;
776 776
777 ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL); 777 ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL);
778 if (ext) { 778 kex->ext_info_c = (ext != NULL);
779 kex->ext_info_c = 1; 779 free(ext);
780 free(ext);
781 }
782 } 780 }
783 781
784 /* Algorithm Negotiation */ 782 /* Algorithm Negotiation */