From d6c19226261ef77f97358bdae5787f4950c378db Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 11 Feb 2007 18:04:15 +0000
Subject: [PATCH] 	Added SilcAsyncOperation to all SKE
 initiator/responder functions.

---
 lib/silcske/silcske.c | 16 ++++-----
 lib/silcske/silcske.h | 80 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index 780a9d2f..8f457086 100644
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -1785,11 +1785,10 @@ SILC_FSM_STATE(silc_ske_st_initiator_failure)
 
 /* Starts the protocol as initiator */
 
-SilcAsyncOperation
-silc_ske_initiator(SilcSKE ske,
-		   SilcPacketStream stream,
-		   SilcSKEParams params,
-		   SilcSKEStartPayload start_payload)
+SilcAsyncOperation silc_ske_initiator(SilcSKE ske,
+				      SilcPacketStream stream,
+				      SilcSKEParams params,
+				      SilcSKEStartPayload start_payload)
 {
   SILC_LOG_DEBUG(("Start SKE as initiator"));
 
@@ -2356,10 +2355,9 @@ SILC_FSM_STATE(silc_ske_st_responder_error)
 
 /* Starts the protocol as responder. */
 
-SilcAsyncOperation
-silc_ske_responder(SilcSKE ske,
-		   SilcPacketStream stream,
-		   SilcSKEParams params)
+SilcAsyncOperation silc_ske_responder(SilcSKE ske,
+				      SilcPacketStream stream,
+				      SilcSKEParams params)
 {
   SILC_LOG_DEBUG(("Start SKE as responder"));
 
diff --git a/lib/silcske/silcske.h b/lib/silcske/silcske.h
index 92bf6218..8bba8ed0 100644
--- a/lib/silcske/silcske.h
+++ b/lib/silcske/silcske.h
@@ -434,7 +434,7 @@ void silc_ske_set_callbacks(SilcSKE ske,
  *    silc_ske_initiator(SilcSKE ske,
  *                       SilcPacketStream stream,
  *                       SilcSKEParams params,
-                         SilcSKEStartPayload start_payload);
+ *                       SilcSKEStartPayload start_payload);
  *
  * DESCRIPTION
  *
@@ -458,11 +458,10 @@ void silc_ske_set_callbacks(SilcSKE ske,
  *    NULL on error.
  *
  ***/
-SilcAsyncOperation
-silc_ske_initiator(SilcSKE ske,
-		   SilcPacketStream stream,
-		   SilcSKEParams params,
-		   SilcSKEStartPayload start_payload);
+SilcAsyncOperation silc_ske_initiator(SilcSKE ske,
+				      SilcPacketStream stream,
+				      SilcSKEParams params,
+				      SilcSKEStartPayload start_payload);
 
 /****f* silcske/SilcSKEAPI/silc_ske_responder
  *
@@ -488,20 +487,61 @@ silc_ske_initiator(SilcSKE ske,
  *    NULL on error.
  *
  ***/
-SilcAsyncOperation
-silc_ske_responder(SilcSKE ske,
-		   SilcPacketStream stream,
-		   SilcSKEParams params);
-
-SilcAsyncOperation
-silc_ske_rekey_initiator(SilcSKE ske,
-			 SilcPacketStream stream,
-			 SilcSKERekeyMaterial rekey);
-
-SilcAsyncOperation
-silc_ske_rekey_responder(SilcSKE ske,
-			 SilcPacketStream stream,
-			 SilcSKERekeyMaterial rekey);
+SilcAsyncOperation silc_ske_responder(SilcSKE ske,
+				      SilcPacketStream stream,
+				      SilcSKEParams params);
+
+/****f* silcske/SilcSKEAPI/silc_ske_rekey_initiator
+ *
+ * SYNOPSIS
+ *
+ *    SilcAsyncOperation
+ *    silc_ske_rekey_initiator(SilcSKE ske,
+ *                             SilcPacketStream stream,
+ *                             SilcSKERekeyMaterial rekey);
+ *
+ * DESCRIPTION
+ *
+ *    Starts SILC Key Exchange key regeneration (rekey) protocol.  The `rekey'
+ *    is the rekey material received earlier in SilcSKECompletionCb.  That
+ *    same callback is called after the rekey protocol is over to deliver new
+ *    key material and new rekey material.
+ *
+ *    This function returns SilcAsyncOperation operation context which can
+ *    be used to control the protocol from the application.  Application may
+ *    for example safely abort the protocol at any point, if needed.  Returns
+ *    NULL on error.
+ *
+ ***/
+SilcAsyncOperation silc_ske_rekey_initiator(SilcSKE ske,
+					    SilcPacketStream stream,
+					    SilcSKERekeyMaterial rekey);
+
+/****f* silcske/SilcSKEAPI/silc_ske_rekey_responder
+ *
+ * SYNOPSIS
+ *
+ *    SilcAsyncOperation
+ *    silc_ske_rekey_responder(SilcSKE ske,
+ *                             SilcPacketStream stream,
+ *                             SilcSKERekeyMaterial rekey);
+ *
+ * DESCRIPTION
+ *
+ *    Starts SILC Key Exchange key regeneration (rekey) protocol as responder.
+ *    The `rekey' is the rekey material received earlier in
+ *    SilcSKECompletionCb.  That same callback is called after the rekey
+ *    protocol is over to deliver new key material and new rekey material.
+ *
+ *    This function returns SilcAsyncOperation operation context which can
+ *    be used to control the protocol from the application.  Application may
+ *    for example safely abort the protocol at any point, if needed.  Returns
+ *    NULL on error.
+ *
+ ***/
+SilcAsyncOperation silc_ske_rekey_responder(SilcSKE ske,
+					    SilcPacketStream stream,
+					    SilcSKERekeyMaterial rekey);
 
 /****f* silcske/SilcSKEAPI/silc_ske_set_keys
  *
-- 
2.24.0