diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-05-09 16:50:11 +0200 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2016-05-09 15:30:25 -0400 |
| commit | f6767f5435f4c8230b382f18d4a2917ae37641d5 (patch) | |
| tree | 40839e6a1367ede5506d77484a7b30e818d4709c /lib/vtls/gtls.c | |
| parent | 5bf5f6ebfcede78ef7c2b16daa41c4b7ba266087 (diff) | |
TLS: move the ALPN/NPN enable bits to the connection
Only protocols that actually have a protocol registered for ALPN and NPN
should try to get that negotiated in the TLS handshake. That is only
HTTPS (well, http/1.1 and http/2) right now. Previously ALPN and NPN
would wrongly be used in all handshakes if libcurl was built with it
enabled.
Reported-by: Jay Satiro
Fixes #789
Diffstat (limited to 'lib/vtls/gtls.c')
| -rw-r--r-- | lib/vtls/gtls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 9d1cd5088..1b5a6a4d5 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -641,7 +641,7 @@ gtls_connect_step1(struct connectdata *conn, #endif #ifdef HAS_ALPN - if(data->set.ssl_enable_alpn) { + if(conn->bits.tls_enable_alpn) { int cur = 0; gnutls_datum_t protocols[2]; @@ -1240,7 +1240,7 @@ gtls_connect_step3(struct connectdata *conn, infof(data, "\t compression: %s\n", ptr); #ifdef HAS_ALPN - if(data->set.ssl_enable_alpn) { + if(conn->bits.tls_enable_alpn) { rc = gnutls_alpn_get_selected_protocol(session, &proto); if(rc == 0) { infof(data, "ALPN, server accepted to use %.*s\n", proto.size, |