godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Adjust openssl #defines to be libressl compatible

Browse Source 
Corrected inability to build on systems using libressl instead of
openssl (e. g. void linux) by adjusting the #defines in
modules/openssl/stream_peer_openssl.cpp and
modules/openssl/stream_peer_openssl.h to check if
LIBRESSL_VERSION_NUMBER is defined (as done similarly in the following
patch in freebsd:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219362 ).
This commit is contained in:
Matthew Kunjummen
2017-10-17 21:03:00 -05:00
parent bac99b6811
commit d154b846e8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openssl/stream_peer_openssl.cpp
View File

@@ -30,7 +30,7 @@
#include "stream_peer_openssl.h" #include "stream_peer_openssl.h"
// Compatibility with OpenSSL 1.1.0. // Compatibility with OpenSSL 1.1.0.
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
#define BIO_set_num(b, n) #define BIO_set_num(b, n)
#else #else
#define BIO_set_num(b, n) ((b)->num = (n)) #define BIO_set_num(b, n) ((b)->num = (n))
@@ -269,7 +269,7 @@ int StreamPeerOpenSSL::_bio_puts(BIO *b, const char *str) {
return _bio_write(b, str, strlen(str)); return _bio_write(b, str, strlen(str));
} }
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
BIO_METHOD *StreamPeerOpenSSL::_bio_method = NULL; BIO_METHOD *StreamPeerOpenSSL::_bio_method = NULL;
BIO_METHOD *StreamPeerOpenSSL::_get_bio_method() { BIO_METHOD *StreamPeerOpenSSL::_get_bio_method() {
@@ -568,7 +568,7 @@ void StreamPeerOpenSSL::initialize_ssl() {
load_certs_func = _load_certs; load_certs_func = _load_certs;
_create = _create_func; _create = _create_func;
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_malloc_init(); // Initialize malloc, free, etc for OpenSSL's use CRYPTO_malloc_init(); // Initialize malloc, free, etc for OpenSSL's use
#endif #endif
SSL_library_init(); // Initialize OpenSSL's SSL libraries SSL_library_init(); // Initialize OpenSSL's SSL libraries

2
modules/openssl/stream_peer_openssl.h
View File

@@ -53,7 +53,7 @@ private:
static int _bio_gets(BIO *b, char *buf, int len); static int _bio_gets(BIO *b, char *buf, int len);
static int _bio_puts(BIO *b, const char *str); static int _bio_puts(BIO *b, const char *str);
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
static BIO_METHOD *_bio_method; static BIO_METHOD *_bio_method;
#else #else
static BIO_METHOD _bio_method; static BIO_METHOD _bio_method;