diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-18 08:59:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-18 08:59:51 +0000 |
| commit | c82aee54167683571b5d7386b2f23d376ec1632c (patch) | |
| tree | a8239316495204c2ab3131fe543216ceadf15209 /community/stunnel/stunnel-libressl.patch | |
| parent | 66e6dfb84d1b32ea360f8086581002005418ab7d (diff) | |
| download | aports-c82aee54167683571b5d7386b2f23d376ec1632c.tar.bz2 aports-c82aee54167683571b5d7386b2f23d376ec1632c.tar.xz | |
community/stunnel: upgrade to 5.36
Diffstat (limited to 'community/stunnel/stunnel-libressl.patch')
| -rw-r--r-- | community/stunnel/stunnel-libressl.patch | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/community/stunnel/stunnel-libressl.patch b/community/stunnel/stunnel-libressl.patch index 9b39720c9f..16134e283f 100644 --- a/community/stunnel/stunnel-libressl.patch +++ b/community/stunnel/stunnel-libressl.patch @@ -34,7 +34,7 @@ index 5b282e9..7984f32 100644 NAME_LIST *curr; char *cmd, *param; diff --git a/src/options.c b/src/options.c -index 22e00dd..5674284 100644 +index 6727226..d1bae90 100644 --- a/src/options.c +++ b/src/options.c @@ -1291,7 +1291,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS *section, @@ -103,10 +103,19 @@ index 182c764..d57aff2 100644 #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type) #else diff --git a/src/ssl.c b/src/ssl.c -index d5b27bd..8dae820 100644 +index ba30d75..29c423d 100644 --- a/src/ssl.c +++ b/src/ssl.c -@@ -78,7 +78,7 @@ int ssl_init(void) { /* init SSL before parsing configuration file */ +@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const char *); + int index_cli, index_opt, index_redirect, index_addr; + + int ssl_init(void) { /* init SSL before parsing configuration file */ +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | + OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); + #else +@@ -83,7 +83,7 @@ int ssl_init(void) { /* init SSL before parsing configuration file */ } #ifndef OPENSSL_NO_DH @@ -115,6 +124,24 @@ index d5b27bd..8dae820 100644 /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0 * to be linked against the older versions */ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { +@@ -118,7 +118,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global SSL settings */ + if(FIPS_mode()!=global->option.fips) { + RAND_set_rand_method(NULL); /* reset RAND methods */ + if(!FIPS_mode_set(global->option.fips)) { +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); + #else + ERR_load_crypto_strings(); +@@ -177,7 +177,7 @@ NOEXPORT int compression_init(GLOBAL_OPTIONS *global) { + if(global->compression==COMP_ZLIB) { + /* 224 - within the private range (193 to 255) */ + COMP_METHOD *meth=COMP_zlib(); +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if(!meth || COMP_get_type(meth)==NID_undef) { + #else + if(!meth || meth->type==NID_undef) { diff --git a/src/sthreads.c b/src/sthreads.c index 4e4e0e9..f61f230 100644 --- a/src/sthreads.c |