summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 16:50:41 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 16:50:41 +1100
commit36331b5d6cf8f776a27fe6fc3ed19da4f4c2ad91 (patch)
treebaa7665a21214b1f80dbd9e3df2afcfffe0c2ebf /kex.h
parentb7b17be4c0e235b670fb642a394abfe2e9b68cef (diff)
- andreas@cvs.openbsd.org 2009/10/24 11:13:54
[sshconnect2.c kex.h kex.c] Let the client detect if the server supports roaming by looking for the resume@appgate.com kex algorithm. ok markus@
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index 68c80c5a9..1fa13799d 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.47 2009/05/27 06:34:36 andreas Exp $ */ 1/* $OpenBSD: kex.h,v 1.48 2009/10/24 11:13:54 andreas 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.
@@ -36,6 +36,7 @@
36#define KEX_DH14 "diffie-hellman-group14-sha1" 36#define KEX_DH14 "diffie-hellman-group14-sha1"
37#define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" 37#define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1"
38#define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" 38#define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256"
39#define KEX_RESUME "resume@appgate.com"
39 40
40#define COMP_NONE 0 41#define COMP_NONE 0
41#define COMP_ZLIB 1 42#define COMP_ZLIB 1
@@ -116,6 +117,7 @@ struct Kex {
116 char *name; 117 char *name;
117 int hostkey_type; 118 int hostkey_type;
118 int kex_type; 119 int kex_type;
120 int roaming;
119 Buffer my; 121 Buffer my;
120 Buffer peer; 122 Buffer peer;
121 sig_atomic_t done; 123 sig_atomic_t done;