From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 2 Dec 2002 08:22:38 +0000 (+0000)
Subject: 	Fixed buffer overflow.
X-Git-Tag: silc.client.0.9.10~35
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=d6d5c1820492cbf66288a47b2a77a2d368e21e05

	Fixed buffer overflow.
---

diff --git a/lib/silccrypt/silcpkcs.c b/lib/silccrypt/silcpkcs.c
index 6e31c00d..6100cfea 100644
--- a/lib/silccrypt/silcpkcs.c
+++ b/lib/silccrypt/silcpkcs.c
@@ -1191,7 +1191,7 @@ static bool silc_pkcs_save_private_key_internal(const char *filename,
   SilcHmac sha1hmac;
   SilcBuffer buf, enc;
   SilcUInt32 len, blocklen;
-  unsigned char tmp[32], keymat[32];
+  unsigned char tmp[32], keymat[64];
   int i;
 
   memset(tmp, 0, sizeof(tmp));
@@ -1234,7 +1234,7 @@ static bool silc_pkcs_save_private_key_internal(const char *filename,
   silc_hash_final(sha1, keymat + 16);
 
   /* Set the key to the cipher */
-  silc_cipher_set_key(aes, keymat, sizeof(keymat) * 8);
+  silc_cipher_set_key(aes, keymat, 256);
 
   /* Encode the buffer to be encrypted.  Add padding to it too, at least
      block size of the cipher. */
@@ -1570,7 +1570,7 @@ bool silc_pkcs_load_private_key(const char *filename,
   SilcHash sha1;
   SilcHmac sha1hmac;
   SilcUInt32 blocklen;
-  unsigned char tmp[32], keymat[32];
+  unsigned char tmp[32], keymat[64];
   unsigned char *cp, *old, *data, byte;
   SilcUInt32 i, data_len, len, magic, mac_len;
 
@@ -1700,7 +1700,7 @@ bool silc_pkcs_load_private_key(const char *filename,
 #endif /* 1 */
   
   /* Set the key to the cipher */
-  silc_cipher_set_key(aes, keymat, sizeof(keymat) * 8);
+  silc_cipher_set_key(aes, keymat, 256);
 
   /* First, verify the MAC of the private key data */
   mac_len = silc_hmac_len(sha1hmac);