http2: use CURL_HTTP_VERSION_* symbols instead of NPN_* (00ea0e7d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/http.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1795,7 +1795,7 @@ CURLcode Curl_http(struct connectdata conn, bool done)
	if(conn->httpversion < 20) { /* unless the connection is re-used and already		if(conn->httpversion < 20) { /* unless the connection is re-used and already
	http2 */		http2 */
	switch(conn->negnpn) {		switch(conn->negnpn) {
	case NPN_HTTP2:		case CURL_HTTP_VERSION_2_0:
	result = Curl_http2_init(conn);		result = Curl_http2_init(conn);
	if(result)		if(result)
	return result;		return result;
	@@ -1808,7 +1808,7 @@ CURLcode Curl_http(struct connectdata conn, bool done)
	if(result)		if(result)
	return result;		return result;
	break;		break;
	case NPN_HTTP1_1:		case CURL_HTTP_VERSION_1_1:
	/* continue with HTTP/1.1 when explicitly requested */		/* continue with HTTP/1.1 when explicitly requested */
	break;		break;
	default:		default:

lib/urldata.h

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -600,12 +600,6 @@ enum upgrade101 {
	UPGR101_WORKING /* talking upgraded protocol */		UPGR101_WORKING /* talking upgraded protocol */
	};		};

	enum negotiatenpn {
	NPN_INIT, /* default state */
	NPN_HTTP1_1, /* HTTP/1.1 negotiated */
	NPN_HTTP2 /* HTTP2 (draft-xx) negotiated */
	};

	/*		/*
	* Request specific data in the easy handle (SessionHandle). Previously,		* Request specific data in the easy handle (SessionHandle). Previously,
	* these members were on the connectdata struct but since a conn struct may		* these members were on the connectdata struct but since a conn struct may
	@@ -1067,7 +1061,7 @@ struct connectdata {
	} tunnel_state[2]; /* two separate ones to allow FTP */		} tunnel_state[2]; /* two separate ones to allow FTP */
	struct connectbundle bundle; / The bundle we are member of */		struct connectbundle bundle; / The bundle we are member of */

	enum negotiatenpn negnpn;		int negnpn; /* APLN or NPN TLS negotiated protocol, CURL_HTTP_VERSION* */
	};		};

	/* The end of connectdata. */		/* The end of connectdata. */

lib/vtls/gtls.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1073,13 +1073,13 @@ gtls_connect_step3(struct connectdata *conn,
	if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN &&		if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN &&
	!memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data,		!memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data,
	NGHTTP2_PROTO_VERSION_ID_LEN)) {		NGHTTP2_PROTO_VERSION_ID_LEN)) {
	conn->negnpn = NPN_HTTP2;		conn->negnpn = CURL_HTTP_VERSION_2_0;
	}		}
	else		else
	#endif		#endif
	if(proto.size == ALPN_HTTP_1_1_LENGTH &&		if(proto.size == ALPN_HTTP_1_1_LENGTH &&
	!memcmp(ALPN_HTTP_1_1, proto.data, ALPN_HTTP_1_1_LENGTH)) {		!memcmp(ALPN_HTTP_1_1, proto.data, ALPN_HTTP_1_1_LENGTH)) {
	conn->negnpn = NPN_HTTP1_1;		conn->negnpn = CURL_HTTP_VERSION_1_1;
	}		}
	}		}
	else		else

lib/vtls/nss.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -717,13 +717,13 @@ static void HandshakeCallback(PRFileDesc sock, void arg)
	#ifdef USE_NGHTTP2		#ifdef USE_NGHTTP2
	if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN &&		if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN &&
	!memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)) {		!memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)) {
	conn->negnpn = NPN_HTTP2;		conn->negnpn = CURL_HTTP_VERSION_2_0;
	}		}
	else		else
	#endif		#endif
	if(buflen == ALPN_HTTP_1_1_LENGTH &&		if(buflen == ALPN_HTTP_1_1_LENGTH &&
	!memcmp(ALPN_HTTP_1_1, buf, ALPN_HTTP_1_1_LENGTH)) {		!memcmp(ALPN_HTTP_1_1, buf, ALPN_HTTP_1_1_LENGTH)) {
	conn->negnpn = NPN_HTTP1_1;		conn->negnpn = CURL_HTTP_VERSION_1_1;
	}		}
	}		}
	}		}

