summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-24 12:49:36 +0100
committerColin Watson <cjwatson@debian.org>2018-08-24 12:49:36 +0100
commite6547182a54f0f268ee36e7c99319eeddffbaff2 (patch)
tree417527229ad3f3764ba71ea383f478a168895087 /kex.h
parented6ae9c1a014a08ff5db3d768f01f2e427eeb476 (diff)
parent71508e06fab14bc415a79a08f5535ad7bffa93d9 (diff)
Import openssh_7.8p1.orig.tar.gz
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/kex.h b/kex.h
index 01bb3986a..593de1208 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.83 2017/05/30 14:23:52 markus Exp $ */ 1/* $OpenBSD: kex.h,v 1.91 2018/07/11 18:53:29 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -27,8 +27,6 @@
27#define KEX_H 27#define KEX_H
28 28
29#include "mac.h" 29#include "mac.h"
30#include "buffer.h" /* XXX for typedef */
31#include "key.h" /* XXX for typedef */
32 30
33#ifdef WITH_LEAKMALLOC 31#ifdef WITH_LEAKMALLOC
34#include "leakmalloc.h" 32#include "leakmalloc.h"
@@ -43,6 +41,8 @@
43# define EC_POINT void 41# define EC_POINT void
44# endif /* OPENSSL_HAS_ECC */ 42# endif /* OPENSSL_HAS_ECC */
45#else /* WITH_OPENSSL */ 43#else /* WITH_OPENSSL */
44# define DH void
45# define BIGNUM void
46# define EC_KEY void 46# define EC_KEY void
47# define EC_GROUP void 47# define EC_GROUP void
48# define EC_POINT void 48# define EC_POINT void
@@ -64,6 +64,7 @@
64#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org" 64#define KEX_CURVE25519_SHA256_OLD "curve25519-sha256@libssh.org"
65 65
66#define COMP_NONE 0 66#define COMP_NONE 0
67/* pre-auth compression (COMP_ZLIB) is only supported in the client */
67#define COMP_ZLIB 1 68#define COMP_ZLIB 1
68#define COMP_DELAYED 2 69#define COMP_DELAYED 2
69 70
@@ -139,7 +140,7 @@ struct kex {
139 int hostkey_type; 140 int hostkey_type;
140 int hostkey_nid; 141 int hostkey_nid;
141 u_int kex_type; 142 u_int kex_type;
142 int rsa_sha2; 143 char *server_sig_algs;
143 int ext_info_c; 144 int ext_info_c;
144 struct sshbuf *my; 145 struct sshbuf *my;
145 struct sshbuf *peer; 146 struct sshbuf *peer;
@@ -169,7 +170,7 @@ struct kex {
169int kex_names_valid(const char *); 170int kex_names_valid(const char *);
170char *kex_alg_list(char); 171char *kex_alg_list(char);
171char *kex_names_cat(const char *, const char *); 172char *kex_names_cat(const char *, const char *);
172int kex_assemble_names(const char *, char **); 173int kex_assemble_names(char **, const char *, const char *);
173 174
174int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **); 175int kex_new(struct ssh *, char *[PROPOSAL_MAX], struct kex **);
175int kex_setup(struct ssh *, char *[PROPOSAL_MAX]); 176int kex_setup(struct ssh *, char *[PROPOSAL_MAX]);