diff options
Diffstat (limited to 'net-misc/stunnel')
| -rw-r--r-- | net-misc/stunnel/files/stunnel-5.68-libressl.patch | 5 | ||||
| -rw-r--r-- | net-misc/stunnel/files/stunnel-5.71-libressl.patch | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/net-misc/stunnel/files/stunnel-5.68-libressl.patch b/net-misc/stunnel/files/stunnel-5.68-libressl.patch index 7dfef31..ca4ae84 100644 --- a/net-misc/stunnel/files/stunnel-5.68-libressl.patch +++ b/net-misc/stunnel/files/stunnel-5.68-libressl.patch @@ -124,19 +124,18 @@ index 6a42a6b..90d6273 100644 OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl); #else int state=SSL_get_state((SSL *)ssl); -@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { +@@ -1622,7 +1622,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { if(state==TLS_ST_SR_CLNT_HELLO) { #else if(state==SSL3_ST_SR_CLNT_HELLO_A - || state==SSL23_ST_SR_CLNT_HELLO_A) { +#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL + || state==SSL23_ST_SR_CLNT_HELLO_A - #endif +#endif + ) { + #endif /* client hello received after initial handshake, * this means renegotiation -> mark it */ - c->reneg_state=RENEG_DETECTED; diff --git a/src/prototypes.h b/src/prototypes.h index 0ecd719..1084ce2 100644 --- a/src/prototypes.h diff --git a/net-misc/stunnel/files/stunnel-5.71-libressl.patch b/net-misc/stunnel/files/stunnel-5.71-libressl.patch index 0016560..25ef50c 100644 --- a/net-misc/stunnel/files/stunnel-5.71-libressl.patch +++ b/net-misc/stunnel/files/stunnel-5.71-libressl.patch @@ -105,28 +105,18 @@ Rebased from an OpenBSD patch. typedef struct { void *session_authenticated; -@@ -1621,7 +1621,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { - CLI *c; - SSL_CTX *ctx; - const char *state_string; --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl); - #else - int state=SSL_get_state((SSL *)ssl); -@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { +@@ -1622,7 +1622,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { if(state==TLS_ST_SR_CLNT_HELLO) { #else if(state==SSL3_ST_SR_CLNT_HELLO_A - || state==SSL23_ST_SR_CLNT_HELLO_A) { +#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL + || state==SSL23_ST_SR_CLNT_HELLO_A - #endif +#endif + ) { + #endif /* client hello received after initial handshake, * this means renegotiation -> mark it */ - c->reneg_state=RENEG_DETECTED; --- a/src/ocsp.c +++ b/src/ocsp.c @@ -108,7 +108,7 @@ int ocsp_init(SERVICE_OPTIONS *section) { |