mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 00:46:02 +08:00
Merge branch 'opensim:master' into master
This commit is contained in:
@@ -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)]
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user