diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-07-26 11:57:00 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-07-26 11:57:00 +0000 |
| commit | 82b8fb7369baf6d9b3859bd70a93c62c90482198 (patch) | |
| tree | 2dd586fe5c772eafb6b20da3c66f8a77075a482a /net/haproxy | |
| parent | 405ee2d9dc42eb06980583a92a4813a32598f465 (diff) | |
| download | ports-82b8fb7369baf6d9b3859bd70a93c62c90482198.tar.gz ports-82b8fb7369baf6d9b3859bd70a93c62c90482198.zip | |
Notes
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/files/patch-src_ssl__sock.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/haproxy/files/patch-src_ssl__sock.c b/net/haproxy/files/patch-src_ssl__sock.c index 6d208c7b5121..d67b9127ca80 100644 --- a/net/haproxy/files/patch-src_ssl__sock.c +++ b/net/haproxy/files/patch-src_ssl__sock.c @@ -1,20 +1,19 @@ ---- src/ssl_sock.c.orig 2017-04-03 08:28:32 UTC +--- src/ssl_sock.c.orig 2017-07-07 09:49:34 UTC +++ src/ssl_sock.c -@@ -794,8 +795,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c +@@ -794,8 +794,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c ocsp = NULL; #ifndef SSL_CTX_get_tlsext_status_cb --# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ -- *cb = (void (*) (void))ctx->tlsext_status_cb; +#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB +#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 +#endif -+#define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ + # define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ +- *cb = (void (*) (void))ctx->tlsext_status_cb; + *cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb) #endif SSL_CTX_get_tlsext_status_cb(ctx, &callback); -@@ -823,7 +827,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c +@@ -823,7 +826,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c int key_type; EVP_PKEY *pkey; @@ -26,7 +25,7 @@ SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); #else cb_arg = ctx->tlsext_status_arg; -@@ -3539,7 +3546,7 @@ int ssl_sock_handshake(struct connection +@@ -3539,7 +3545,7 @@ int ssl_sock_handshake(struct connection OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); empty_handshake = state == TLS_ST_BEFORE; #else @@ -35,7 +34,7 @@ #endif if (empty_handshake) { -@@ -3617,7 +3624,7 @@ int ssl_sock_handshake(struct connection +@@ -3617,7 +3623,7 @@ int ssl_sock_handshake(struct connection state = SSL_get_state((SSL *)conn->xprt_ctx); empty_handshake = state == TLS_ST_BEFORE; #else |