diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /kex.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
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 |
@@ -119,6 +120,7 @@ struct Kex { | |||
119 | char *name; | 120 | char *name; |
120 | int hostkey_type; | 121 | int hostkey_type; |
121 | int kex_type; | 122 | int kex_type; |
123 | int roaming; | ||
122 | Buffer my; | 124 | Buffer my; |
123 | Buffer peer; | 125 | Buffer peer; |
124 | sig_atomic_t done; | 126 | sig_atomic_t done; |
@@ -133,7 +135,8 @@ struct Kex { | |||
133 | char *client_version_string; | 135 | char *client_version_string; |
134 | char *server_version_string; | 136 | char *server_version_string; |
135 | int (*verify_host_key)(Key *); | 137 | int (*verify_host_key)(Key *); |
136 | Key *(*load_host_key)(int); | 138 | Key *(*load_host_public_key)(int); |
139 | Key *(*load_host_private_key)(int); | ||
137 | int (*host_key_index)(Key *); | 140 | int (*host_key_index)(Key *); |
138 | void (*kex[KEX_MAX])(Kex *); | 141 | void (*kex[KEX_MAX])(Kex *); |
139 | }; | 142 | }; |