Attachment 3242 Details for Bug 2967 – Fix SSH client algorithm advertisements.

[patch] Fix SSH client algorithm advertisements.

0001-Fix-SSH-client-algorithm-advertisements.patch (text/plain), 1.31 KB, created by NUXI on 2019-02-11 08:10:00 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: NUXI

Created: 2019-02-11 08:10:00 AEDT

Size: 1.31 KB

patch

obsolete

>From ddd2aaa68e5a22cf337047cbb267996ba4ad13b1 Mon Sep 17 00:00:00 2001
>From: Jon DeVree <nuxi@vault24.org>
>Date: Sun, 10 Feb 2019 15:52:05 -0500
>Subject: [PATCH] Fix SSH client algorithm advertisements.
>
>The changes in 1b9dd4aa ("upstream: better diagnosics on alg list
>assembly errors") accidently used the SSH server's definitions in the
>client in the new code.
>
>The only difference between the lists is that the client is still
>supposed to support "diffie-hellman-group-exchange-sha1" and wasn't.
>---
> readconf.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/readconf.c b/readconf.c
>index 7331ef5a..52b4ae39 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -2122,9 +2122,9 @@ fill_default_options(Options * options)
> 		    defaults, all)) != 0) \
> 			fatal("%s: %s: %s", __func__, #what, ssh_err(r)); \
> 	} while (0)
>-	ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, all_cipher);
>-	ASSEMBLE(macs, KEX_SERVER_MAC, all_mac);
>-	ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
>+	ASSEMBLE(ciphers, KEX_CLIENT_ENCRYPT, all_cipher);
>+	ASSEMBLE(macs, KEX_CLIENT_MAC, all_mac);
>+	ASSEMBLE(kex_algorithms, KEX_CLIENT_KEX, all_kex);
> 	ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
> 	ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key);
> 	ASSEMBLE(ca_sign_algorithms, SSH_ALLOWED_CA_SIGALGS, all_sig);
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 2967: 3242