import openssh-4.7p1-gsskex-20070927.patch

1 files changed, 6 insertions, 2 deletions

diff --git a/kex.h b/kex.h
index 51d224c87..bd763a074 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: kex.h,v 1.46 2007/06/07 19:37:34 pvalchev Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -28,6 +28,7 @@
 
 #include <signal.h>
 #include <openssl/evp.h>
+#include <openssl/hmac.h>
 
 #define KEX_DH1                 "diffie-hellman-group1-sha1"
 #define KEX_DH14                "diffie-hellman-group14-sha1"
@@ -89,10 +90,13 @@ struct Enc {
 struct Mac {
         char    *name;
         int     enabled;
-        const EVP_MD    *md;
         u_int   mac_len;
         u_char  *key;
         u_int   key_len;
+        int     type;
+        const EVP_MD    *evp_md;
+        HMAC_CTX        evp_ctx;
+        struct umac_ctx *umac_ctx;
 };
 struct Comp {
         int     type;