Merged with trunk

2 files changed, 9 insertions, 5 deletions

diff --git a/util/hmac.lua b/util/hmac.lua
index b3098380..5f4467cf 100644
--- a/util/hmac.lua
+++ b/util/hmac.lua
@@ -1,15 +1,18 @@
 local hashes = require "util.hashes"
 local xor = require "bit".bxor
 
+local t_insert, t_concat = table.insert, table.concat;
+local s_char = string.char;
+
 module "hmac"
 
 local function arraystr(array)
-    t = {}
-    for i = 1,table.getn(array) do
-        table.insert(t, string.char(array[i]))
+    local t = {}
+    for i = 1,#array do
+        t_insert(t, s_char(array[i]))
     end
 
-    return table.concat(t)
+    return t_concat(t)
 end
 
 --[[
diff --git a/util/sasl.lua b/util/sasl.lua
index a343d608..3fd133d2 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -19,6 +19,7 @@ local st = require "util.stanza";
 local generate_uuid = require "util.uuid".generate;
 local t_insert, t_concat = table.insert, table.concat;
 local to_byte, to_char = string.byte, string.char;
+local to_unicode = require "util.encodings".idna.to_unicode;
 local s_match = string.match;
 local gmatch = string.gmatch
 local string = string
@@ -199,7 +200,7 @@ local function new_digest_md5(realm, password_handler)
 			
 			--TODO maybe realm support
 			self.username = response["username"];
-			local password_encoding, Y = self.password_handler(response["username"], domain, response["realm"], "DIGEST-MD5", decoder);
+			local password_encoding, Y = self.password_handler(response["username"], to_unicode(domain), response["realm"], "DIGEST-MD5", decoder);
 			if Y == nil then return "failure", "not-authorized"
 			elseif Y == false then return "failure", "account-disabled" end
 			local A1 = "";