Changeset a8a0b4c

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).

Files:

• lib/base64.c (modified) (1 diff)
• lib/base64.h (modified) (1 diff)
• lib/rc4.c (modified) (4 diffs)
• lib/rc4.h (modified) (1 diff)
• lib/ssl_bogus.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (3 diffs)
• storage_xml.c (modified) (4 diffs)

lib/base64.c

@@ -31 +31 @@
 char *tobase64(const char *text)
 {
-        return base64_encode(text, strlen(text));
+        return base64_encode((const unsigned char *)text, strlen(text));
 }
 
-char *base64_encode(const char *in, int len)
+char *base64_encode(const unsigned char *in, int len)
 {
         char *out;

lib/base64.h

@@ -27 +27 @@
 
 G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT char *base64_encode( const char *in, int len );
+G_MODULE_EXPORT char *base64_encode( const unsigned char *in, int len );
 G_MODULE_EXPORT int base64_encode_real( const unsigned char *in, int inlen, unsigned char *out, const char *b64digits );
 G_MODULE_EXPORT char *frombase64( const char *in );

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;
         }

lib/rc4.h

@@ -33 +33 @@
 struct rc4_state *rc4_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char rc4_getbyte( struct rc4_state *st );
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password );
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password );
+int rc4_encode( char *clear, int clear_len, unsigned char **crypt, char *password );
+int rc4_decode( unsigned char *crypt, int crypt_len, char **clear, char *password );

lib/ssl_bogus.c

@@ -52 +52 @@
 }
 
+void *ssl_starttls( int fd, ssl_input_function func, gpointer data ) 
+{
+        return NULL;
+}
+
 b_input_condition ssl_getdirection( void *conn )
 {

protocols/jabber/sasl.c

@@ -89 +89 @@
                 strcpy( s + 1, jd->username );
                 strcpy( s + 2 + strlen( jd->username ), ic->acc->pass );
-                reply->text = base64_encode( s, len );
+                reply->text = base64_encode( (unsigned char *)s, len );
                 reply->text_len = strlen( reply->text );
                 g_free( s );
@@ -185 +185 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *reply = NULL;
-        char *nonce = NULL, *realm = NULL, *cnonce = NULL, cnonce_bin[30];
+        char *nonce = NULL, *realm = NULL, *cnonce = NULL;
+        unsigned char cnonce_bin[30];
         char *digest_uri = NULL;
         char *dec = NULL;
@@ -216 +217 @@
                         realm = g_strdup( jd->server );
                 
-                random_bytes( (unsigned char *) cnonce_bin, sizeof( cnonce_bin ) );
+                random_bytes( cnonce_bin, sizeof( cnonce_bin ) );
                 cnonce = base64_encode( cnonce_bin, sizeof( cnonce_bin ) );
                 digest_uri = g_strdup_printf( "%s/%s", "xmpp", jd->server );

storage_xml.c

@@ -132 +132 @@
         {
                 char *protocol, *handle, *server, *password = NULL, *autoconnect;
-                char *pass_b64 = NULL, *pass_rc4 = NULL;
+                char *pass_b64 = NULL;
+                unsigned char *pass_rc4 = NULL;
                 int pass_len;
                 struct prpl *prpl = NULL;
@@ -152 +153 @@
                                      "Unknown protocol: %s", protocol );
                 else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_rc4 ) ) &&
-                                rc4_decode( (unsigned char*) pass_rc4, pass_len,
-                                            (unsigned char**) &password, xd->given_pass ) )
+                                         rc4_decode( pass_rc4, pass_len, &password, xd->given_pass ) )
                 {
                         xd->current_account = account_add( irc, prpl, handle, password );
@@ -410 +410 @@
         md5_finish( &md5_state, pass_md5 );
         /* Save the hash in base64-encoded form. */
-        pass_buf = base64_encode( (char*) pass_md5, 21 );
+        pass_buf = base64_encode( pass_md5, 21 );
         
         if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
@@ -424 +424 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                char *pass_rc4, *pass_b64;
+                unsigned char *pass_rc4;
+                char *pass_b64;
                 int pass_len;
                 
-                pass_len = rc4_encode( (unsigned char*) acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password );
+                pass_len = rc4_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password );
                 pass_b64 = base64_encode( pass_rc4, pass_len );
                 g_free( pass_rc4 );