Mercurial > lxmppd-hg-xmllex / changeset

--- a/util/sasl/digest-md5.lua	Sat Nov 28 18:23:25 2009 +0100
+++ b/util/sasl/digest-md5.lua	Sat Nov 28 18:32:41 2009 +0100
@@ -28,10 +28,6 @@
 
 --=========================
 --SASL DIGEST-MD5 according to RFC 2831
-local function digest_response()
-	
-	return response, A1, A2
-end
 
 local function digest(self, message)
 	--TODO complete support for authzid
@@ -174,7 +170,7 @@
 			local password, state = self.profile.plain(response["username"], self.realm)
 			if state == nil then return "failure", "not-authorized"
 			elseif state == false then return "failure", "account-disabled" end
-			Y = md5(response["username"]..":"..response["realm"]..":"..password);
+			local Y = md5(response["username"]..":"..response["realm"]..":"..password);
 		elseif self.profile["digest-md5"] then
 			local Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"])
 			if state == nil then return "failure", "not-authorized"

--- a/util/sasl/scram.lua	Sat Nov 28 18:23:25 2009 +0100
+++ b/util/sasl/scram.lua	Sat Nov 28 18:32:41 2009 +0100
@@ -54,7 +54,7 @@
 	local Ust = hmac(str, salt.."\0\0\0\1");
 	local res = Ust;	
 	for n=1,i-1 do
-		Und = hmac(str, Ust)
+		local Und = hmac(str, Ust)
 		res = binaryXOR(res, Und)
 		Ust = Und
 	end
@@ -118,7 +118,7 @@
 		
 		local password;
 		if self.profile.plain then
-			password, state = self.profile.plain(self.state.name, self.realm)
+			local password, state = self.profile.plain(self.state.name, self.realm)
 			if state == nil then return "failure", "not-authorized"
 			elseif state == false then return "failure", "account-disabled" end
 			password = saslprep(password);