Attachment 3205 Details for Bug 2929 – only consider ext-info-c during initial KEX

[patch] only consider ext-info-c during initial KEX

bz2929.diff (text/plain), 1.12 KB, created by Damien Miller on 2018-11-16 13:23:32 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2018-11-16 13:23:32 AEDT

Size: 1.12 KB

patch

obsolete

>diff --git a/kex.c b/kex.c
>index 25f9f66f..89915c1c 100644
>--- a/kex.c
>+++ b/kex.c
>@@ -487,6 +487,7 @@ kex_input_newkeys(int type, u_int32_t seq, struct ssh *ssh)
> 	if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
> 		return r;
> 	kex->done = 1;
>+	kex->flags &= ~KEX_INITIAL;
> 	sshbuf_reset(kex->peer);
> 	/* sshbuf_reset(kex->my); */
> 	kex->flags &= ~KEX_INIT_SENT;
>@@ -594,6 +595,7 @@ kex_new(struct ssh *ssh, char *proposal[PROPOSAL_MAX], struct kex **kexp)
> 	if ((r = kex_prop2buf(kex->my, proposal)) != 0)
> 		goto out;
> 	kex->done = 0;
>+	kex->flags = KEX_INITIAL;
> 	kex_reset_dispatch(ssh);
> 	ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);
> 	r = 0;
>@@ -839,7 +841,7 @@ kex_choose_conf(struct ssh *ssh)
> 	}
> 
> 	/* Check whether client supports ext_info_c */
>-	if (kex->server) {
>+	if (kex->server && (kex->flags & KEX_INITIAL)) {
> 		char *ext;
> 
> 		ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL);
>diff --git a/kex.h b/kex.h
>index 593de120..a5d41b1f 100644
>--- a/kex.h
>+++ b/kex.h
>@@ -104,6 +104,7 @@ enum kex_exchange {
> };
> 
> #define KEX_INIT_SENT	0x0001
>+#define KEX_INITIAL	0x0002
> 
> struct sshenc {
> 	char	*name;

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2929: 3205 | 3316