Attachment 2829 Details for Bug 2588 – Patch that fixes reported macs

[patch] Patch that fixes reported macs

fixopenssh.patch (text/plain), 1.40 KB, created by Ashley on 2016-06-14 15:04:18 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ashley

Created: 2016-06-14 15:04:18 AEST

Size: 1.40 KB

patch

obsolete

>--- openssh-portable-V_7_2_P2/myproposal.h	2016-03-09 19:04:48.000000000 +0100
>+++ openssh-portable-V_7_2_P2_fixed/myproposal.h	2016-06-14 06:58:11.550690397 +0200
>@@ -69,12 +69,16 @@
> #ifdef HAVE_EVP_SHA256
> # define KEX_SHA256_METHODS \
> 	"diffie-hellman-group-exchange-sha256,"
>-#define	SHA2_HMAC_MODES \
>+# define SHA2_HMAC_MODES \
> 	"hmac-sha2-256," \
> 	"hmac-sha2-512,"
>+# define SHA2_HMAC_ETM_MODES \
>+	"hmac-sha2-256-etm@openssh.com," \
>+	"hmac-sha2-512-etm@openssh.com,"
> #else
> # define KEX_SHA256_METHODS
> # define SHA2_HMAC_MODES
>+# define SHA2_HMAC_ETM_MODES
> #endif
> 
> #ifdef WITH_OPENSSL
>@@ -118,13 +122,11 @@
> #define KEX_SERVER_MAC \
> 	"umac-64-etm@openssh.com," \
> 	"umac-128-etm@openssh.com," \
>-	"hmac-sha2-256-etm@openssh.com," \
>-	"hmac-sha2-512-etm@openssh.com," \
>+	SHA2_HMAC_ETM_MODES \
> 	"hmac-sha1-etm@openssh.com," \
> 	"umac-64@openssh.com," \
> 	"umac-128@openssh.com," \
>-	"hmac-sha2-256," \
>-	"hmac-sha2-512," \
>+	SHA2_HMAC_MODES \
> 	"hmac-sha1"
> 
> #define KEX_CLIENT_MAC KEX_SERVER_MAC
>@@ -142,13 +144,11 @@
> #define	KEX_SERVER_MAC \
> 	"umac-64-etm@openssh.com," \
> 	"umac-128-etm@openssh.com," \
>-	"hmac-sha2-256-etm@openssh.com," \
>-	"hmac-sha2-512-etm@openssh.com," \
>+	SHA2_HMAC_ETM_MODES \
> 	"hmac-sha1-etm@openssh.com," \
> 	"umac-64@openssh.com," \
> 	"umac-128@openssh.com," \
>-	"hmac-sha2-256," \
>-	"hmac-sha2-512," \
>+	SHA2_HMAC_MODES \
> 	"hmac-sha1"
> 
> #define KEX_CLIENT_KEX KEX_SERVER_KEX

Actions: View | Diff

Attachments on bug 2588: 2829