Merge branch 'opensim:master' into master

This commit is contained in:
Adil El Farissi
2024-09-17 18:28:40 +00:00
committed by GitHub
4 changed files with 4 additions and 5 deletions

View File

@@ -1421,7 +1421,7 @@ namespace OpenSim.Framework
}
}
return $"{Convert.ToHexString(iv)}:{Convert.ToHexString(encryptedText)}";
return $"{Convert.ToHexString(iv)}:{Convert.ToHexString(encryptedText).ToLower()}";
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

View File

@@ -6549,7 +6549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLShoutError("osAESEncrypt: Failed to encrypt!");
return LSL_String.Empty;
}
return ret.ToString().ToLower();
return ret.ToString();
}
public LSL_String osAESDecrypt(string secret, string encryptedText)
@@ -6577,7 +6577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLShoutError("osAESEncryptTo: Failed to encrypt!");
return LSL_String.Empty;
}
return ret.ToString().ToLower();
return ret.ToString();
}
public LSL_String osAESDecryptFrom(string secret, string encryptedText, string ivString)