summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-06-17 12:59:34 +1000
committerDamien Miller <djm@mindrot.org>2005-06-17 12:59:34 +1000
commiteccb9de72aa29da5a3fad87a4287b32438689c1f (patch)
tree9b8ef20a7e454b984e0ad67b54b2bdc5577aa2fa /kex.h
parent677257fe07dd2b9a58817e1d42fc2c25bb618a4d (diff)
- djm@cvs.openbsd.org 2005/06/17 02:44:33
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c] [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c] [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c] [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c] [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c] make this -Wsign-compare clean; ok avsm@ markus@ NB. auth1.c changes not committed yet (conflicts with uncommitted sync) NB2. more work may be needed to make portable Wsign-compare clean
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kex.h b/kex.h
index d9e9d6522..059d83cd5 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.36 2005/06/17 02:44:32 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.
@@ -83,9 +83,9 @@ struct Mac {
83 char *name; 83 char *name;
84 int enabled; 84 int enabled;
85 const EVP_MD *md; 85 const EVP_MD *md;
86 int mac_len; 86 u_int mac_len;
87 u_char *key; 87 u_char *key;
88 int key_len; 88 u_int key_len;
89}; 89};
90struct Comp { 90struct Comp {
91 int type; 91 int type;
@@ -101,7 +101,7 @@ struct Kex {
101 u_char *session_id; 101 u_char *session_id;
102 u_int session_id_len; 102 u_int session_id_len;
103 Newkeys *newkeys[MODE_MAX]; 103 Newkeys *newkeys[MODE_MAX];
104 int we_need; 104 u_int we_need;
105 int server; 105 int server;
106 char *name; 106 char *name;
107 int hostkey_type; 107 int hostkey_type;