Attachment 179579 Details for Bug 216763 – patch

[patch] patch

haproxy.patch (text/plain), 2.09 KB, created by Piotr Kubaj on 2017-02-03 21:55:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-03 21:55:33 UTC

Size: 2.09 KB

patch

obsolete

>Index: files/patch-src_ssl__sock.c
>===================================================================
>--- files/patch-src_ssl__sock.c	(revision 0)
>+++ files/patch-src_ssl__sock.c	(working copy)
>@@ -0,0 +1,41 @@
>+--- src/ssl_sock.c.orig	2017-01-13 09:03:00 UTC
>++++ src/ssl_sock.c
>+@@ -793,7 +793,7 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
>+ 
>+ #ifndef SSL_CTX_get_tlsext_status_cb
>+ # define SSL_CTX_get_tlsext_status_cb(ctx, cb) \
>+-	*cb = (void (*) (void))ctx->tlsext_status_cb;
>++	*cb = SSL_CTX_ctrl(ctx,128,0, (void (**)(void))cb)
>+ #endif
>+ 	SSL_CTX_get_tlsext_status_cb(ctx, &callback);
>+ 
>+@@ -821,7 +821,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
>+ 		int key_type;
>+ 		EVP_PKEY *pkey;
>+ 
>+-#ifdef SSL_CTX_get_tlsext_status_arg
>++#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER)
>++#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG
>++#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129
>++#endif
>+ 		SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg);
>+ #else
>+ 		cb_arg = ctx->tlsext_status_arg;
>+@@ -3537,7 +3540,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
>+-					empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
>++					empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
>+ #endif
>+ 
>+ 					if (empty_handshake) {
>+@@ -3615,7 +3618,7 @@ int ssl_sock_handshake(struct connection
>+ 			state = SSL_get_state((SSL *)conn->xprt_ctx);
>+ 			empty_handshake = state == TLS_ST_BEFORE;
>+ #else
>+-			empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
>++			empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
>+ #endif
>+ 			if (empty_handshake) {
>+ 				if (!errno) {
>
>Property changes on: files/patch-src_ssl__sock.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216763: 179579 | 179603