lib/vtls/openssl.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1645,7 +1645,7 @@ select_next_proto_cb(SSL *ssl,
	NGHTTP2_PROTO_VERSION_ID_LEN)) {		NGHTTP2_PROTO_VERSION_ID_LEN)) {
	infof(conn->data, "NPN, negotiated HTTP2 (%s)\n",		infof(conn->data, "NPN, negotiated HTTP2 (%s)\n",
	NGHTTP2_PROTO_VERSION_ID);		NGHTTP2_PROTO_VERSION_ID);
	conn->negnpn = NPN_HTTP2;		conn->negnpn = CURL_HTTP_VERSION_2_0;
	return SSL_TLSEXT_ERR_OK;		return SSL_TLSEXT_ERR_OK;
	}		}
	#endif		#endif
	@@ -1653,14 +1653,14 @@ select_next_proto_cb(SSL *ssl,
	if(!select_next_protocol(out, outlen, in, inlen, ALPN_HTTP_1_1,		if(!select_next_protocol(out, outlen, in, inlen, ALPN_HTTP_1_1,
	ALPN_HTTP_1_1_LENGTH)) {		ALPN_HTTP_1_1_LENGTH)) {
	infof(conn->data, "NPN, negotiated HTTP1.1\n");		infof(conn->data, "NPN, negotiated HTTP1.1\n");
	conn->negnpn = NPN_HTTP1_1;		conn->negnpn = CURL_HTTP_VERSION_1_1;
	return SSL_TLSEXT_ERR_OK;		return SSL_TLSEXT_ERR_OK;
	}		}

	infof(conn->data, "NPN, no overlap, use HTTP1.1\n");		infof(conn->data, "NPN, no overlap, use HTTP1.1\n");
	out = (unsigned char )ALPN_HTTP_1_1;		out = (unsigned char )ALPN_HTTP_1_1;
	*outlen = ALPN_HTTP_1_1_LENGTH;		*outlen = ALPN_HTTP_1_1_LENGTH;
	conn->negnpn = NPN_HTTP1_1;		conn->negnpn = CURL_HTTP_VERSION_1_1;

	return SSL_TLSEXT_ERR_OK;		return SSL_TLSEXT_ERR_OK;
	}		}
	@@ -2225,13 +2225,13 @@ static CURLcode ossl_connect_step2(struct connectdata *conn, int sockindex)
	#ifdef USE_NGHTTP2		#ifdef USE_NGHTTP2
	if(len == NGHTTP2_PROTO_VERSION_ID_LEN &&		if(len == NGHTTP2_PROTO_VERSION_ID_LEN &&
	!memcmp(NGHTTP2_PROTO_VERSION_ID, neg_protocol, len)) {		!memcmp(NGHTTP2_PROTO_VERSION_ID, neg_protocol, len)) {
	conn->negnpn = NPN_HTTP2;		conn->negnpn = CURL_HTTP_VERSION_2_0;
	}		}
	else		else
	#endif		#endif
	if(len == ALPN_HTTP_1_1_LENGTH &&		if(len == ALPN_HTTP_1_1_LENGTH &&
	!memcmp(ALPN_HTTP_1_1, neg_protocol, ALPN_HTTP_1_1_LENGTH)) {		!memcmp(ALPN_HTTP_1_1, neg_protocol, ALPN_HTTP_1_1_LENGTH)) {
	conn->negnpn = NPN_HTTP1_1;		conn->negnpn = CURL_HTTP_VERSION_1_1;
	}		}
	}		}
	else		else