From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 11 Nov 2006 17:17:20 +0000 (+0000)
Subject: 	Brought back silc_ske_process_key_material_data.
X-Git-Tag: silc.client.1.1.beta1~189
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=7f3be13a00555390d6b3362d18ce460953397e73

	Brought back silc_ske_process_key_material_data.
---

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index a8cab636..6cfaacb3 100644
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -34,13 +34,6 @@ struct SilcSKECallbacksStruct {
 
 /************************ Static utility functions **************************/
 
-SilcSKEKeyMaterial
-silc_ske_process_key_material_data(unsigned char *data,
-				   SilcUInt32 data_len,
-				   SilcUInt32 req_iv_len,
-				   SilcUInt32 req_enc_key_len,
-				   SilcUInt32 req_hmac_key_len,
-				   SilcHash hash);
 SilcSKEKeyMaterial
 silc_ske_process_key_material(SilcSKE ske,
 			      SilcUInt32 req_iv_len,
diff --git a/lib/silcske/silcske.h b/lib/silcske/silcske.h
index 7bcf10b8..92b803f4 100644
--- a/lib/silcske/silcske.h
+++ b/lib/silcske/silcske.h
@@ -565,6 +565,42 @@ SilcBool silc_ske_parse_version(SilcSKE ske,
  ***/
 SilcSKESecurityProperties silc_ske_get_security_properties(SilcSKE ske);
 
+/****f* silcske/SilcSKEAPI/silc_ske_process_key_material_data
+ *
+ * SYNOPSIS
+ *
+ *    const char *silc_ske_map_status(SilcSKEStatus status);
+ *
+ * DESCRIPTION
+ *
+ *    Utility function to process key data `data' in the way specified
+ *    by the SILC Key Exchange protocol.  This returns the processed key
+ *    material or NULL on error.  Caller must free the returned key
+ *    material context by calling silc_ske_free_key_material.
+ *
+ ***/
+SilcSKEKeyMaterial
+silc_ske_process_key_material_data(unsigned char *data,
+				   SilcUInt32 data_len,
+				   SilcUInt32 req_iv_len,
+				   SilcUInt32 req_enc_key_len,
+				   SilcUInt32 req_hmac_key_len,
+				   SilcHash hash);
+
+/****f* silcske/SilcSKEAPI/silc_ske_free_key_material
+ *
+ * SYNOPSIS
+ *
+ *    void silc_ske_free_key_material(SilcSKEKeyMaterial key)
+ *
+ * DESCRIPTION
+ *
+ *    Utility function to free the key material created by calling
+ *    silc_ske_process_key_material_data.
+ *
+ ***/
+void silc_ske_free_key_material(SilcSKEKeyMaterial key);
+
 /****f* silcske/SilcSKEAPI/silc_ske_map_status
  *
  * SYNOPSIS