Protocol check changes.

diff --git a/apps/silcd/protocol.c b/apps/silcd/protocol.c
index 7cb72adaa51914cf1b156e34e10e421386bd3142..4f9678d1028bc87b607af1c70e373fb91a860b9a 100644 (file)
--- a/apps/silcd/protocol.c
+++ b/apps/silcd/protocol.c
@@ -331,8 +331,9 @@ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
   SILC_LOG_INFO(("%s (%s) is version %s", ske->sock->hostname,
                 ske->sock->ip, version));
 
-  /* Check for initial version string */
-  if (!strstr(version, "SILC-1.0-"))
+  /* Check for initial version string. Allowed "SILC-x.x-". More 
+     specific protocol version is checked later in session. */
+  if (!strstr(version, "SILC-"))
     status = SILC_SKE_STATUS_BAD_VERSION;
 
   /* Check software version */

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index 4044fbbdaa78a9c34a7ce1ab460adfff38032b69..932bd3abcf391f1b6d9af6ae1b3aec35f51b0abe 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -175,8 +175,8 @@ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
   char *cp;
   int maj = 0, min = 0, build = 0, maj2 = 0, min2 = 0, build2 = 0;
 
-  /* Check for initial version string */
-  if (!strstr(version, "SILC-1.0-"))
+  /* Check for initial version string. Allowed "SILC-1.x-". */
+  if (!strstr(version, "SILC-1."))
     status = SILC_SKE_STATUS_BAD_VERSION;
 
   /* Check software version */