-Fixes to OpenSSL compilation (more)

-Fix bug in GDScript, now static functions can call static functions.

2 files changed, 22 insertions, 0 deletions

diff --git a/drivers/openssl/register_openssl.cpp b/drivers/openssl/register_openssl.cpp
index fe12c55656..a4a60813b6 100644
--- a/drivers/openssl/register_openssl.cpp
+++ b/drivers/openssl/register_openssl.cpp
@@ -1,6 +1,7 @@
 #include "register_openssl.h"

 

 #include "stream_peer_openssl.h"

+#ifdef OPENSSL_ENABLED

 

 void register_openssl() {

 

@@ -14,3 +15,5 @@ void unregister_openssl() {
 	StreamPeerOpenSSL::finalize_ssl();

 

 }

+#endif

+

diff --git a/drivers/openssl/stream_peer_openssl.cpp b/drivers/openssl/stream_peer_openssl.cpp
index 0751c76e3d..0151ced3b8 100644
--- a/drivers/openssl/stream_peer_openssl.cpp
+++ b/drivers/openssl/stream_peer_openssl.cpp
@@ -553,6 +553,25 @@ void StreamPeerOpenSSL::initialize_ssl() {
 	}
 	String config_path =GLOBAL_DEF("ssl/config","");
 	Globals::get_singleton()->set_custom_property_info("ssl/config",PropertyInfo(Variant::STRING,"ssl/config",PROPERTY_HINT_FILE,"*.cnf"));
+	if (config_path!="") {
+
+		Vector<uint8_t> data = FileAccess::get_file_as_array(config_path);
+		if (data.size()) {
+			data.push_back(0);
+			BIO* mem = BIO_new(BIO_s_mem());
+			BIO_puts(mem,(const char*) data.ptr());
+
+			while(true) {
+				X509*cert = PEM_read_bio_X509(mem, NULL, 0, NULL);
+				if (!cert)
+					break;
+				certs.push_back(cert);
+			}
+			BIO_free(mem);
+		}
+		print_line("Loaded certs from '"+certs_path+"':  "+itos(certs.size()));
+
+	}
 
 }