From d9b3e413479ee848bdbc1b6b5c99b0ac6ed47b0f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 5 Jul 2009 17:06:22 +0100 Subject: util.hmac: Fix a global set --- util/hmac.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/hmac.lua b/util/hmac.lua index b3098380..05376575 100644 --- a/util/hmac.lua +++ b/util/hmac.lua @@ -4,7 +4,7 @@ local xor = require "bit".bxor module "hmac" local function arraystr(array) - t = {} + local t = {} for i = 1,table.getn(array) do table.insert(t, string.char(array[i])) end -- cgit v1.2.3 From 84294f210ad1196af663e6f8cdd5733eb6f86419 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 5 Jul 2009 17:10:42 +0100 Subject: util.hmac: Some optimisations --- util/hmac.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/hmac.lua b/util/hmac.lua index 05376575..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) local t = {} - for i = 1,table.getn(array) do - table.insert(t, string.char(array[i])) + for i = 1,#array do + t_insert(t, s_char(array[i])) end - return table.concat(t) + return t_concat(t) end --[[ -- cgit v1.2.3 From ef8c8fb19f409ea78cdbe301b8986666363fc5f8 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Sun, 5 Jul 2009 19:02:55 +0200 Subject: Move to-unicode conversion from mod_saslauth.lua to sasl.lua. --- util/sasl.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util') 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 = ""; -- cgit v1.2.3