Merged silc_1_0_branch to trunk.

[silc.git] / lib / silcclient / protocol.h

diff --git a/lib/silcclient/protocol.h b/lib/silcclient/protocol.h
index b74bd6f7b8e0f168c563b09ef89ab838aa2ee99b..019fa37adbc5af7364bacec5e30b73021c389b2a 100644 (file)
--- a/lib/silcclient/protocol.h
+++ b/lib/silcclient/protocol.h
@@ -2,15 +2,14 @@
 
   protocol.h
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2004 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -52,6 +51,7 @@ typedef struct {
 typedef struct {
   void *client;
   SilcSocketConnection sock;
+  SilcClientConnectionStatus status;
 
   /* SKE object from Key Exchange protocol. */
   SilcSKE ske;
@@ -68,7 +68,7 @@ typedef struct {
      starting the protocol if we know the authentication data. Otherwise
      these are and remain NULL. */
   unsigned char *auth_data;
-  uint32 auth_data_len;
+  SilcUInt32 auth_data_len;
 
   SilcTask timeout_task;
 } SilcClientConnAuthInternalContext;
@@ -93,7 +93,7 @@ void silc_client_protocol_ke_send_packet(SilcSKE ske,
                                         void *context);
 void silc_client_protocol_ke_verify_key(SilcSKE ske,
                                        unsigned char *pk_data,
-                                       uint32 pk_len,
+                                       SilcUInt32 pk_len,
                                        SilcSKEPKType pk_type,
                                        void *context,
                                        SilcSKEVerifyCbCompletion completion,
@@ -105,6 +105,7 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske,
                                      SilcPKCS pkcs,
                                      SilcHash hash,
                                      SilcHmac hmac,
-                                     SilcSKEDiffieHellmanGroup group);
+                                     SilcSKEDiffieHellmanGroup group,
+                                     bool is_responder);
 
 #endif