X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcske%2Fsilcske.c;fp=lib%2Fsilcske%2Fsilcske.c;h=b3a151e6eaeb7f8f4a5b947cb3b4e11a731a2614;hb=6fbdfe2dbb65e2fb722b99d0606c1302b0784ecc;hp=6583562882a527511507da098aab92db0367338d;hpb=d820909361546e7260d33f169b189d7ea3948ba9;p=silc.git

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index 65835628..b3a151e6 100644
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -3391,7 +3391,7 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 			   SilcHmac *ret_hmac_receive,
 			   SilcHash *ret_hash)
 {
-  unsigned char iv[32];
+  unsigned char iv[SILC_HASH_MAXLEN];
   SilcBool iv_included = (prop->flags & SILC_SKE_SP_FLAG_IV_INCLUDED);
 
   /* Allocate ciphers to be used in the communication */
@@ -3443,6 +3443,8 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 	  silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
 	  if (!iv_included)
 	    memcpy(iv + 4, keymat->receive_iv, 8);
+	  else
+	    memset(iv + 4, 0, 12);
 	}
 
         silc_cipher_set_iv(*ret_send_key, iv);
@@ -3467,6 +3469,8 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 	  silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
 	  if (!iv_included)
 	    memcpy(iv + 4, keymat->send_iv, 8);
+	  else
+	    memset(iv + 4, 0, 12);
 	}
 
         silc_cipher_set_iv(*ret_receive_key, iv);
@@ -3498,6 +3502,8 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 	  silc_hash_make(prop->hash, keymat->send_iv, 8, iv);
 	  if (!iv_included)
 	    memcpy(iv + 4, keymat->send_iv, 8);
+	  else
+	    memset(iv + 4, 0, 12);
 	}
 
 	silc_cipher_set_iv(*ret_send_key, iv);
@@ -3523,6 +3529,8 @@ SilcBool silc_ske_set_keys(SilcSKE ske,
 	  silc_hash_make(prop->hash, keymat->receive_iv, 8, iv);
 	  if (!iv_included)
 	    memcpy(iv + 4, keymat->receive_iv, 8);
+	  else
+	    memset(iv + 4, 0, 12);
 	}
 
 	silc_cipher_set_iv(*ret_receive_key, iv);