diff options
author | Justin Clark-Casey (justincc) | 2010-09-03 21:34:31 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-03 21:34:31 +0100 |
commit | d6deebdd63d16f04a643b1bc26c4ccc4e59f68b7 (patch) | |
tree | c2c5e1fc4ff1f44f4f79023094af1e1580fb87ef /OpenSim/Services | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-d6deebdd63d16f04a643b1bc26c4ccc4e59f68b7.zip opensim-SC_OLD-d6deebdd63d16f04a643b1bc26c4ccc4e59f68b7.tar.gz opensim-SC_OLD-d6deebdd63d16f04a643b1bc26c4ccc4e59f68b7.tar.bz2 opensim-SC_OLD-d6deebdd63d16f04a643b1bc26c4ccc4e59f68b7.tar.xz |
Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983. Thanks cmickeyb.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 7a96a05..9c4718e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -253,7 +253,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
253 | if (password == simianGridCredential || | 253 | if (password == simianGridCredential || |
254 | "$1$" + password == simianGridCredential || | 254 | "$1$" + password == simianGridCredential || |
255 | "$1$" + Utils.MD5String(password) == simianGridCredential || | 255 | "$1$" + Utils.MD5String(password) == simianGridCredential || |
256 | Utils.MD5String(password) == simianGridCredential) | 256 | Utils.MD5String(password) == simianGridCredential || |
257 | "$1$" + Utils.MD5String(password + ":") == simianGridCredential) | ||
257 | { | 258 | { |
258 | authorizeResult = Authorize(userID); | 259 | authorizeResult = Authorize(userID); |
259 | return true; | 260 | return true; |