FreeBSD Bugzilla – Attachment 190617 Details for
Bug 225893
net/haproxy: Fix build without NPN
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
svn diff for net/haproxy
patch-net_haproxy-OpenSSL-without-NPN.txt (text/plain), 2.84 KB, created by
Bernard Spil
on 2018-02-14 14:26:22 UTC
(
hide
)
Description:
svn diff for net/haproxy
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2018-02-14 14:26:22 UTC
Size:
2.84 KB
patch
obsolete
>Index: net/haproxy/files/patch-src_ssl__sock.c >=================================================================== >--- net/haproxy/files/patch-src_ssl__sock.c (revision 461806) >+++ net/haproxy/files/patch-src_ssl__sock.c (working copy) >@@ -1,4 +1,4 @@ >---- src/ssl_sock.c.orig 2017-07-07 09:49:34 UTC >+--- src/ssl_sock.c.orig 2018-01-02 14:14:08 UTC > +++ src/ssl_sock.c > @@ -794,8 +794,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c > ocsp = NULL; >@@ -25,6 +25,24 @@ > SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); > #else > cb_arg = ctx->tlsext_status_arg; >+@@ -1142,7 +1148,7 @@ void ssl_sock_msgcbk(int write_p, int ve >+ #endif >+ } >+ >+-#ifdef OPENSSL_NPN_NEGOTIATED >++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) >+ /* This callback is used so that the server advertises the list of >+ * negociable protocols for NPN. >+ */ >+@@ -2870,7 +2876,7 @@ int ssl_sock_prepare_ctx(struct bind_con >+ SSL_CTX_set_msg_callback(ctx, ssl_sock_msgcbk); >+ #endif >+ >+-#ifdef OPENSSL_NPN_NEGOTIATED >++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) >+ if (bind_conf->npn_str) >+ SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_sock_advertise_npn_protos, bind_conf); >+ #endif > @@ -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; >@@ -43,3 +61,30 @@ > #endif > if (empty_handshake) { > if (!errno) { >+@@ -4886,7 +4892,7 @@ smp_fetch_ssl_fc_use_keysize(const struc >+ return 1; >+ } >+ >+-#ifdef OPENSSL_NPN_NEGOTIATED >++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) >+ static int >+ smp_fetch_ssl_fc_npn(const struct arg *args, struct sample *smp, const char *kw, void *private) >+ { >+@@ -5413,7 +5419,7 @@ static int bind_parse_no_tlsv12(char **a >+ /* parse the "npn" bind keyword */ >+ static int bind_parse_npn(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err) >+ { >+-#ifdef OPENSSL_NPN_NEGOTIATED >++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) >+ char *p1, *p2; >+ >+ if (!*args[cur_arg + 1]) { >+@@ -6313,7 +6319,7 @@ static struct sample_fetch_kw_list sampl >+ { "ssl_fc_has_crt", smp_fetch_ssl_fc_has_crt, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, >+ { "ssl_fc_has_sni", smp_fetch_ssl_fc_has_sni, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, >+ { "ssl_fc_is_resumed", smp_fetch_ssl_fc_is_resumed, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, >+-#ifdef OPENSSL_NPN_NEGOTIATED >++#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) >+ { "ssl_fc_npn", smp_fetch_ssl_fc_npn, 0, NULL, SMP_T_STR, SMP_USE_L5CLI }, >+ #endif >+ #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 225893
: 190617