aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs9
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 8e88844..3ed9172 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -270,11 +270,10 @@ namespace OpenSim.Framework.Communications.Cache
270 // passphrase and salt value. The password will be created using 270 // passphrase and salt value. The password will be created using
271 // the specified hash algorithm. Password creation can be done in 271 // the specified hash algorithm. Password creation can be done in
272 // several iterations. 272 // several iterations.
273 PasswordDeriveBytes password = new PasswordDeriveBytes( 273 PasswordDeriveBytes password = new PasswordDeriveBytes(passPhrase,
274 passPhrase, 274 saltValueBytes,
275 saltValueBytes, 275 hashAlgorithm,
276 hashAlgorithm, 276 passwordIterations);
277 passwordIterations);
278 277
279 // Use the password to generate pseudo-random bytes for the encryption 278 // Use the password to generate pseudo-random bytes for the encryption
280 // key. Specify the size of the key in bytes (instead of bits). 279 // key. Specify the size of the key in bytes (instead of bits).
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 90c5206..24e9ca9 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
350 350
351 try 351 try
352 { 352 {
353 bool GoodLogin = false; 353 // bool GoodLogin = false;
354 354
355 string startLocationRequest = "last"; 355 string startLocationRequest = "last";
356 356