|
Lines 1147-1153
Link Here
|
| 1147 |
#endif |
1147 |
#endif |
| 1148 |
} |
1148 |
} |
| 1149 |
|
1149 |
|
| 1150 |
#ifdef OPENSSL_NPN_NEGOTIATED |
1150 |
#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) |
| 1151 |
/* This callback is used so that the server advertises the list of |
1151 |
/* This callback is used so that the server advertises the list of |
| 1152 |
* negociable protocols for NPN. |
1152 |
* negociable protocols for NPN. |
| 1153 |
*/ |
1153 |
*/ |
|
Lines 2875-2881
Link Here
|
| 2875 |
SSL_CTX_set_msg_callback(ctx, ssl_sock_msgcbk); |
2875 |
SSL_CTX_set_msg_callback(ctx, ssl_sock_msgcbk); |
| 2876 |
#endif |
2876 |
#endif |
| 2877 |
|
2877 |
|
| 2878 |
#ifdef OPENSSL_NPN_NEGOTIATED |
2878 |
#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) |
| 2879 |
if (bind_conf->npn_str) |
2879 |
if (bind_conf->npn_str) |
| 2880 |
SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_sock_advertise_npn_protos, bind_conf); |
2880 |
SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_sock_advertise_npn_protos, bind_conf); |
| 2881 |
#endif |
2881 |
#endif |
|
Lines 4891-4897
Link Here
|
| 4891 |
return 1; |
4891 |
return 1; |
| 4892 |
} |
4892 |
} |
| 4893 |
|
4893 |
|
| 4894 |
#ifdef OPENSSL_NPN_NEGOTIATED |
4894 |
#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) |
| 4895 |
static int |
4895 |
static int |
| 4896 |
smp_fetch_ssl_fc_npn(const struct arg *args, struct sample *smp, const char *kw, void *private) |
4896 |
smp_fetch_ssl_fc_npn(const struct arg *args, struct sample *smp, const char *kw, void *private) |
| 4897 |
{ |
4897 |
{ |
|
Lines 5418-5424
Link Here
|
| 5418 |
/* parse the "npn" bind keyword */ |
5418 |
/* parse the "npn" bind keyword */ |
| 5419 |
static int bind_parse_npn(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err) |
5419 |
static int bind_parse_npn(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err) |
| 5420 |
{ |
5420 |
{ |
| 5421 |
#ifdef OPENSSL_NPN_NEGOTIATED |
5421 |
#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) |
| 5422 |
char *p1, *p2; |
5422 |
char *p1, *p2; |
| 5423 |
|
5423 |
|
| 5424 |
if (!*args[cur_arg + 1]) { |
5424 |
if (!*args[cur_arg + 1]) { |
|
Lines 6318-6324
Link Here
|
| 6318 |
{ "ssl_fc_has_crt", smp_fetch_ssl_fc_has_crt, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
6318 |
{ "ssl_fc_has_crt", smp_fetch_ssl_fc_has_crt, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
| 6319 |
{ "ssl_fc_has_sni", smp_fetch_ssl_fc_has_sni, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
6319 |
{ "ssl_fc_has_sni", smp_fetch_ssl_fc_has_sni, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
| 6320 |
{ "ssl_fc_is_resumed", smp_fetch_ssl_fc_is_resumed, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
6320 |
{ "ssl_fc_is_resumed", smp_fetch_ssl_fc_is_resumed, 0, NULL, SMP_T_BOOL, SMP_USE_L5CLI }, |
| 6321 |
#ifdef OPENSSL_NPN_NEGOTIATED |
6321 |
#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) |
| 6322 |
{ "ssl_fc_npn", smp_fetch_ssl_fc_npn, 0, NULL, SMP_T_STR, SMP_USE_L5CLI }, |
6322 |
{ "ssl_fc_npn", smp_fetch_ssl_fc_npn, 0, NULL, SMP_T_STR, SMP_USE_L5CLI }, |
| 6323 |
#endif |
6323 |
#endif |
| 6324 |
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation |
6324 |
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation |