From 2e6fcdb2d0126ddf6dac449d950ffbf5c7c523ba Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Mon, 8 Dec 2008 00:18:01 +0500 Subject: Latin1 support for SASL DIGEST-MD5 (second, and possibly final commit) --- util/sasl.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/sasl.lua b/util/sasl.lua index 75f1da96..89980eb2 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -177,11 +177,10 @@ local function new_digest_md5(realm, password_handler) if not response["qop"] then response["qop"] = "auth" end if response["realm"] == nil then response["realm"] = "" end - local raw_realm = response["realm"]; + local decoder; if response["charset"] == nil then - response["username"] = latin1toutf8(response["username"]) - response["realm"] = utf8tolatin1ifpossible(response["realm"]) + decoder = utf8tolatin1ifpossible; elseif response["charset"] ~= "utf-8" then return "failure", "incorrect-encoding", "The client's response uses "..response["charset"].." for encoding with isn't supported by sasl.lua. Supported encodings are latin or utf-8." end @@ -197,7 +196,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"], response["realm"], "DIGEST-MD5", raw_realm) + local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5", decoder) if Y == nil then return "failure", "not-authorized" elseif Y == false then return "failure", "account-disabled" end -- cgit v1.2.3