Changeset a8a0b4c for protocols

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:

• protocols/jabber/sasl.c (modified) (3 diffs)

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