X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fprotocol.h;h=a6ce666a1d28c3a7e94c3a77da40c531c328e2dc;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=21c3d193bd987bf00aa024713eae8b88e2a6e439;hpb=2dc218143c7859f7529396dc121ae08e2fd78da0;p=silc.git

diff --git a/apps/silcd/protocol.h b/apps/silcd/protocol.h
index 21c3d193..a6ce666a 100644
--- a/apps/silcd/protocol.h
+++ b/apps/silcd/protocol.h
@@ -51,6 +51,7 @@ typedef struct {
 
   SilcTask timeout_task;
   SilcPacketContext *packet;
+  SilcSKESecurityPropertyFlag flags;
   SilcSKE ske;
   SilcSKEKeyMaterial *keymat;
 } SilcServerKEInternalContext;
@@ -67,16 +68,12 @@ typedef struct {
   /* SKE object from Key Exchange protocol. */
   SilcSKE ske;
 
-  /* Auth method that must be used. This is resolved before this
-     connection authentication protocol is started. Used when we are
-     initiating. */
-  uint32 auth_meth;
-
-  /* Authentication data if we alreay know it. This is filled before
-     starting the protocol if we know the authentication data. Otherwise
-     these are and remain NULL. Used when we are initiating. */
+  /* Authentication method and data if we alreay know it. This is filled
+     before starting the protocol if we know the authentication data.
+     Otherwise these are and remain NULL. Used when we are initiating. */
+  SilcUInt32 auth_meth;
   void *auth_data;
-  uint32 auth_data_len;
+  SilcUInt32 auth_data_len;
 
   /* Destinations ID from KE protocol context */
   void *dest_id;
@@ -89,7 +86,7 @@ typedef struct {
 
   SilcTask timeout_task;
   SilcPacketContext *packet;
-  uint16 conn_type;
+  SilcUInt16 conn_type;
 } SilcServerConnAuthInternalContext;
 
 /* Internal context for the rekey protocol */
@@ -106,7 +103,8 @@ typedef struct {
 /* Prototypes */
 void silc_server_protocols_register(void);
 void silc_server_protocols_unregister(void);
-int silc_server_protocol_ke_set_keys(SilcSKE ske,
+int silc_server_protocol_ke_set_keys(SilcServer server,
+				     SilcSKE ske,
 				     SilcSocketConnection sock,
 				     SilcSKEKeyMaterial *keymat,
 				     SilcCipher cipher,