Remove the distinction between password and login key in the authentication

service. This will be done in the login service instead, it's out of
scope for an authenticator

1 files changed, 3 insertions, 13 deletions

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 803d90c..d20edb3 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -36,29 +36,19 @@ namespace OpenSim.Services.AuthenticationService
     // or any other components that need 
     // verifiable identification.
     //
-    public class AuthenticationService
+    public class PasswordAuthenticationService
     {
         public byte[] GetPublicKey()
         {
             return new byte[0];
         }
 
-        public string AuthenticatePassword(UUID principalID, string password)
+        public string Authenticate(UUID principalID, string password)
         {
             return String.Empty;
         }
 
-        public byte[] AuthenticatePasswordEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return new byte[0];
-        }
-
-        public string AuthenticateWebkey(UUID principalID, string webkey)
-        {
-            return String.Empty;
-        }
-
-        public byte[] AuthenticateWebkeyEncrypted(byte[] cyphertext, byte[] key)
+        public byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key)
         {
             return new byte[0];
         }