Bugfixes merged from trunk.

[silc.git] / lib / silcske / payload.c

diff --git a/lib/silcske/payload.c b/lib/silcske/payload.c
index d9e89389ed29d4e9f03a0eac3efadd0567c483a8..eafbd873330404b36fe711a529c9476671b556db 100644 (file)
--- a/lib/silcske/payload.c
+++ b/lib/silcske/payload.c
@@ -158,22 +158,14 @@ silc_ske_payload_start_decode(SilcSKE ske,
 void silc_ske_payload_start_free(SilcSKEStartPayload *payload)
 {
   if (payload) {
-    if (payload->cookie)
-      silc_free(payload->cookie);
-    if (payload->version)
-      silc_free(payload->version);
-    if (payload->ke_grp_list)
-      silc_free(payload->ke_grp_list);
-    if (payload->pkcs_alg_list)
-      silc_free(payload->pkcs_alg_list);
-    if (payload->enc_alg_list)
-      silc_free(payload->enc_alg_list);
-    if (payload->hash_alg_list)
-      silc_free(payload->hash_alg_list);
-    if (payload->hmac_alg_list)
-      silc_free(payload->hmac_alg_list);
-    if (payload->comp_alg_list)
-      silc_free(payload->comp_alg_list);
+    silc_free(payload->cookie);
+    silc_free(payload->version);
+    silc_free(payload->ke_grp_list);
+    silc_free(payload->pkcs_alg_list);
+    silc_free(payload->enc_alg_list);
+    silc_free(payload->hash_alg_list);
+    silc_free(payload->hmac_alg_list);
+    silc_free(payload->comp_alg_list);
     silc_free(payload);
   }
 }
@@ -187,7 +179,7 @@ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske,
 {
   SilcBuffer buf;
   unsigned char *x_str;
-  uint32 x_len;
+  SilcUInt32 x_len;
   int ret;
 
   SILC_LOG_DEBUG(("Encoding KE Payload"));
@@ -251,8 +243,8 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
   SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
   SilcSKEKEPayload *payload;
   unsigned char *x = NULL;
-  uint16 x_len;
-  uint32 tot_len = 0, len2;
+  SilcUInt16 x_len;
+  SilcUInt32 tot_len = 0, len2;
   int ret;
 
   SILC_LOG_DEBUG(("Decoding Key Exchange Payload"));
@@ -273,7 +265,9 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
     goto err;
   }
 
-  if (payload->pk_type == 0) {
+  if (ske->start_payload && 
+      (payload->pk_type < SILC_SKE_PK_TYPE_SILC || 
+       payload->pk_type > SILC_SKE_PK_TYPE_SPKI)) {
     status = SILC_SKE_STATUS_BAD_PAYLOAD;
     goto err;
   }
@@ -312,7 +306,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
   }
 
   if (tot_len != len2) {
-    status = SILC_SKE_STATUS_BAD_PAYLOAD;
+    status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
     goto err;
   }
   
@@ -328,12 +322,9 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
   return SILC_SKE_STATUS_OK;
 
  err:
-  if (payload->pk_data)
-    silc_free(payload->pk_data);
-  if (payload->sign_data)
-    silc_free(payload->sign_data);
-  if (x)
-    silc_free(x);
+  silc_free(payload->pk_data);
+  silc_free(payload->sign_data);
+  silc_free(x);
   silc_free(payload);
   ske->status = status;
   return status;
@@ -344,11 +335,9 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
 void silc_ske_payload_ke_free(SilcSKEKEPayload *payload)
 {
   if (payload) {
-    if (payload->pk_data)
-      silc_free(payload->pk_data);
+    silc_free(payload->pk_data);
     silc_mp_uninit(&payload->x);
-    if (payload->sign_data)
-      silc_free(payload->sign_data);
+    silc_free(payload->sign_data);
     silc_free(payload);
   }
 }