Implemented version string checking to client and server.

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

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index 0dac063376bdd3490cf231c9c9faefc128fd3afa..34c4c16796b68ba5730e4ec44228df2fe01cd7b1 100644 (file)
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -775,6 +775,7 @@ silc_ske_select_security_properties(SilcSKE ske,
                                    SilcSKEStartPayload *payload,
                                    SilcSKEStartPayload *remote_payload)
 {
+  SilcSKEStatus status;
   SilcSKEStartPayload *rp;
   char *cp;
   int len;
@@ -783,6 +784,11 @@ silc_ske_select_security_properties(SilcSKE ske,
 
   rp = remote_payload;
 
+  /* Check version string */
+  status = silc_ske_check_version(ske, rp->version, rp->version_len);
+  if (status != SILC_SKE_STATUS_OK)
+    return status;
+
   /* Flags are returned unchanged. */
   payload->flags = rp->flags;
 
@@ -791,9 +797,6 @@ silc_ske_select_security_properties(SilcSKE ske,
   payload->cookie_len = SILC_SKE_COOKIE_LEN;
   memcpy(payload->cookie, rp->cookie, SILC_SKE_COOKIE_LEN);
 
-  /* Check version string */
-  silc_ske_check_version(ske, rp->version, rp->version_len);
-
   /* Put our version to our reply */
   payload->version = strdup(version);
   payload->version_len = strlen(version);