X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fprotocol.h;h=9d93709210bd550ea29801218564d2c1b3ec225e;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=fc73f6de37e018723cad55286fa19065f1d034fb;hpb=5159d7204e05ab1fbefdc5fd351ec4da021ce577;p=silc.git

diff --git a/lib/silcclient/protocol.h b/lib/silcclient/protocol.h
index fc73f6de..9d937092 100644
--- a/lib/silcclient/protocol.h
+++ b/lib/silcclient/protocol.h
@@ -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;
@@ -81,7 +81,6 @@ typedef struct {
   bool responder;		    /* TRUE if we are receiving party */
   bool pfs;			    /* TRUE if PFS is to be used */
   SilcSKE ske;			    /* Defined if PFS is used */
-  SilcSKEKeyMaterial *keymat;	    /* Defined if PFS is used */
   SilcPacketContext *packet;
 } SilcClientRekeyInternalContext;
 
@@ -92,11 +91,13 @@ void silc_client_protocol_ke_send_packet(SilcSKE ske,
 					 SilcBuffer packet,
 					 SilcPacketType type,
 					 void *context);
-SilcSKEStatus silc_client_protocol_ke_verify_key(SilcSKE ske,
-						 unsigned char *pk_data,
-						 uint32 pk_len,
-						 SilcSKEPKType pk_type,
-						 void *context);
+void silc_client_protocol_ke_verify_key(SilcSKE ske,
+					unsigned char *pk_data,
+					SilcUInt32 pk_len,
+					SilcSKEPKType pk_type,
+					void *context,
+					SilcSKEVerifyCbCompletion completion,
+					void *completion_context);
 void silc_client_protocol_ke_set_keys(SilcSKE ske,
 				      SilcSocketConnection sock,
 				      SilcSKEKeyMaterial *keymat,
@@ -104,11 +105,7 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske,
 				      SilcPKCS pkcs,
 				      SilcHash hash,
 				      SilcHmac hmac,
-				      SilcSKEDiffieHellmanGroup group);
-void silc_client_protocol_rekey_generate(SilcClient client,
-					 SilcClientRekeyInternalContext *ctx);
-void 
-silc_client_protocol_rekey_generate_pfs(SilcClient client,
-					SilcClientRekeyInternalContext *ctx);
+				      SilcSKEDiffieHellmanGroup group,
+				      bool is_responder);
 
 #endif