Changeset a8a0b4c for lib/rc4.c

Timestamp:

2007-07-14T23:54:18Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2abfbc5

Parents:

1da00b1 (diff), b9e4ab5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Jelmer (making GCC4 happy by sanitizing some typecasting mess
around the RC4/B64 code).

File:

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

lib/rc4.c

@@ -122 +122 @@
 */
 
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password )
+int rc4_encode( char *clear, int clear_len, unsigned char **crypt, char *password )
 {
         struct rc4_state *st;
@@ -130 +130 @@
         key_len = strlen( password ) + RC4_IV_LEN;
         if( clear_len <= 0 )
-                clear_len = strlen( (char*) clear );
+                clear_len = strlen( clear );
         
         /* Prepare buffers and the key + IV */
@@ -154 +154 @@
 }
 
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password )
+int rc4_decode( unsigned char *crypt, int crypt_len, char **clear, char *password )
 {
         struct rc4_state *st;
@@ -165 +165 @@
         if( clear_len < 0 )
         {
-                *clear = (unsigned char*) g_strdup( "" );
+                *clear = g_strdup( "" );
                 return 0;
         }