Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@5b52b4b5c4

Browse Source
This commit is contained in:
Spartan322
2025-01-12 06:56:34 -05:00
parent 9c31ef21f3 5b52b4b5c4
commit 5e6a04e752
439 changed files with 8067 additions and 5255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mbedtls/crypto_mbedtls.cpp
View File

@@ -101,10 +101,11 @@ Error CryptoKeyMbedTLS::save(const String &p_path, bool p_public_only) {
Error CryptoKeyMbedTLS::load_from_string(const String &p_string_key, bool p_public_only) {
int ret = 0;
const CharString string_key_utf8 = p_string_key.utf8();
if (p_public_only) {
ret = mbedtls_pk_parse_public_key(&pkey, (unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size());
ret = mbedtls_pk_parse_public_key(&pkey, (const unsigned char *)string_key_utf8.get_data(), string_key_utf8.size());
} else {
ret = _parse_key((unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size());
ret = _parse_key((const unsigned char *)string_key_utf8.get_data(), string_key_utf8.size());
}
ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing key '" + itos(ret) + "'.");