aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-05-15 18:39:20 +0000
committerAdam Frisby2007-05-15 18:39:20 +0000
commit1e00633e6c50f561bc619455111e846cc480268b (patch)
tree2ad0116a01d6fa14b6c3f3a57674075f58c95d1e
parentWorked on Asset server, asset downloads (from server to sim) now work. (diff)
downloadopensim-SC_OLD-1e00633e6c50f561bc619455111e846cc480268b.zip
opensim-SC_OLD-1e00633e6c50f561bc619455111e846cc480268b.tar.gz
opensim-SC_OLD-1e00633e6c50f561bc619455111e846cc480268b.tar.bz2
opensim-SC_OLD-1e00633e6c50f561bc619455111e846cc480268b.tar.xz
Changed session ID generation to use crypto generator, and this time - work. Heh.
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework/UserProfile.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs
index eef6be1..0f21fb3 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim.Framework/UserProfile.cs
@@ -39,15 +39,16 @@ namespace OpenSim.Framework.User
39 39
40 public void InitSessionData() 40 public void InitSessionData()
41 { 41 {
42 RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
42 43
43 System.Security.Cryptography.Rfc2898DeriveBytes b = new Rfc2898DeriveBytes(MD5passwd, 128); 44 byte[] randDataS = new byte[16];
45 byte[] randDataSS = new byte[16];
44 46
45 RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); 47 rand.GetBytes(randDataS);
48 rand.GetBytes(randDataSS);
46 49
47 CurrentSessionID = new LLUUID(); 50 CurrentSecureSessionID = new LLUUID(randDataSS,0);
48 CurrentSecureSessionID = new LLUUID(); 51 CurrentSessionID = new LLUUID(randDataS,0);
49 rand.GetBytes(CurrentSecureSessionID.Data);
50 rand.GetBytes(CurrentSessionID.Data);
51 } 52 }
52 53
53 public void AddSimCircuit(uint circuitCode, LLUUID regionUUID) 54 public void AddSimCircuit(uint circuitCode, LLUUID regionUUID)