import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 7 insertions, 6 deletions

diff --git a/kex.h b/kex.h
index 1c4d1a718..51d224c87 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $    */
+/* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,14 +26,13 @@
 #ifndef KEX_H
 #define KEX_H
 
+#include <signal.h>
 #include <openssl/evp.h>
-#include "buffer.h"
-#include "cipher.h"
-#include "key.h"
 
 #define KEX_DH1                 "diffie-hellman-group1-sha1"
 #define KEX_DH14                "diffie-hellman-group14-sha1"
 #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
+#define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
 
 #define COMP_NONE       0
 #define COMP_ZLIB       1
@@ -63,7 +62,9 @@ enum kex_exchange {
         KEX_DH_GRP1_SHA1,
         KEX_DH_GRP14_SHA1,
         KEX_DH_GEX_SHA1,
+        KEX_DH_GEX_SHA256,
         KEX_GSS_GRP1_SHA1,
+        KEX_GSS_GRP14_SHA1,
         KEX_GSS_GEX_SHA1,
         KEX_MAX
 };
@@ -114,7 +115,7 @@ struct Kex {
         int     kex_type;
         Buffer  my;
         Buffer  peer;
-        int     done;
+        sig_atomic_t done;
         int     flags;
         const EVP_MD *evp_md;
 #ifdef GSSAPI
@@ -154,7 +155,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
     BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
 void
 kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
-    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, 
+    int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
     BIGNUM *, BIGNUM *, u_char **, u_int *);
 
 void