Changeset 1719464 for lib/rc4.c

Timestamp:

2006-06-28T14:47:05Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5c9512f

Parents:

b3c467b

Message:

Added random_bytes() function for better/more reliable randomization and
moved set_eval_ops() to a slightly more suitable place.

File:

• lib/rc4.c (modified) (2 diffs)

lib/rc4.c

@@ -39 +39 @@
 
 #include <glib.h>
+#include <gmodule.h>
 #include <stdlib.h>
 #include <string.h>
+#include "misc.h"
 #include "rc4.h"
 
@@ -134 +136 @@
         key = g_malloc( key_len );
         strcpy( (char*) key, password );
-        for( i = 0; i < RC4_IV_LEN; i ++ )
-                key[key_len-RC4_IV_LEN+i] = crypt[0][i] = rand() & 0xff;
+        
+        /* Add the salt. Save it for later (when decrypting) and, of course,
+           add it to the encryption key. */
+        random_bytes( crypt[0], RC4_IV_LEN );
+        memcpy( key + key_len - RC4_IV_LEN, crypt[0], RC4_IV_LEN );
         
         /* Generate the initial S[] from the IVed key. */