Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

3 files changed, 0 insertions, 25 deletions

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 2ed177c..8904461 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -90,31 +90,16 @@ namespace OpenSim.Services.AuthenticationService
                 throw new Exception("Could not find a storage interface in the given module");
         }
 
-        public virtual byte[] GetPublicKey()
-        {
-            return new byte[0];
-        }
-
         public bool Verify(UUID principalID, string token, int lifetime)
         {
             return m_Database.CheckToken(principalID, token, lifetime);
         }
 
-        public bool VerifyEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return false;
-        }
-
         public virtual bool Release(UUID principalID, string token)
         {
             return m_Database.CheckToken(principalID, token, 0);
         }
 
-        public virtual bool ReleaseEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return false;
-        }
-
         protected string GetToken(UUID principalID, int lifetime)
         {
             UUID token = UUID.Random();
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 7fdbbf6..6c99b66 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -76,10 +76,5 @@ namespace OpenSim.Services.AuthenticationService
 
             return String.Empty;
         }
-
-        public byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return new byte[0];
-        }
     }
 }
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
index 0118c91..8831c8a 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -56,10 +56,5 @@ namespace OpenSim.Services.AuthenticationService
         {
             return String.Empty;
         }
-
-        public byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key)
-        {
-            return new byte[0];
-        }
     }
 }