moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

ngtcp2: advertise h3 ALPN unconditionally

Browse Source 
Closes #6250
This commit is contained in:
Daiki Ueno 2020-11-26 09:45:48 +01:00 committed by Daniel Stenberg
parent 0cbd5d5c4f
commit ddd3eb99f8
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/vquic/ngtcp2.c
View File

@ -349,14 +349,8 @@ static int quic_init_ssl(struct quicsocket *qs)
SSL_set_app_data(qs->ssl, qs);
SSL_set_connect_state(qs->ssl);
switch(qs->version) {
#ifdef NGTCP2_PROTO_VER
case NGTCP2_PROTO_VER:
alpn = (const uint8_t *)NGHTTP3_ALPN_H3;
alpnlen = sizeof(NGHTTP3_ALPN_H3) - 1;
break;
#endif
}
alpn = (const uint8_t *)NGHTTP3_ALPN_H3;
alpnlen = sizeof(NGHTTP3_ALPN_H3) - 1;
if(alpn)
SSL_set_alpn_protos(qs->ssl, alpn, (int)alpnlen);
@ -532,15 +526,9 @@ static int quic_init_ssl(struct quicsocket *qs)
return 1;
}
switch(qs->version) {
#ifdef NGTCP2_PROTO_VER
case NGTCP2_PROTO_VER:
/* strip the first byte (the length) from NGHTTP3_ALPN_H3 */
alpn.data = (unsigned char *)NGHTTP3_ALPN_H3 + 1;
alpn.size = sizeof(NGHTTP3_ALPN_H3) - 2;
break;
#endif
}
/* strip the first byte (the length) from NGHTTP3_ALPN_H3 */
alpn.data = (unsigned char *)NGHTTP3_ALPN_H3 + 1;
alpn.size = sizeof(NGHTTP3_ALPN_H3) - 2;
if(alpn.data)
gnutls_alpn_set_protocols(qs->ssl, &alpn, 1, 0);