Make some more variables to locals.

diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index f8e0e393fdabd9e1474e4a7aaa3de445eb1f5126..a14e875bdbba632d5de5c1fde4249bf7d7172a56 100644 (file)
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -28,10 +28,6 @@ module "digest-md5"
 
 --=========================
 --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 function digest(self, message)
                        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"

diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 4413e2a6822bc56e124668be81b8b5697fbdd47d..1e9c6f7d2d5a6593855b6d195a2aad8d0e87167a 100644 (file)
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -54,7 +54,7 @@ local function Hi(hmac, str, salt, i)
        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 function scram_sha_1(self, message)
                
                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);