updates.

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

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index 02939acba4c5c5dcef823c23a40ae6b2b8f1b395..801a5b95ac4f78dd25013b56b7b4617663673757 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -742,7 +742,7 @@ silc_client_protocol_rekey_send_packet(SilcSKE ske,
 
   /* Send the packet immediately */
   silc_client_packet_send(client, ctx->sock, type, NULL, 0, NULL, NULL,
-                         packet->data, packet->len, TRUE);
+                         packet->data, packet->len, FALSE);
 }
 
 /* Performs re-key as defined in the SILC protocol specification. */
@@ -830,7 +830,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
        /* Start the re-key by sending the REKEY packet */
        silc_client_packet_send(client, ctx->sock, SILC_PACKET_REKEY, 
-                               NULL, 0, NULL, NULL, NULL, 0, TRUE);
+                               NULL, 0, NULL, NULL, NULL, 0, FALSE);
 
        if (ctx->pfs == TRUE) {
          /* 
@@ -865,9 +865,13 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
           * Do normal and simple re-key.
           */
 
-         /* The protocol ends in next stage. We have sent the REKEY packet
-            and now we just wait that the responder send REKEY_DONE and
-            the we'll generate the new key, simple. */
+         /* Send the REKEY_DONE to indicate we will take new keys into use 
+            now. */ 
+         silc_client_packet_send(client, ctx->sock, 
+                                 SILC_PACKET_REKEY_DONE, 
+                                 NULL, 0, NULL, NULL, NULL, 0, FALSE);
+
+         /* The protocol ends in next stage. */
          protocol->state = SILC_PROTOCOL_STATE_END;
        }
       }
@@ -946,16 +950,6 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
     }
 
-    if (ctx->responder == FALSE) {
-      if (ctx->pfs == FALSE) {
-       /* Send the REKEY_DONE to indicate we will take new keys into use 
-          now. */ 
-       silc_client_packet_send(client, ctx->sock, 
-                               SILC_PACKET_REKEY_DONE, 
-                               NULL, 0, NULL, NULL, NULL, 0, FALSE);
-      }
-    }
-
     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
       protocol->execute_final(client->timeout_queue, 0, protocol, fd);