From 631e249397fd7cd2a2c5a7cb4c1feba664a41b2e Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Fri, 28 Nov 2008 01:16:26 +0500
Subject: Completely switched to new hashes library from the old md5 library
---
core/usermanager.lua | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'core')
diff --git a/core/usermanager.lua b/core/usermanager.lua
index 808faf71..a5229f38 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -19,15 +19,12 @@ function validate_credentials(host, username, password, method)
end
end
-- must do md5
- if not hashes.md5 then
- return nil, "Server misconfiguration, the md5 library is not available.";
- end
-- make credentials md5
local pwd = credentials.password;
- if not pwd then pwd = credentials.md5; else pwd = hashes.md5(pwd); end
+ if not pwd then pwd = credentials.md5; else pwd = hashes.md5(pwd, true); end
-- make password md5
if method == "PLAIN" then
- password = hashes.md5(password or "");
+ password = hashes.md5(password or "", true);
elseif method ~= "DIGEST-MD5" then
return nil, "Unsupported auth method";
end
@@ -49,9 +46,7 @@ end
function get_supported_methods(host)
local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config
- if hashes.md5 then
- methods["DIGEST-MD5"] = true;
- end
+ methods["DIGEST-MD5"] = true;
return methods;
end
--
cgit v1.2.3