From 497262e45231b9ee08c4cd0c31a7dcd11697ffe7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 27 Mar 2022 23:51:33 +0100 Subject: [PATCH] also revert ParseUniversalUserIdentifier to its original form, possivle making a useless Substring --- OpenSim/Framework/Util.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 463a5b08fe..e5ce57d3d3 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -1269,10 +1269,8 @@ namespace OpenSim.Framework private static byte[] ComputeSHA1Hash(byte[] src) { - byte[] ret; - using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider()) - ret = SHA1.ComputeHash(src); - return ret; + using (SHA1 sha = SHA1.Create()) + return sha.ComputeHash(src); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -4098,15 +4096,12 @@ namespace OpenSim.Framework public static bool ParseUniversalUserIdentifier(string value, out UUID uuid) { - /* if (value.Length < 36) { uuid = UUID.Zero; return false; } return (value.Length == 36) ? UUID.TryParse(value, out uuid) : UUID.TryParse(value.Substring(0, 36), out uuid); - */ - return UUID.TryParse(value, out uuid); // uuid now only looks to first 36bytes } public static unsafe string RemoveUniversalUserIdentifierSecret(string value)