Merge pull request #466 from FGasper/feature_check_SSL_get0_alpn_selected

wcawijngaards · web-flow · commit 64f18b300373 · 2021-04-22T08:57:33.000+02:00
Support OpenSSLs that lack SSL_get0_alpn_selected.
diff --git a/configure.ac b/configure.ac
@@ -859,7 +859,7 @@ AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_C
 # these check_funcs need -lssl
 BAKLIBS="$LIBS"
 LIBS="-lssl $LIBS"
-AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites SSL_CTX_set_tlsext_ticket_key_evp_cb SSL_CTX_set_alpn_select_cb])
+AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites SSL_CTX_set_tlsext_ticket_key_evp_cb SSL_CTX_set_alpn_select_cb SSL_get0_alpn_selected])
 LIBS="$BAKLIBS"
 
 AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [
diff --git a/util/netevent.c b/util/netevent.c
@@ -1314,6 +1314,7 @@ ssl_handshake(struct comm_point* c)
 			c->repinfo.addrlen);
 	}
 
+#ifdef HAVE_SSL_GET0_ALPN_SELECTED
 	/* check if http2 use is negotiated */
 	if(c->type == comm_http && c->h2_session) {
 		const unsigned char *alpn;
@@ -1325,6 +1326,7 @@ ssl_handshake(struct comm_point* c)
 			c->use_h2 = 1;
 		}
 	}
+#endif
 
 	/* setup listen rw correctly */
 	if(c->tcp_is_reading) {

Original file line number	Diff line number	Diff line change
`@@ -1314,6 +1314,7 @@ ssl_handshake(struct comm_point* c)`
`1314`	`1314`	`c->repinfo.addrlen);`
`1315`	`1315`	`}`
`1316`	`1316`
	`1317`	`+#ifdef HAVE_SSL_GET0_ALPN_SELECTED`
`1317`	`1318`	`/* check if http2 use is negotiated */`
`1318`	`1319`	`if(c->type == comm_http && c->h2_session) {`
`1319`	`1320`	`const unsigned char *alpn;`
`@@ -1325,6 +1326,7 @@ ssl_handshake(struct comm_point* c)`
`1325`	`1326`	`c->use_h2 = 1;`
`1326`	`1327`	`}`
`1327`	`1328`	`}`
	`1329`	`+#endif`
`1328`	`1330`
`1329`	`1331`	`/* setup listen rw correctly */`
`1330`	`1332`	`if(c->tcp_is_reading) {`