zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'opensim:master' into master

Browse source
This commit is contained in:
Adil El Farissi 2024-09-17 18:28:40 +00:00 committed by GitHub
commit c31875bae8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored
View file

@ -18,4 +18,3 @@
*.ogg binary
*.dll binary
*.exe binary
*.cs text eol=crlf

2
OpenSim/Framework/Util.cs
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)]

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
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)

2
bin/OpenSim.ini.example
View file

@ -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.