From: Jouni Malinen <quic_jouni@quicinc.com>
Date: Thu, 23 Feb 2023 14:30:04 +0000 (+0200)
Subject: webkit2: Avoid deprecated function call
X-Git-Tag: hostap_2_11~1264
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfd236df2183c67a14b2b8bd3ca798b2d72fe645;p=thirdparty%2Fhostap.git

webkit2: Avoid deprecated function call

webkit_web_context_set_tls_errors_policy() has been deprecated. Use its
replacement webkit_website_data_manager_set_tls_errors_policy() when
building against sufficiently recent version of webkit2.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
---

diff --git a/src/utils/browser.c b/src/utils/browser.c
index c0f4380c4..b5d5ba78f 100644
--- a/src/utils/browser.c
+++ b/src/utils/browser.c
@@ -370,11 +370,21 @@ int hs20_web_browser(const char *url, int ignore_tls)
 
 #ifdef USE_WEBKIT2
 	if (ignore_tls) {
+#if WEBKIT_CHECK_VERSION(2, 32, 0)
+		WebKitWebContext *wkctx;
+		WebKitWebsiteDataManager *wkmgr;
+
+		wkctx = webkit_web_context_get_default();
+		wkmgr = webkit_web_context_get_website_data_manager(wkctx);
+		webkit_website_data_manager_set_tls_errors_policy(
+			wkmgr, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+#else
 		WebKitWebContext *wkctx;
 
 		wkctx = webkit_web_context_get_default();
 		webkit_web_context_set_tls_errors_policy(
 			wkctx, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+#endif
 	}
 #endif /* USE_WEBKIT2 */