From: Dan Winship Date: Thu, 17 Jan 2008 17:06:47 +0000 (+0000) Subject: cast the second arg to g_checksum_update to (guchar *) to avoid warnings X-Git-Tag: LIBSOUP_2_3_0_1~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8f5ce63f284125adc5867c13cc8853634914add;p=platform%2Fupstream%2Flibsoup.git cast the second arg to g_checksum_update to (guchar *) to avoid warnings * libsoup/soup-auth-digest.c (soup_auth_digest_compute_hex_urp) (soup_auth_digest_compute_hex_a1) (soup_auth_digest_compute_response): cast the second arg to g_checksum_update to (guchar *) to avoid warnings svn path=/trunk/; revision=1047 --- diff --git a/ChangeLog b/ChangeLog index f5d6614..83c6001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-17 Dan Winship + + * libsoup/soup-auth-digest.c (soup_auth_digest_compute_hex_urp) + (soup_auth_digest_compute_hex_a1) + (soup_auth_digest_compute_response): cast the second arg to + g_checksum_update to (guchar *) to avoid warnings + 2008-01-16 Dan Winship * libsoup/soup-headers.c (soup_headers_parse_status_line): Deal diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c index 8ad5f85..be76e4d 100644 --- a/libsoup/soup-auth-digest.c +++ b/libsoup/soup-auth-digest.c @@ -256,11 +256,11 @@ soup_auth_digest_compute_hex_urp (const char *username, GChecksum *checksum; checksum = g_checksum_new (G_CHECKSUM_MD5); - g_checksum_update (checksum, username, strlen (username)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, realm, strlen (realm)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, password, strlen (password)); + g_checksum_update (checksum, (guchar *)username, strlen (username)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)realm, strlen (realm)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)password, strlen (password)); strncpy (hex_urp, g_checksum_get_string (checksum), 33); g_checksum_free (checksum); } @@ -286,11 +286,11 @@ soup_auth_digest_compute_hex_a1 (const char *hex_urp, /* In MD5-sess, A1 is hex_urp:nonce:cnonce */ checksum = g_checksum_new (G_CHECKSUM_MD5); - g_checksum_update (checksum, hex_urp, strlen (hex_urp)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, nonce, strlen (nonce)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, cnonce, strlen (cnonce)); + g_checksum_update (checksum, (guchar *)hex_urp, strlen (hex_urp)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)nonce, strlen (nonce)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)cnonce, strlen (cnonce)); strncpy (hex_a1, g_checksum_get_string (checksum), 33); g_checksum_free (checksum); } @@ -352,35 +352,35 @@ soup_auth_digest_compute_response (const char *method, /* compute A2 */ checksum = g_checksum_new (G_CHECKSUM_MD5); - g_checksum_update (checksum, method, strlen (method)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, uri, strlen (uri)); + g_checksum_update (checksum, (guchar *)method, strlen (method)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)uri, strlen (uri)); strncpy (hex_a2, g_checksum_get_string (checksum), 33); g_checksum_free (checksum); /* compute KD */ checksum = g_checksum_new (G_CHECKSUM_MD5); - g_checksum_update (checksum, hex_a1, strlen (hex_a1)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, nonce, strlen (nonce)); - g_checksum_update (checksum, ":", 1); + g_checksum_update (checksum, (guchar *)hex_a1, strlen (hex_a1)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)nonce, strlen (nonce)); + g_checksum_update (checksum, (guchar *)":", 1); if (qop) { char tmp[9]; snprintf (tmp, 9, "%.8x", nc); - g_checksum_update (checksum, tmp, strlen (tmp)); - g_checksum_update (checksum, ":", 1); - g_checksum_update (checksum, cnonce, strlen (cnonce)); - g_checksum_update (checksum, ":", 1); + g_checksum_update (checksum, (guchar *)tmp, strlen (tmp)); + g_checksum_update (checksum, (guchar *)":", 1); + g_checksum_update (checksum, (guchar *)cnonce, strlen (cnonce)); + g_checksum_update (checksum, (guchar *)":", 1); if (qop != SOUP_AUTH_DIGEST_QOP_AUTH) g_assert_not_reached (); - g_checksum_update (checksum, "auth", strlen ("auth")); - g_checksum_update (checksum, ":", 1); + g_checksum_update (checksum, (guchar *)"auth", strlen ("auth")); + g_checksum_update (checksum, (guchar *)":", 1); } - g_checksum_update (checksum, hex_a2, 32); + g_checksum_update (checksum, (guchar *)hex_a2, 32); strncpy (response, g_checksum_get_string (checksum), 33); g_checksum_free (checksum); }