# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1276809781 0
# Node ID 545ce15b619f5bb2f6b2470dd4e3b54a22e5cfeb
# Parent  33989e3a449b6a510d4d3e594ad7cff03fceec8c# Parent  738741a7a692aa23709268e09f1d0a09d81f4f0c
merge of '18ddd668ba1cc77ed0a0595a053f8a2879dddfd0'
     and '63b644ac7791059c9fad6128d17bccebca8ad71a'

diff -r 33989e3a449b -r 545ce15b619f libpurple/protocols/jabber/jutil.c
--- a/libpurple/protocols/jabber/jutil.c	Thu Jun 17 21:06:00 2010 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Thu Jun 17 21:23:01 2010 +0000
@@ -303,8 +303,10 @@
 
 	c = (const guchar *)in;
 	for ( ; *c; ++c) {
-		if (*c > 0x7f ||
+		if (*c > 0x7f || /* Non-ASCII characters */
+				*c == 0x7f || /* ASCII Delete character */
 				(*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r'))
+					/* ASCII control characters */
 			return NULL;
 	}
 
diff -r 33989e3a449b -r 545ce15b619f libpurple/tests/test_jabber_scram.c
--- a/libpurple/tests/test_jabber_scram.c	Thu Jun 17 21:06:00 2010 +0000
+++ b/libpurple/tests/test_jabber_scram.c	Thu Jun 17 21:23:01 2010 +0000
@@ -89,11 +89,13 @@
 			"c=biws,r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,p=pXkak78EuwwOEwk2/h/OzD7NkEI=",
 			"v=ldX4EBNnOgDnNTOCmbSfBHAUCOs=");
 
+#ifdef USE_IDN
 	assert_successful_exchange("pass½word", "GNb2HsNI7VnTv8ABsE5AnY8W",
 			"n=paul,r=GNb2HsNI7VnTv8ABsE5AnY8W",
 			"r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,s=ysAriUjPzFqOXnMQ,i=4096",
 			"c=biws,r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,p=n/CtgdWjOYnLQ4m9Na+wPn9D2uY=",
 			"v=4TkZwKWy6JHNmrUbU2+IdAaXtos=");
+#endif
 }
 END_TEST