# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1198025003 0
# Node ID 9a43b7ed0f74dddcc72d21027a79e31a844605b1
# Parent  af389f2537ad55a7b030335a102d26ce4756c3ed# Parent  2e899bbbf14c52b21e17d1c0924d796f980e136e
merge of '596c9f710fd64a951cbce4bb92b6e051ae3805b1'
     and 'a29666fd1b9fb1eda082e5ed58e5ad2cbd2dfc0f'

diff -r af389f2537ad -r 9a43b7ed0f74 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Tue Dec 18 22:12:10 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Wed Dec 19 00:43:23 2007 +0000
@@ -690,6 +690,10 @@
 			char h[17], *p;
 			int i;
 
+			challenge = xmlnode_get_attrib(xmlnode_get_child(query, "crammd5"), "challenge");
+			auth_hmac_md5(challenge, strlen(challenge), pw, strlen(pw), &digest);
+
+			/* Create the response query */
 			iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:auth");
 			query = xmlnode_get_child(iq->node, "query");
 
@@ -699,8 +703,6 @@
 			xmlnode_insert_data(x, js->user->resource, -1);
 
 			x = xmlnode_new_child(query, "crammd5");
-			challenge = xmlnode_get_attrib(xmlnode_get_child(query, "crammd5"), "challenge");
-			auth_hmac_md5(challenge, strlen(challenge), pw, strlen(pw), &digest);
 
 			/* Translate the digest to a hexadecimal notation */
 			p = h;