From 833d8f49916b3461f36ac5b039f5ed856016e368 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 16 Sep 2024 21:08:11 +0100 Subject: [PATCH 1/2] minor changes --- .gitattributes | 1 - OpenSim/Framework/Util.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +- bin/OpenSim.ini.example | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 58e09b0246..70bb56362c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,4 +18,3 @@ *.ogg binary *.dll binary *.exe binary -*.cs text eol=crlf diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 7ca7d93416..301ca81ae1 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -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)] diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index a01bc3c320..cbd5cb96eb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -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) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 3c2ff30b47..458b44b4e4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -309,7 +309,7 @@ ;; default is false ; TelehubAllowLandmark = false - + ;; Let's Encrypt and others ".pem" certificates converter settings. ;; Enabling this feature will automatically convert the CA .pem certificates to ;; OpenSim compatible PKCS12 .p12 and .pfx certificates on every server startup. From 27361a44720e67705a12137c4d00347c4559e75d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 16 Sep 2024 21:20:15 +0100 Subject: [PATCH 2/2] miss one minor changes, for coerence --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index cbd5cb96eb..2bfa6c047d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -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)