New upstream release (7.8p1)

Closes: #907534

1 files changed, 6 insertions, 5 deletions

diff --git a/kex.h b/kex.h
index a708e4868..4e5ead839 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.83 2017/05/30 14:23:52 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.91 2018/07/11 18:53:29 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,8 +27,6 @@
 #define KEX_H
 
 #include "mac.h"
-#include "buffer.h" /* XXX for typedef */
-#include "key.h" /* XXX for typedef */
 
 #ifdef WITH_LEAKMALLOC
 #include "leakmalloc.h"
@@ -43,6 +41,8 @@
 #  define EC_POINT      void
 # endif /* OPENSSL_HAS_ECC */
 #else /* WITH_OPENSSL */
+# define DH             void
+# define BIGNUM         void
 # define EC_KEY         void
 # define EC_GROUP       void
 # define EC_POINT       void
@@ -64,6 +64,7 @@
 #define KEX_CURVE25519_SHA256_OLD       "curve25519-sha256@libssh.org"
 
 #define COMP_NONE       0
+/* pre-auth compression (COMP_ZLIB) is only supported in the client */
 #define COMP_ZLIB       1
 #define COMP_DELAYED    2
 
@@ -142,7 +143,7 @@ struct kex {
         int     hostkey_type;
         int     hostkey_nid;
         u_int   kex_type;
-        int     rsa_sha2;
+        char    *server_sig_algs;
         int     ext_info_c;
         struct sshbuf *my;
         struct sshbuf *peer;
@@ -178,7 +179,7 @@ struct kex {
 int      kex_names_valid(const char *);
 char    *kex_alg_list(char);
 char    *kex_names_cat(const char *, const char *);
-int      kex_assemble_names(const char *, char **);
+int      kex_assemble_names(char **, const char *, const char *);
 
 int      kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **);
 int      kex_setup(struct ssh *, char *[PROPOSAL_MAX]);