diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-04 04:26:14 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-04 04:26:14 -0400 |
| commit | d49ee1f8ab34a4328adacbedf5daec7b25d0df14 (patch) | |
| tree | 771f738ab34d0a7c66ca69f31ba23d42ffab666e /OpenSim/Services/Interfaces/IAuthenticationService.cs | |
| parent | * Make the RegionCombinerModule also register to handle permissions for the v... (diff) | |
| parent | preparing LandData seriali(s|z)ation into OAR [not yet functional] (diff) | |
| download | opensim-SC_OLD-d49ee1f8ab34a4328adacbedf5daec7b25d0df14.zip opensim-SC_OLD-d49ee1f8ab34a4328adacbedf5daec7b25d0df14.tar.gz opensim-SC_OLD-d49ee1f8ab34a4328adacbedf5daec7b25d0df14.tar.bz2 opensim-SC_OLD-d49ee1f8ab34a4328adacbedf5daec7b25d0df14.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Interfaces/IAuthenticationService.cs')
| -rw-r--r-- | OpenSim/Services/Interfaces/IAuthenticationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs index f042c93..b448a14 100644 --- a/OpenSim/Services/Interfaces/IAuthenticationService.cs +++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Services.Interfaces | |||
| 70 | // the public key of the peer, which the connector must have | 70 | // the public key of the peer, which the connector must have |
| 71 | // obtained using a remote GetPublicKey call. | 71 | // obtained using a remote GetPublicKey call. |
| 72 | // | 72 | // |
| 73 | string Authenticate(UUID principalID, string password); | 73 | string Authenticate(UUID principalID, string password, int lifetime); |
| 74 | byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key); | 74 | byte[] AuthenticateEncrypted(byte[] cyphertext, byte[] key); |
| 75 | 75 | ||
| 76 | ////////////////////////////////////////////////////// | 76 | ////////////////////////////////////////////////////// |
| @@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces | |||
| 85 | // must be used to refresh. Unencrypted verification is still | 85 | // must be used to refresh. Unencrypted verification is still |
| 86 | // performed, but doesn't refresh token lifetime. | 86 | // performed, but doesn't refresh token lifetime. |
| 87 | // | 87 | // |
| 88 | bool Verify(UUID principalID, string token); | 88 | bool Verify(UUID principalID, string token, int lifetime); |
| 89 | bool VerifyEncrypted(byte[] cyphertext, byte[] key); | 89 | bool VerifyEncrypted(byte[] cyphertext, byte[] key); |
| 90 | 90 | ||
| 91 | ////////////////////////////////////////////////////// | 91 | ////////////////////////////////////////////////////// |