mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

tls: make mbedtls and NSS check for h2, not nghttp2

Browse Source 
This makes them able to also negotiate HTTP/2 even when built to use
hyper for h2.

Closes #8656
This commit is contained in:
Daniel Stenberg 2022-03-31 16:04:00 +02:00
parent 0239a5fbfb
commit 7c1acaf61e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vtls/mbedtls.c
View File

@ -144,15 +144,14 @@ static void mbed_debug(void *context, int level, const char *f_name,
#else #else
#endif #endif
/* ALPN for http2? */ /* ALPN for http2 */
#ifdef USE_NGHTTP2 #ifdef USE_HTTP2
# undef HAS_ALPN # undef HAS_ALPN
# ifdef MBEDTLS_SSL_ALPN # ifdef MBEDTLS_SSL_ALPN
# define HAS_ALPN # define HAS_ALPN
# endif # endif
#endif #endif
/* /*
* profile * profile
*/ */
@ -614,9 +613,9 @@ mbed_connect_step1(struct Curl_easy *data, struct connectdata *conn,
#ifdef HAS_ALPN #ifdef HAS_ALPN
if(conn->bits.tls_enable_alpn) { if(conn->bits.tls_enable_alpn) {
const char **p = &backend->protocols[0]; const char **p = &backend->protocols[0];
#ifdef USE_NGHTTP2 #ifdef USE_HTTP2
if(data->state.httpwant >= CURL_HTTP_VERSION_2) if(data->state.httpwant >= CURL_HTTP_VERSION_2)
*p++ = NGHTTP2_PROTO_VERSION_ID; *p++ = ALPN_H2;
#endif #endif
*p++ = ALPN_HTTP_1_1; *p++ = ALPN_HTTP_1_1;
*p = NULL; *p = NULL;
@ -814,10 +813,9 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn,
if(next_protocol) { if(next_protocol) {
infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol); infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol);
#ifdef USE_NGHTTP2 #ifdef USE_HTTP2
if(!strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID, if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) &&
NGHTTP2_PROTO_VERSION_ID_LEN) && !next_protocol[ALPN_H2_LEN]) {
!next_protocol[NGHTTP2_PROTO_VERSION_ID_LEN]) {
conn->negnpn = CURL_HTTP_VERSION_2; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else else

2
lib/vtls/nss.c
View File

@ -874,7 +874,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg)
break; break;
} }
#ifdef USE_NGHTTP2 #ifdef USE_HTTP2
if(buflen == ALPN_H2_LENGTH && if(buflen == ALPN_H2_LENGTH &&
!memcmp(ALPN_H2, buf, ALPN_H2_LENGTH)) { !memcmp(ALPN_H2, buf, ALPN_H2_LENGTH)) {
conn->negnpn = CURL_HTTP_VERSION_2; conn->negnpn = CURL_HTTP_VERSION_2;