diff options
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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.49 2010/02/26 20:29:54 djm 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; |
@@ -124,7 +126,8 @@ struct Kex { | |||
124 | char *client_version_string; | 126 | char *client_version_string; |
125 | char *server_version_string; | 127 | char *server_version_string; |
126 | int (*verify_host_key)(Key *); | 128 | int (*verify_host_key)(Key *); |
127 | Key *(*load_host_key)(int); | 129 | Key *(*load_host_public_key)(int); |
130 | Key *(*load_host_private_key)(int); | ||
128 | int (*host_key_index)(Key *); | 131 | int (*host_key_index)(Key *); |
129 | void (*kex[KEX_MAX])(Kex *); | 132 | void (*kex[KEX_MAX])(Kex *); |
130 | }; | 133 | }; |