aboutsummaryrefslogtreecommitdiff
path: root/modules/mbedtls/stream_peer_mbed_tls.cpp
diff options
context:
space:
mode:
authorFabio Alessandrelli2018-03-28 16:26:25 +0200
committerFabio Alessandrelli2018-04-03 20:13:57 +0200
commit490dd9f946e7e0ef2945f5c1f089ca79b1a602af (patch)
tree396320e63bbeae9d5ae02a0fb0acef8c6e11e25a /modules/mbedtls/stream_peer_mbed_tls.cpp
parentd97c45ad2eafa83a463ef1480436fbba33d1b8fa (diff)
downloadgodot-490dd9f946e7e0ef2945f5c1f089ca79b1a602af.tar.gz
godot-490dd9f946e7e0ef2945f5c1f089ca79b1a602af.tar.zst
godot-490dd9f946e7e0ef2945f5c1f089ca79b1a602af.zip
Diffstat (limited to 'modules/mbedtls/stream_peer_mbed_tls.cpp')
-rwxr-xr-xmodules/mbedtls/stream_peer_mbed_tls.cpp24
1 files changed, 3 insertions, 21 deletions
diff --git a/modules/mbedtls/stream_peer_mbed_tls.cpp b/modules/mbedtls/stream_peer_mbed_tls.cpp
index 4135eb40f..a63e53ec1 100755
--- a/modules/mbedtls/stream_peer_mbed_tls.cpp
+++ b/modules/mbedtls/stream_peer_mbed_tls.cpp
@@ -293,28 +293,10 @@ void StreamPeerMbedTLS::initialize_ssl() {
mbedtls_debug_set_threshold(1);
#endif
- String certs_path = GLOBAL_DEF("network/ssl/certificates", "");
- ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificates", PropertyInfo(Variant::STRING, "network/ssl/certificates", PROPERTY_HINT_FILE, "*.crt"));
+ PoolByteArray cert_array = StreamPeerSSL::get_project_cert_array();
- if (certs_path != "") {
-
- FileAccess *f = FileAccess::open(certs_path, FileAccess::READ);
- if (f) {
- PoolByteArray arr;
- int flen = f->get_len();
- arr.resize(flen + 1);
- {
- PoolByteArray::Write w = arr.write();
- f->get_buffer(w.ptr(), flen);
- w[flen] = 0; //end f string
- }
-
- memdelete(f);
-
- _load_certs(arr);
- print_line("Loaded certs from '" + certs_path);
- }
- }
+ if (cert_array.size() > 0)
+ _load_certs(cert_array);
available = true;
}