updates.

[silc.git] / lib / silcclient / protocol.c

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index f00982e0d2a64d88e0929e518350618f227af9a1..a47927edf1f82921b2ab6b73dd3e81ae691333d8 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -29,8 +29,6 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth);
 SILC_TASK_CALLBACK(silc_client_protocol_key_exchange);
 SILC_TASK_CALLBACK(silc_client_protocol_rekey);
 
-extern char *silc_version_string;
-
 /*
  * Key Exhange protocol functions
  */
@@ -195,7 +193,7 @@ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
   if (cp)
     build = atoi(cp + 1);
 
-  cp = silc_version_string + 9;
+  cp = client->silc_client_version + 9;
   if (!cp)
     status = SILC_SKE_STATUS_BAD_VERSION;
 
@@ -215,7 +213,7 @@ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version,
     status = SILC_SKE_STATUS_BAD_VERSION;
 
   if (status != SILC_SKE_STATUS_OK)
-    client->ops->say(client, conn, 
+    client->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
                     "We don't support server version `%s'", version);
 
   return status;
@@ -241,15 +239,15 @@ static void silc_client_protocol_ke_continue(SilcSKE ske,
 
   if (ske->status != SILC_SKE_STATUS_OK) {
     if (ske->status == SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY) {
-      client->ops->say(client, conn, 
+      client->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT, 
                       "Received unsupported server %s public key",
                       ctx->sock->hostname);
     } else if (ske->status == SILC_SKE_STATUS_PUBLIC_KEY_NOT_PROVIDED) {
-      client->ops->say(client, conn, 
+      client->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
                       "Remote host did not send its public key, even though "
                       "it must send it");
     } else {
-      client->ops->say(client, conn,
+      client->ops->say(client, conn, SILC_CLIENT_MESSAGE_ERROR,
                       "Error during key exchange protocol with server %s",
                       ctx->sock->hostname);
     }
@@ -320,14 +318,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
        /* Start the key exchange by processing the received security
           properties packet from initiator. */
        status = silc_ske_responder_start(ske, ctx->rng, ctx->sock,
-                                         silc_version_string,
+                                         client->silc_client_version,
                                          ctx->packet->buffer, TRUE);
       } else {
        SilcSKEStartPayload *start_payload;
 
        /* Assemble security properties. */
        silc_ske_assemble_security_properties(ske, SILC_SKE_SP_FLAG_NONE, 
-                                             silc_version_string,
+                                             client->silc_client_version,
                                              &start_payload);
 
        /* Start the key exchange by sending our security properties
@@ -457,11 +455,11 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
 
       if (status != SILC_SKE_STATUS_OK) {
         if (status == SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY) {
-          client->ops->say(client, conn, 
+          client->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT, 
                           "Received unsupported server %s public key",
                           ctx->sock->hostname);
         } else {
-          client->ops->say(client, conn,
+          client->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT,
                           "Error during key exchange protocol with server %s",
                           ctx->sock->hostname);
         }
@@ -677,7 +675,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
          break;
        }
 
-       client->ops->say(client, conn, 
+       client->ops->say(client, conn, SILC_CLIENT_MESSAGE_INFO,
                         "Password authentication required by server %s",
                         ctx->sock->hostname);
        client->ops->ask_passphrase(client, conn,