aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 18:50:44 +0000
committerAdam Frisby2008-05-01 18:50:44 +0000
commit76d8eaa4069d6445c47784168e274ba4253f7b9c (patch)
tree6f0f023b9c994253f3f6808edf94949c7ebd2d29 /OpenSim/Data
parentAttempt to locate SL client in LaunchSLClient under other Unices. (diff)
downloadopensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.zip
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.gz
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.bz2
opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.xz
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs16
4 files changed, 3 insertions, 19 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 3330732..cf81bee 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Data.MSSQL
417 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 417 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
418 { 418 {
419 SHA512Managed HashProvider = new SHA512Managed(); 419 SHA512Managed HashProvider = new SHA512Managed();
420 ASCIIEncoding TextProvider = new ASCIIEncoding(); 420 Encoding TextProvider = new UTF8Encoding();
421 421
422 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 422 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
423 byte[] hash = HashProvider.ComputeHash(stream); 423 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index df52ae0..e830133 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
366 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 366 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
367 { 367 {
368 SHA512Managed HashProvider = new SHA512Managed(); 368 SHA512Managed HashProvider = new SHA512Managed();
369 ASCIIEncoding TextProvider = new ASCIIEncoding(); 369 Encoding TextProvider = new UTF8Encoding();
370 370
371 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 371 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
372 byte[] hash = HashProvider.ComputeHash(stream); 372 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index f07b98f..989ec77 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Data.SQLite
224 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 224 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
225 { 225 {
226 SHA512Managed HashProvider = new SHA512Managed(); 226 SHA512Managed HashProvider = new SHA512Managed();
227 ASCIIEncoding TextProvider = new ASCIIEncoding(); 227 Encoding TextProvider = new UTF8Encoding();
228 228
229 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); 229 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
230 byte[] hash = HashProvider.ComputeHash(stream); 230 byte[] hash = HashProvider.ComputeHash(stream);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 9908735..b648ee8 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1223,22 +1223,6 @@ namespace OpenSim.Data.SQLite
1223 s.TextureEntry = textureEntry; 1223 s.TextureEntry = textureEntry;
1224 1224
1225 s.ExtraParams = (byte[]) row["ExtraParams"]; 1225 s.ExtraParams = (byte[]) row["ExtraParams"];
1226 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
1227 // string texture = encoding.GetString((Byte[])row["Texture"]);
1228 // if (!texture.StartsWith("<"))
1229 // {
1230 // //here so that we can still work with old format database files (ie from before I added xml serialization)
1231 // LLObject.TextureEntry textureEntry = null;
1232 // textureEntry = new LLObject.TextureEntry(new LLUUID(texture));
1233 // s.TextureEntry = textureEntry.ToBytes();
1234 // }
1235 // else
1236 // {
1237 // TextureBlock textureEntry = TextureBlock.FromXmlString(texture);
1238 // s.TextureEntry = textureEntry.TextureData;
1239 // s.ExtraParams = textureEntry.ExtraParams;
1240 // }
1241
1242 return s; 1226 return s;
1243 } 1227 }
1244 1228