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

diff --git a/apps/silcd/protocol.h b/apps/silcd/protocol.h
index e26a58e0..a6ce666a 100644
--- a/apps/silcd/protocol.h
+++ b/apps/silcd/protocol.h
@@ -22,10 +22,12 @@
 #define PROTOCOL_H
 
 /* SILC client protocol types */
-#define SILC_PROTOCOL_SERVER_NONE 0
-#define SILC_PROTOCOL_SERVER_CONNECTION_AUTH 1
-#define SILC_PROTOCOL_SERVER_KEY_EXCHANGE 2
-/* #define SILC_PROTOCOL_SERVER_MAX 255 */
+#define SILC_PROTOCOL_SERVER_NONE               0
+#define SILC_PROTOCOL_SERVER_CONNECTION_AUTH    1
+#define SILC_PROTOCOL_SERVER_KEY_EXCHANGE       2
+#define SILC_PROTOCOL_SERVER_REKEY              3
+#define SILC_PROTOCOL_SERVER_BACKUP             4
+/* #define SILC_PROTOCOL_SERVER_MAX             255 */
 
 /* Internal context for Key Exchange protocol. */
 typedef struct {
@@ -35,15 +37,21 @@ typedef struct {
   SilcRng rng;
 
   /* TRUE if we are receiveing part of the protocol */
-  int responder;
+  bool responder;
 
   /* Destinations ID taken from authenticataed packet so that we can
      get the destinations ID. */
   void *dest_id;
   SilcIdType dest_id_type;
 
+  /* Pointer to the configurations. */
+  void *cconfig;
+  void *sconfig;
+  void *rconfig;
+
   SilcTask timeout_task;
   SilcPacketContext *packet;
+  SilcSKESecurityPropertyFlag flags;
   SilcSKE ske;
   SilcSKEKeyMaterial *keymat;
 } SilcServerKEInternalContext;
@@ -55,41 +63,55 @@ typedef struct {
   SilcSocketConnection sock;
 
   /* TRUE if we are receiving part of the protocol */
-  int responder;
+  bool responder;
 
   /* 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;
   SilcIdType dest_id_type;
 
+  /* Pointer to the configurations. */
+  void *cconfig;
+  void *sconfig;
+  void *rconfig;
+
   SilcTask timeout_task;
   SilcPacketContext *packet;
-  uint16 conn_type;
+  SilcUInt16 conn_type;
 } SilcServerConnAuthInternalContext;
 
+/* Internal context for the rekey protocol */
+typedef struct {
+  void *server;
+  void *context;
+  SilcSocketConnection sock;
+  bool responder;		    /* TRUE if we are receiving party */
+  bool pfs;			    /* TRUE if PFS is to be used */
+  SilcSKE ske;			    /* Defined if PFS is used */
+  SilcPacketContext *packet;
+} SilcServerRekeyInternalContext;
+
 /* 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,
 				     SilcPKCS pkcs,
 				     SilcHash hash,
 				     SilcHmac hmac,
-				     int is_responder);
+				     SilcSKEDiffieHellmanGroup group,
+				     bool is_responder);
 
 #endif