godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Generalize SSL cert reading from file

Browse Source
This commit is contained in:
Fabio Alessandrelli
2018-03-28 16:26:25 +02:00
parent d97c45ad2e
commit 490dd9f946
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/io/stream_peer_ssl.cpp
View File

@@ -29,6 +29,8 @@
/*************************************************************************/ /*************************************************************************/
#include "stream_peer_ssl.h" #include "stream_peer_ssl.h"
#include "os/file_access.h"
#include "project_settings.h"
StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL; StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL;
@@ -50,6 +52,35 @@ bool StreamPeerSSL::is_available() {
return available; return available;
} }
PoolByteArray StreamPeerSSL::get_project_cert_array() {
PoolByteArray out;
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"));
if (certs_path != "") {
FileAccess *f = FileAccess::open(certs_path, FileAccess::READ);
if (f) {
int flen = f->get_len();
out.resize(flen + 1);
{
PoolByteArray::Write w = out.write();
f->get_buffer(w.ptr(), flen);
w[flen] = 0; //end f string
}
memdelete(f);
#ifdef DEBUG_ENABLED
print_line("Loaded certs from '" + certs_path);
#endif
}
}
return out;
}
void StreamPeerSSL::_bind_methods() { void StreamPeerSSL::_bind_methods() {
ClassDB::bind_method(D_METHOD("poll"), &StreamPeerSSL::poll); ClassDB::bind_method(D_METHOD("poll"), &StreamPeerSSL::poll);

1
core/io/stream_peer_ssl.h
View File

@@ -66,6 +66,7 @@ public:
static StreamPeerSSL *create(); static StreamPeerSSL *create();
static PoolByteArray get_project_cert_array();
static void load_certs_from_memory(const PoolByteArray &p_memory); static void load_certs_from_memory(const PoolByteArray &p_memory);
static bool is_available(); static bool is_available();

24
modules/mbedtls/stream_peer_mbed_tls.cpp
View File

@@ -293,28 +293,10 @@ void StreamPeerMbedTLS::initialize_ssl() {
mbedtls_debug_set_threshold(1); mbedtls_debug_set_threshold(1);
#endif #endif
String certs_path = GLOBAL_DEF("network/ssl/certificates", ""); PoolByteArray cert_array = StreamPeerSSL::get_project_cert_array();
ProjectSettings::get_singleton()->set_custom_property_info("network/ssl/certificates", PropertyInfo(Variant::STRING, "network/ssl/certificates", PROPERTY_HINT_FILE, "*.crt"));
if (certs_path != "") { if (cert_array.size() > 0)
_load_certs(cert_array);
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);
}
}
available = true; available = true;
} }

2
modules/mbedtls/stream_peer_mbed_tls.h
View File

@@ -32,8 +32,6 @@
#define STREAM_PEER_OPEN_SSL_H #define STREAM_PEER_OPEN_SSL_H
#include "io/stream_peer_ssl.h" #include "io/stream_peer_ssl.h"
#include "os/file_access.h"
#include "project_settings.h"
#include "mbedtls/config.h" #include "mbedtls/config.h"
#include "mbedtls/ctr_drbg.h" #include "mbedtls/ctr_drbg.h"