diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-15 14:45:54 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-09-15 14:45:54 +0200 |
| commit | 0e56377e96ee492cc30de9ad2e6e9242737f4dbd (patch) | |
| tree | 2f2a60a28e21b5b8f90218b2f8df18ecc4fa6c09 /core/io/stream_peer_ssl.h | |
| parent | d2b38aabecd8f9bac5c050841f730ccbe07538f2 (diff) | |
| download | redot-engine-0e56377e96ee492cc30de9ad2e6e9242737f4dbd.tar.gz | |
Allow system certs file to be used by Editor.
Note, it will only used by the Editor, not when running the game.
This allows package maintainer to compile Godot to use system installed
certificates when accessing the AssetLib.
Diffstat (limited to 'core/io/stream_peer_ssl.h')
| -rw-r--r-- | core/io/stream_peer_ssl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/io/stream_peer_ssl.h b/core/io/stream_peer_ssl.h index f66c1c7de9..8ce36d7e7d 100644 --- a/core/io/stream_peer_ssl.h +++ b/core/io/stream_peer_ssl.h @@ -46,9 +46,6 @@ protected: static LoadCertsFromMemory load_certs_func; static bool available; - friend class Main; - static bool initialize_certs; - bool blocking_handshake; public: @@ -72,7 +69,9 @@ public: static StreamPeerSSL *create(); + static PoolByteArray get_cert_file_as_array(String p_path); static PoolByteArray get_project_cert_array(); + static void load_certs_from_file(String p_path); static void load_certs_from_memory(const PoolByteArray &p_memory); static bool is_available(); |