From 517d42e4ce0f55a0517c57590a39121c8e113a03 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 24 Jun 2021 17:32:24 +0200 Subject: tst_http2: use the supportedFeatures() instead of macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the recent change, 'system' headers gone: not in the test code anymore, so, for example OPENSSL_VERSION_NUMBER is undefined, making the test to select a wrong code-path - 'h2c', instead of encrypted h2. Change-Id: I3b201e21fac56875c9045c7463e2ae69af4c6470 Reviewed-by: Mårten Nordheim (cherry picked from commit 13ce568b768bbdaa19adc4207a04b74414c14d62) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/tls/openssl/qtlsbackend_openssl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp index 544ce1bcef..7711f66bb5 100644 --- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp +++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp @@ -318,8 +318,12 @@ QList QTlsBackendOpenSSL::supportedFeatures() const QList features; features << QSsl::SupportedFeature::CertificateVerification; + +#if !defined(OPENSSL_NO_TLSEXT) features << QSsl::SupportedFeature::ClientSideAlpn; features << QSsl::SupportedFeature::ServerSideAlpn; +#endif // !OPENSSL_NO_TLSEXT + features << QSsl::SupportedFeature::Ocsp; features << QSsl::SupportedFeature::Psk; features << QSsl::SupportedFeature::SessionTicket; -- cgit v1.2.3