summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorSimon Wilkinson <simon@sxw.org.uk>2014-02-09 16:09:48 +0000
committerColin Watson <cjwatson@debian.org>2016-01-14 15:07:15 +0000
commit6a0a4b2f79889c9b0d5e2478a6ee5f51be38dcc9 (patch)
tree2f8cd5a92310d9ed3b7020366f3030fc0d1b53a4 /kex.h
parenteeff4de96f5d7365750dc56912c2c62b5c28db6b (diff)
GSSAPI key exchange support
This patch has been rejected upstream: "None of the OpenSSH developers are in favour of adding this, and this situation has not changed for several years. This is not a slight on Simon's patch, which is of fine quality, but just that a) we don't trust GSSAPI implementations that much and b) we don't like adding new KEX since they are pre-auth attack surface. This one is particularly scary, since it requires hooks out to typically root-owned system resources." However, quite a lot of people rely on this in Debian, and it's better to have it merged into the main openssh package rather than having separate -krb5 packages (as we used to have). It seems to have a generally good security history. Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 Last-Updated: 2016-01-04 Patch-Name: gssapi.patch
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/kex.h b/kex.h
index d71b53293..ee468157c 100644
--- a/kex.h
+++ b/kex.h
@@ -93,6 +93,9 @@ enum kex_exchange {
93 KEX_DH_GEX_SHA256, 93 KEX_DH_GEX_SHA256,
94 KEX_ECDH_SHA2, 94 KEX_ECDH_SHA2,
95 KEX_C25519_SHA256, 95 KEX_C25519_SHA256,
96 KEX_GSS_GRP1_SHA1,
97 KEX_GSS_GRP14_SHA1,
98 KEX_GSS_GEX_SHA1,
96 KEX_MAX 99 KEX_MAX
97}; 100};
98 101
@@ -139,6 +142,12 @@ struct kex {
139 u_int flags; 142 u_int flags;
140 int hash_alg; 143 int hash_alg;
141 int ec_nid; 144 int ec_nid;
145#ifdef GSSAPI
146 int gss_deleg_creds;
147 int gss_trust_dns;
148 char *gss_host;
149 char *gss_client;
150#endif
142 char *client_version_string; 151 char *client_version_string;
143 char *server_version_string; 152 char *server_version_string;
144 char *failed_choice; 153 char *failed_choice;
@@ -187,6 +196,11 @@ int kexecdh_server(struct ssh *);
187int kexc25519_client(struct ssh *); 196int kexc25519_client(struct ssh *);
188int kexc25519_server(struct ssh *); 197int kexc25519_server(struct ssh *);
189 198
199#ifdef GSSAPI
200int kexgss_client(struct ssh *);
201int kexgss_server(struct ssh *);
202#endif
203
190int kex_dh_hash(const char *, const char *, 204int kex_dh_hash(const char *, const char *,
191 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t, 205 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
192 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *); 206 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);