# HG changeset patch
# User Tobias Markmann <tm@ayena.de>
# Date 1227954299 -3600
# Node ID fe861de7a4fcfc05278ed9e596d74f34150d7fa9
# Parent  666e2284889081c4328fc5f91f52d4fc1f202417# Parent  a2452d3bd8283375c0c42af26c0379321669d37d
Forced merge.

diff -r a2452d3bd828 -r fe861de7a4fc util-src/Makefile
diff -r a2452d3bd828 -r fe861de7a4fc util-src/encodings.c
--- a/util-src/encodings.c	Sat Nov 29 02:07:33 2008 +0000
+++ b/util-src/encodings.c	Sat Nov 29 11:24:59 2008 +0100
@@ -7,19 +7,17 @@
 #define _CRT_SECURE_NO_DEPRECATE
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "lua.h"
 #include "lauxlib.h"
 
 /***************** BASE64 *****************/
 
-#define uint unsigned int
-
 static const char code[]=
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-static void base64_encode(luaL_Buffer *b, uint c1, uint c2, uint c3, int n)
+static void base64_encode(luaL_Buffer *b, unsigned int c1, unsigned int c2, unsigned int c3, int n)
 {
 	unsigned long tuple=c3+256UL*(c2+256UL*c1);
 	int i;
diff -r a2452d3bd828 -r fe861de7a4fc util/sasl.lua
--- a/util/sasl.lua	Sat Nov 29 02:07:33 2008 +0000
+++ b/util/sasl.lua	Sat Nov 29 11:24:59 2008 +0100
@@ -11,6 +11,7 @@
 local type = type
 local error = error
 local print = print
+local idna_ascii = require "util.encodings".stringprep.saslprep.to_ascii
 
 module "sasl"
 
@@ -130,7 +131,7 @@
 			elseif Y == false then return "failure", "account-disabled" end
 			
 			local A1 = Y..":"..response["nonce"]..":"..response["cnonce"]--:authzid
-			local A2 = "AUTHENTICATE:"..protocol.."/"..domain
+			local A2 = "AUTHENTICATE:"..protocol.."/"..idna_ascii(domain)
 			
 			local HA1 = md5(A1, true)
 			local HA2 = md5(A2, true)
@@ -140,7 +141,7 @@
 			
 			if response_value == response["response"] then
 				-- calculate rspauth
-				A2 = ":"..protocol.."/"..domain
+				A2 = ":"..protocol.."/"..idna_ascii(domain)
 				
 				HA1 = md5(A1, true)
 				HA2 = md5(A2, true)