diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2023-06-27 06:58:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 06:58:34 +0200 |
| commit | 950f4c3b41acef0403618dd6169be90530dea5da (patch) | |
| tree | f9ffa91e48ca635e5d4643c031c83323da9291f9 | |
| parent | 1f9e540f14edbf2d496a1421f8d37e5b483c4c53 (diff) | |
| parent | 8321e0355e8cab2e5222ac94d724874d173e1dd4 (diff) | |
| download | redot-engine-950f4c3b41acef0403618dd6169be90530dea5da.tar.gz | |
Merge pull request #78716 from akien-mga/mbedtls-load-error-handling
mbedtls: Improve X509 certificate load error handling
| -rw-r--r-- | modules/mbedtls/crypto_mbedtls.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp index 50a6909d1a..47c0dc9bb6 100644 --- a/modules/mbedtls/crypto_mbedtls.cpp +++ b/modules/mbedtls/crypto_mbedtls.cpp @@ -139,11 +139,11 @@ X509Certificate *X509CertificateMbedTLS::create() { } Error X509CertificateMbedTLS::load(String p_path) { - ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is in use"); + ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is already in use."); PackedByteArray out; Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ); - ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, "Cannot open X509CertificateMbedTLS file '" + p_path + "'."); + ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, vformat("Cannot open X509CertificateMbedTLS file '%s'.", p_path)); uint64_t flen = f->get_length(); out.resize(flen + 1); @@ -151,22 +151,28 @@ Error X509CertificateMbedTLS::load(String p_path) { out.write[flen] = 0; // string terminator int ret = mbedtls_x509_crt_parse(&cert, out.ptr(), out.size()); - ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing some certificates: " + itos(ret)); + ERR_FAIL_COND_V_MSG(ret < 0, FAILED, vformat("Error parsing X509 certificates from file '%s': %d.", p_path, ret)); + if (ret > 0) { // Some certs parsed fine, don't error. + print_verbose(vformat("MbedTLS: Some X509 certificates could not be parsed from file '%s' (%d certificates skipped).", p_path, ret)); + } return OK; } Error X509CertificateMbedTLS::load_from_memory(const uint8_t *p_buffer, int p_len) { - ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is in use"); + ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is already in use."); int ret = mbedtls_x509_crt_parse(&cert, p_buffer, p_len); - ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing certificates: " + itos(ret)); + ERR_FAIL_COND_V_MSG(ret < 0, FAILED, vformat("Error parsing X509 certificates: %d.", ret)); + if (ret > 0) { // Some certs parsed fine, don't error. + print_verbose(vformat("MbedTLS: Some X509 certificates could not be parsed (%d certificates skipped).", ret)); + } return OK; } Error X509CertificateMbedTLS::save(String p_path) { Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::WRITE); - ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, "Cannot save X509CertificateMbedTLS file '" + p_path + "'."); + ERR_FAIL_COND_V_MSG(f.is_null(), ERR_INVALID_PARAMETER, vformat("Cannot save X509CertificateMbedTLS file '%s'.", p_path)); mbedtls_x509_crt *crt = &cert; while (crt) { @@ -203,11 +209,14 @@ String X509CertificateMbedTLS::save_to_string() { } Error X509CertificateMbedTLS::load_from_string(const String &p_string_key) { - ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is in use"); + ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is already in use."); CharString cs = p_string_key.utf8(); int ret = mbedtls_x509_crt_parse(&cert, (const unsigned char *)cs.get_data(), cs.size()); - ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing some certificates: " + itos(ret)); + ERR_FAIL_COND_V_MSG(ret < 0, FAILED, vformat("Error parsing X509 certificates: %d.", ret)); + if (ret > 0) { // Some certs parsed fine, don't error. + print_verbose(vformat("MbedTLS: Some X509 certificates could not be parsed (%d certificates skipped).", ret)); + } return OK; } |