X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcske%2Fsilcske.c;h=6583562882a527511507da098aab92db0367338d;hb=d4698528ed84c05aad3be8c2b18a343d2dc2b521;hp=02d0961cfe9c85f1ae8f479cdbaf98496703af92;hpb=292f1abee836678dd34bc5ba8fe91307926a9158;p=silc.git

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index 02d0961c..65835628 100644
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -1881,7 +1881,8 @@ SILC_FSM_STATE(silc_ske_st_initiator_failure)
   SilcSKE ske = fsm_context;
   SilcUInt32 error = SILC_SKE_STATUS_ERROR;
 
-  if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
+  if (ske->packet && ske->packet->type == SILC_PACKET_FAILURE &&
+      silc_buffer_len(&ske->packet->buffer) == 4) {
     SILC_GET32_MSB(error, ske->packet->buffer.data);
     ske->status = error;
     silc_packet_free(ske->packet);
@@ -2470,7 +2471,8 @@ SILC_FSM_STATE(silc_ske_st_responder_failure)
 
   SILC_LOG_DEBUG(("Key exchange protocol failed"));
 
-  if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
+  if (ske->packet && ske->packet->type == SILC_PACKET_FAILURE &&
+      silc_buffer_len(&ske->packet->buffer) == 4) {
     SILC_GET32_MSB(error, ske->packet->buffer.data);
     ske->status = error;
     silc_packet_free(ske->packet);
@@ -3416,6 +3418,12 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
       return FALSE;
   }
 
+  /* Allocate hash */
+  if (ret_hash) {
+    if (!silc_hash_alloc(silc_hash_get_name(prop->hash), ret_hash))
+      return FALSE;
+  }
+
   /* Set key material */
   memset(iv, 0, sizeof(iv));
   if (ske->responder) {
@@ -3424,10 +3432,22 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			  keymat->enc_key_len, TRUE);
 
       if (silc_cipher_get_mode(*ret_send_key) == SILC_CIPHER_MODE_CTR) {
-        memcpy(iv, ske->hash, 4);
-        memcpy(iv + 4, keymat->receive_iv, iv_included ? 4 : 8);
+	/* Counter mode */
+	if (!ske->rekeying) {
+	  /* Set IV. */
+	  memcpy(iv, ske->hash, 4);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->receive_iv, 8);
+	} else {
+	  /* Rekey, recompute the truncated hash value. */
+	  silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->receive_iv, 8);
+	}
+
         silc_cipher_set_iv(*ret_send_key, iv);
       } else {
+	/* Other modes */
 	silc_cipher_set_iv(*ret_send_key, keymat->receive_iv);
       }
     }
@@ -3436,10 +3456,22 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			  keymat->enc_key_len, FALSE);
 
       if (silc_cipher_get_mode(*ret_receive_key) == SILC_CIPHER_MODE_CTR) {
-        memcpy(iv, ske->hash, 4);
-        memcpy(iv + 4, keymat->send_iv, iv_included ? 4 : 8);
+	/* Counter mode */
+	if (!ske->rekeying) {
+	  /* Set IV. */
+	  memcpy(iv, ske->hash, 4);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->send_iv, 8);
+	} else {
+	  /* Rekey, recompute the truncated hash value. */
+	  silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->send_iv, 8);
+	}
+
         silc_cipher_set_iv(*ret_receive_key, iv);
       } else {
+	/* Other modes */
 	silc_cipher_set_iv(*ret_receive_key, keymat->send_iv);
       }
     }
@@ -3455,10 +3487,22 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			  keymat->enc_key_len, TRUE);
 
       if (silc_cipher_get_mode(*ret_send_key) == SILC_CIPHER_MODE_CTR) {
-        memcpy(iv, ske->hash, 4);
-        memcpy(iv + 4, keymat->send_iv, iv_included ? 4 : 8);
+	/* Counter mode */
+	if (!ske->rekeying) {
+	  /* Set IV. */
+	  memcpy(iv, ske->hash, 4);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->send_iv, 8);
+	} else {
+	  /* Rekey, recompute the truncated hash value. */
+	  silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->send_iv, 8);
+	}
+
 	silc_cipher_set_iv(*ret_send_key, iv);
       } else {
+	/* Other modes */
 	silc_cipher_set_iv(*ret_send_key, keymat->send_iv);
       }
     }
@@ -3467,10 +3511,23 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			  keymat->enc_key_len, FALSE);
 
       if (silc_cipher_get_mode(*ret_receive_key) == SILC_CIPHER_MODE_CTR) {
-        memcpy(iv, ske->hash, 4);
-        memcpy(iv + 4, keymat->receive_iv, iv_included ? 4 : 8);
+	/* Counter mode */
+	if (!ske->rekeying) {
+	  /* Set IV.  If IV Included flag was negotiated we only set the
+	     truncated hash value. */
+	  memcpy(iv, ske->hash, 4);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->receive_iv, 8);
+	} else {
+	  /* Rekey, recompute the truncated hash value. */
+	  silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
+	  if (!iv_included)
+	    memcpy(iv + 4, keymat->receive_iv, 8);
+	}
+
 	silc_cipher_set_iv(*ret_receive_key, iv);
       } else {
+	/* Other modes */
 	silc_cipher_set_iv(*ret_receive_key, keymat->receive_iv);
       }
     }
@@ -3482,12 +3539,6 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			keymat->hmac_key_len);
   }
 
-  /* Allocate hash */
-  if (ret_hash) {
-    if (!silc_hash_alloc(silc_hash_get_name(prop->hash), ret_hash))
-      return FALSE;
-  }
-
   return TRUE;
 }