diff options
Diffstat (limited to 'OpenSim')
5 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs index 6d8586d..2a13502 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Client.Linden | |||
119 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); | 119 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); |
120 | 120 | ||
121 | bool loginresult = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 121 | bool loginresult = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
122 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 122 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture)); |
123 | return loginresult; | 123 | return loginresult; |
124 | } | 124 | } |
125 | } | 125 | } |
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 7eab7c5..332ff70 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
@@ -540,8 +540,8 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
540 | password = password.Remove(0, 3); //remove $1$ | 540 | password = password.Remove(0, 3); //remove $1$ |
541 | string s = Util.Md5Hash(password + ":" + userProfile.PasswordSalt); | 541 | string s = Util.Md5Hash(password + ":" + userProfile.PasswordSalt); |
542 | return (userProfile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 542 | return (userProfile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
543 | || userProfile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 543 | || userProfile.PasswordHash.Equals(password, StringComparison.InvariantCulture)); |
544 | } | 544 | } |
545 | else | 545 | else |
546 | { | 546 | { |
547 | return true; | 547 | return true; |
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs index 3ab9b38..d3f813e 100644 --- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs +++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | |||
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Communications.Services | |||
234 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); | 234 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); |
235 | 235 | ||
236 | bool loginresult = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 236 | bool loginresult = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
237 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 237 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture)); |
238 | return loginresult; | 238 | return loginresult; |
239 | } | 239 | } |
240 | } | 240 | } |
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index 7eb98d7..897c763 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -769,8 +769,8 @@ namespace OpenSim.Framework.Communications.Services | |||
769 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); | 769 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); |
770 | 770 | ||
771 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 771 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
772 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 772 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture)); |
773 | 773 | ||
774 | return passwordSuccess; | 774 | return passwordSuccess; |
775 | } | 775 | } |
776 | 776 | ||
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/AuthenticationService.cs index 6eaf0b0..06f0e8f 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationService.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Services.AuthenticationService | |||
126 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); | 126 | //m_log.Info("[LOGIN]: userprofile:" + profile.passwordHash + " SubCT:" + password); |
127 | 127 | ||
128 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) | 128 | passwordSuccess = (profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase) |
129 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCultureIgnoreCase)); | 129 | || profile.PasswordHash.Equals(password, StringComparison.InvariantCulture)); |
130 | 130 | ||
131 | return passwordSuccess; | 131 | return passwordSuccess; |
132 | } | 132 | } |