changeset 28712:40a46992c728

jabber: Interop with Prosody (via Tobias' code). Hooray!
author Paul Aurich <paul@darkrain42.org>
date Tue, 17 Nov 2009 21:37:14 +0000
parents 65a34cce02e3
children da768548fc99
files libpurple/protocols/jabber/auth_scram.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth_scram.c	Tue Nov 17 19:39:36 2009 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c	Tue Nov 17 21:37:14 2009 +0000
@@ -32,7 +32,7 @@
 	const char *mech_substr;
 	const char *hash;
 } mech_hashes[] = {
-	{ "-SHA-1-", "sha1" },
+	{ "-SHA-1", "sha1" },
 };
 
 static const struct {
@@ -53,6 +53,8 @@
 			return mech_hashes[i].hash;
 	}
 
+	purple_debug_error("jabber", "Unknown SCRAM mechanism %s\n", mech);
+
 	return NULL;
 }
 
@@ -375,7 +377,7 @@
 		data->channel_binding = TRUE;
 #endif
 	cnonce = ((guint64)g_random_int() << 32) | g_random_int();
-	data->cnonce = purple_base64_encode((guchar *)cnonce, sizeof(cnonce));
+	data->cnonce = purple_base64_encode((guchar *)&cnonce, sizeof(cnonce));
 
 	data->auth_message = g_string_new(NULL);
 	g_string_printf(data->auth_message, "n=%s,r=%s",