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, 2 insertions, 5 deletions

diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index d473cf8..f042c93 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -70,11 +70,8 @@ namespace OpenSim.Services.Interfaces
         // the public key of the peer, which the connector must have
         // obtained using a remote GetPublicKey call.
         //
-        string AuthenticatePassword(UUID principalID, string password);
-        byte[] AuthenticatePasswordEncrypted(byte[] cyphertext, byte[] key);
-
-        string AuthenticateWebkey(UUID principalID, string webkey);
-        byte[] AuthenticateWebkeyEncrypted(byte[] cyphertext, byte[] key);
+        string Authenticate(UUID principalID, string password);
+        byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key);
 
         //////////////////////////////////////////////////////
         // Verification