Attachment 182587 Details for Bug 219272 – svn diff for net/haproxy-devel

[patch] svn diff for net/haproxy-devel

patch-net_haproxy-devel-1.8-dev1-LibreSSL (text/plain), 1.98 KB, created by Bernard Spil on 2017-05-14 09:47:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-05-14 09:47:07 UTC

Size: 1.98 KB

patch

obsolete

>Index: net/haproxy-devel/files/patch-src_ssl__sock.c
>===================================================================
>--- net/haproxy-devel/files/patch-src_ssl__sock.c	(nonexistent)
>+++ net/haproxy-devel/files/patch-src_ssl__sock.c	(working copy)
>@@ -0,0 +1,40 @@
>+rc/ssl_sock.c.orig	2017-05-12 15:18:50 UTC
>++++ src/ssl_sock.c
>+@@ -768,7 +768,7 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
>+ 	unsigned char *p;
>+ 	pem_password_cb *passwd_cb;
>+ 	void *passwd_cb_userdata;
>+-	void (*callback) (void);
>++	void (*callback) (void) = NULL;
>+ 
>+ 	snprintf(ocsp_path, MAXPATHLEN+1, "%s.ocsp", cert_path);
>+ 
>+@@ -842,10 +842,14 @@ 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
>++	long temp_callback = SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB, 0, callback);
>++	callback = (void*) &temp_callback;
>++#else
>+ 	SSL_CTX_get_tlsext_status_cb(ctx, &callback);
>++#endif
>+ 
>+ 	if (!callback) {
>+ 		struct ocsp_cbk_arg *cb_arg = calloc(1, sizeof(*cb_arg));
>+@@ -871,7 +875,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) || (LIBRESSL_VERSION_NUMBER >= 0x2050100fL)
>++#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;
>
>Property changes on: net/haproxy-devel/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 219272: 182587