summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-09-14 12:45:47 +0000
committerColin Watson <cjwatson@debian.org>2005-09-14 12:45:47 +0000
commit9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch)
treed4ea8fdb30c7949c6433f5277c39548ea579d4dc /kex.h
parented07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff)
parent16704d57999d987fb8d9ba53379841a79f016d67 (diff)
Merge 4.2p1 to the trunk.
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/kex.h b/kex.h
index d9e9d6522..3024a2717 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.35 2004/06/13 12:53:24 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.37 2005/07/25 11:59:39 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.
@@ -35,6 +35,10 @@
35#define KEX_DH14 "diffie-hellman-group14-sha1" 35#define KEX_DH14 "diffie-hellman-group14-sha1"
36#define KEX_DHGEX "diffie-hellman-group-exchange-sha1" 36#define KEX_DHGEX "diffie-hellman-group-exchange-sha1"
37 37
38#define COMP_NONE 0
39#define COMP_ZLIB 1
40#define COMP_DELAYED 2
41
38enum kex_init_proposals { 42enum kex_init_proposals {
39 PROPOSAL_KEX_ALGS, 43 PROPOSAL_KEX_ALGS,
40 PROPOSAL_SERVER_HOST_KEY_ALGS, 44 PROPOSAL_SERVER_HOST_KEY_ALGS,
@@ -83,9 +87,9 @@ struct Mac {
83 char *name; 87 char *name;
84 int enabled; 88 int enabled;
85 const EVP_MD *md; 89 const EVP_MD *md;
86 int mac_len; 90 u_int mac_len;
87 u_char *key; 91 u_char *key;
88 int key_len; 92 u_int key_len;
89}; 93};
90struct Comp { 94struct Comp {
91 int type; 95 int type;
@@ -101,7 +105,7 @@ struct Kex {
101 u_char *session_id; 105 u_char *session_id;
102 u_int session_id_len; 106 u_int session_id_len;
103 Newkeys *newkeys[MODE_MAX]; 107 Newkeys *newkeys[MODE_MAX];
104 int we_need; 108 u_int we_need;
105 int server; 109 int server;
106 char *name; 110 char *name;
107 int hostkey_type; 111 int hostkey_type;