Changeset a8a0b4c for storage_xml.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:

• storage_xml.c (modified) (4 diffs)

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