summaryrefslogtreecommitdiffstats
path: root/core/io/stream_peer_ssl.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-03-12 10:44:12 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-03-12 10:46:38 -0300
commit8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a (patch)
tree77bd972e494e7deeef49bfa271c94d03ef2af749 /core/io/stream_peer_ssl.cpp
parentd85f06c42d54971af5da826581c75d1ed001475e (diff)
downloadredot-engine-8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a.tar.gz
-Made editor support SSL certs by default (embedded them)
-Made asset sharing support https -Many fixes to HTTPRequest -Added an asset installer dialog -Visual cleanups to asset sharing tab -Fixed some issues in ScrollContainer, hope it does not break things -Asset sharing tab is not visible (hidden on purpose) for now.
Diffstat (limited to 'core/io/stream_peer_ssl.cpp')
-rw-r--r--core/io/stream_peer_ssl.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
index a7132d99ef..2114993783 100644
--- a/core/io/stream_peer_ssl.cpp
+++ b/core/io/stream_peer_ssl.cpp
@@ -4,12 +4,28 @@
StreamPeerSSL* (*StreamPeerSSL::_create)()=NULL;
+
+
StreamPeerSSL *StreamPeerSSL::create() {
return _create();
}
+
+StreamPeerSSL::LoadCertsFromMemory StreamPeerSSL::load_certs_func=NULL;
+bool StreamPeerSSL::available=false;
+bool StreamPeerSSL::initialize_certs=true;
+
+void StreamPeerSSL::load_certs_from_memory(const ByteArray& p_memory) {
+ if (load_certs_func)
+ load_certs_func(p_memory);
+}
+
+bool StreamPeerSSL::is_available() {
+ return available;
+}
+
void StreamPeerSSL::_bind_methods() {