merged OpenSSH 3.5p1 to trunk

[gssapi-openssh.git] / openssh / kex.h

diff --git a/openssh/kex.h b/openssh/kex.h
index 2bd86ade6de21d5d4fbe69ba5791106878399824..98e13d9609c87b2546ad8b78263e5ff37eff2894 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kex.h,v 1.30 2002/03/18 17:50:31 provos Exp $ */
+/*     $OpenBSD: kex.h,v 1.32 2002/09/09 14:54:14 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -80,7 +80,7 @@ struct Enc {
 struct Mac {
        char    *name;
        int     enabled;
-       EVP_MD  *md;
+       const EVP_MD    *md;
        int     mac_len;
        u_char  *key;
        int     key_len;
@@ -102,7 +102,7 @@ struct KexOptions {
 
 struct Kex {
        u_char  *session_id;
-       int     session_id_len;
+       u_int   session_id_len;
        Newkeys *newkeys[MODE_MAX];
        int     we_need;
        int     server;