ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few changes to last PR (aes methods) - all still untested

Browse Source
This commit is contained in:
UbitUmarov
2024-02-24 14:50:28 +00:00
parent 662eac32a2
commit 121f270414
2 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -6380,14 +6380,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(string.IsNullOrEmpty(secret) || string.IsNullOrEmpty(plainText))
return LSL_String.Empty;
LSL_String ret = Util.AESEncrypt(secret, plainText);
if(string.IsNullOrEmpty(ret)){
string ret = Util.AESEncrypt(secret, plainText);
if(string.IsNullOrEmpty(ret))
{
OSSLShoutError("osAESEncrypt: Failed to encrypt!");
return LSL_String.Empty;
}else
{
return ret;
}
return ret;
}
public LSL_String osAESDecrypt(string secret, string encryptedText)
@@ -6395,14 +6394,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(string.IsNullOrEmpty(secret) || string.IsNullOrEmpty(encryptedText))
return LSL_String.Empty;
LSL_String ret = Util.AESDecrypt(secret, encryptedText);
if(string.IsNullOrEmpty(ret)){
string ret = Util.AESDecrypt(secret, encryptedText);
if(string.IsNullOrEmpty(ret))
{
OSSLShoutError("osAESDecrypt: Failed to Decrypt!");
return LSL_String.Empty;
}else
{
return ret;
}
return ret;
}
public LSL_String osAESEncryptTo(string secret, string plainText, string ivString)
@@ -6410,14 +6408,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(string.IsNullOrEmpty(secret) || string.IsNullOrEmpty(plainText) || string.IsNullOrEmpty(ivString))
return LSL_String.Empty;
LSL_String ret = Util.AESEncryptTo(secret, plainText, ivString);
if(string.IsNullOrEmpty(ret)){
string ret = Util.AESEncryptTo(secret, plainText, ivString);
if(string.IsNullOrEmpty(ret))
{
OSSLShoutError("osAESEncryptTo: Failed to encrypt!");
return LSL_String.Empty;
}else
{
return ret;
}
return ret;
}
public LSL_String osAESDecryptFrom(string secret, string encryptedText, string ivString)
@@ -6425,14 +6422,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(string.IsNullOrEmpty(secret) || string.IsNullOrEmpty(encryptedText) || string.IsNullOrEmpty(ivString))
return LSL_String.Empty;
LSL_String ret = Util.AESDecryptFrom(secret, encryptedText, ivString);
if(string.IsNullOrEmpty(ret)){
string ret = Util.AESDecryptFrom(secret, encryptedText, ivString);
if(string.IsNullOrEmpty(ret))
{
OSSLShoutError("osAESDecryptFrom: Failed to decrypt!");
return LSL_String.Empty;
}else
{
return ret;
}
return ret;
}
}
}