Merge remote-tracking branch 'upstream/master' into pair_symbols_tool

1 files changed, 29 insertions, 0 deletions

diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp
new file mode 100644
index 0000000000..a7132d99ef
--- /dev/null
+++ b/core/io/stream_peer_ssl.cpp
@@ -0,0 +1,29 @@
+#include "stream_peer_ssl.h"
+
+
+StreamPeerSSL* (*StreamPeerSSL::_create)()=NULL;
+
+
+StreamPeerSSL *StreamPeerSSL::create() {
+
+	return _create();
+}
+
+
+void StreamPeerSSL::_bind_methods() {
+
+
+	ObjectTypeDB::bind_method(_MD("accept:Error","stream:StreamPeer"),&StreamPeerSSL::accept);
+	ObjectTypeDB::bind_method(_MD("connect:Error","stream:StreamPeer","validate_certs","for_hostname"),&StreamPeerSSL::connect,DEFVAL(false),DEFVAL(String()));
+	ObjectTypeDB::bind_method(_MD("get_status"),&StreamPeerSSL::get_status);
+	ObjectTypeDB::bind_method(_MD("disconnect"),&StreamPeerSSL::disconnect);
+	BIND_CONSTANT( STATUS_DISCONNECTED );
+	BIND_CONSTANT( STATUS_CONNECTED );
+	BIND_CONSTANT( STATUS_ERROR_NO_CERTIFICATE );
+	BIND_CONSTANT( STATUS_ERROR_HOSTNAME_MISMATCH );
+
+}
+
+StreamPeerSSL::StreamPeerSSL()
+{
+}