@@ -8,10 +8,17 @@ Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-tea
Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe]
CVE: CVE-2025-32910
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+Remove test code for fixing do_compile failure of libsoup-2.4, test codes include
+new type added in 3.x version
+../libsoup-2.74.3/tests/auth-test.c:1554:39: error: unknown type name 'SoupServerMessage'; did you mean 'SoupServerClass'?
+ 1554 | SoupServerMessage *msg,
+ | ^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
libsoup/soup-auth-digest.c | 3 +++
- tests/auth-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 53 insertions(+)
+ 1 files changed, 3 insertions(+)
diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
index e8ba990..263a15a 100644
@@ -27,71 +34,3 @@ index e8ba990..263a15a 100644
g_free (priv->domain);
g_free (priv->nonce);
g_free (priv->opaque);
-diff --git a/tests/auth-test.c b/tests/auth-test.c
-index 8295ec3..dfc6b09 100644
---- a/tests/auth-test.c
-+++ b/tests/auth-test.c
-@@ -1549,6 +1549,55 @@ do_cancel_after_retry_test (void)
- soup_test_session_abort_unref (session);
- }
-
-+static void
-+on_request_read_for_missing_realm (SoupServer *server,
-+ SoupServerMessage *msg,
-+ gpointer user_data)
-+{
-+ SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg);
-+ soup_message_headers_replace (response_headers, "WWW-Authenticate", "Digest qop=\"auth\"");
-+}
-+
-+static void
-+do_missing_realm_test (void)
-+{
-+ SoupSession *session;
-+ SoupMessage *msg;
-+ SoupServer *server;
-+ SoupAuthDomain *digest_auth_domain;
-+ gint status;
-+ GUri *uri;
-+
-+ server = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
-+ soup_server_add_handler (server, NULL,
-+ server_callback, NULL, NULL);
-+ uri = soup_test_server_get_uri (server, "http", NULL);
-+
-+ digest_auth_domain = soup_auth_domain_digest_new (
-+ "realm", "auth-test",
-+ "auth-callback", server_digest_auth_callback,
-+ NULL);
-+ soup_auth_domain_add_path (digest_auth_domain, "/");
-+ soup_server_add_auth_domain (server, digest_auth_domain);
-+ g_object_unref (digest_auth_domain);
-+
-+ g_signal_connect (server, "request-read",
-+ G_CALLBACK (on_request_read_for_missing_realm),
-+ NULL);
-+
-+ session = soup_test_session_new (NULL);
-+ msg = soup_message_new_from_uri ("GET", uri);
-+ g_signal_connect (msg, "authenticate",
-+ G_CALLBACK (on_digest_authenticate),
-+ NULL);
-+
-+ status = soup_test_session_send_message (session, msg);
-+
-+ g_assert_cmpint (status, ==, SOUP_STATUS_UNAUTHORIZED);
-+ g_uri_unref (uri);
-+ soup_test_server_quit_unref (server);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1576,6 +1625,7 @@ main (int argc, char **argv)
- g_test_add_func ("/auth/async-message-do-not-use-auth-cache", do_async_message_do_not_use_auth_cache_test);
- g_test_add_func ("/auth/authorization-header-request", do_message_has_authorization_header_test);
- g_test_add_func ("/auth/cancel-after-retry", do_cancel_after_retry_test);
-+ g_test_add_func ("/auth/missing-realm", do_missing_realm_test);
-
- ret = g_test_run ();
-
@@ -8,10 +8,17 @@ Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-tea
Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/405a8a34597a44bd58c4759e7d5e23f02c3b556a]
CVE: CVE-2025-32910
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+Remove test code for fixing do_compile failure of libsoup-2.4, test codes include
+new type added in 3.x version
+../libsoup-2.74.3/tests/auth-test.c:1554:39: error: unknown type name 'SoupServerMessage'; did you mean 'SoupServerClass'?
+ 1554 | SoupServerMessage *msg,
+ | ^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
libsoup/soup-auth-digest.c | 45 +++++++++++++++++++++++++++++++++++----------
- tests/auth-test.c | 19 +++++++++++--------
- 2 files changed, 46 insertions(+), 18 deletions(-)
+ 1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
index 263a15a..393adb6 100644
@@ -97,52 +104,3 @@ index 263a15a..393adb6 100644
soup_auth_digest_compute_response (msg->method, url, priv->hex_a1,
priv->qop, priv->nonce,
priv->cnonce, priv->nc,
-diff --git a/tests/auth-test.c b/tests/auth-test.c
-index dfc6b09..6fb1e4a 100644
---- a/tests/auth-test.c
-+++ b/tests/auth-test.c
-@@ -1550,16 +1550,17 @@ do_cancel_after_retry_test (void)
- }
-
- static void
--on_request_read_for_missing_realm (SoupServer *server,
-- SoupServerMessage *msg,
-- gpointer user_data)
-+on_request_read_for_missing_params (SoupServer *server,
-+ SoupServerMessage *msg,
-+ gpointer user_data)
- {
-+ const char *auth_header = user_data;
- SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg);
-- soup_message_headers_replace (response_headers, "WWW-Authenticate", "Digest qop=\"auth\"");
-+ soup_message_headers_replace (response_headers, "WWW-Authenticate", auth_header);
- }
-
- static void
--do_missing_realm_test (void)
-+do_missing_params_test (gconstpointer auth_header)
- {
- SoupSession *session;
- SoupMessage *msg;
-@@ -1582,8 +1583,8 @@ do_missing_realm_test (void)
- g_object_unref (digest_auth_domain);
-
- g_signal_connect (server, "request-read",
-- G_CALLBACK (on_request_read_for_missing_realm),
-- NULL);
-+ G_CALLBACK (on_request_read_for_missing_params),
-+ (gpointer)auth_header);
-
- session = soup_test_session_new (NULL);
- msg = soup_message_new_from_uri ("GET", uri);
-@@ -1625,7 +1626,9 @@ main (int argc, char **argv)
- g_test_add_func ("/auth/async-message-do-not-use-auth-cache", do_async_message_do_not_use_auth_cache_test);
- g_test_add_func ("/auth/authorization-header-request", do_message_has_authorization_header_test);
- g_test_add_func ("/auth/cancel-after-retry", do_cancel_after_retry_test);
-- g_test_add_func ("/auth/missing-realm", do_missing_realm_test);
-+ g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test);
-+ g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test);
-+ g_test_add_data_func ("/auth/missing-params/nonce-md5-sess", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\" algorithm=\"MD5-sess\"", do_missing_params_test);
-
- ret = g_test_run ();
-
@@ -6,10 +6,14 @@ Subject: [PATCH 1/2] auth-digest: Handle missing nonce
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992]
CVE: CVE-2025-32912
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+The test codes is based on CVE-2025-32910, test code in CVE-2025-32910
+is removed for fixing do_compile failure. So also remove this test code
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
libsoup/soup-auth-digest.c | 2 +-
- tests/auth-test.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletion(-)
diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
index a1db188..f0edb81 100644
@@ -24,18 +28,6 @@ index a1db188..f0edb81 100644
return FALSE;
g_free (priv->domain);
-diff --git a/tests/auth-test.c b/tests/auth-test.c
-index 6fb1e4a..343d7a5 100644
---- a/tests/auth-test.c
-+++ b/tests/auth-test.c
-@@ -1629,6 +1629,7 @@ main (int argc, char **argv)
- g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test);
- g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test);
- g_test_add_data_func ("/auth/missing-params/nonce-md5-sess", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\" algorithm=\"MD5-sess\"", do_missing_params_test);
-+ g_test_add_data_func ("/auth/missing-params/nonce-and-qop", "Digest realm=\"auth-test\"", do_missing_params_test);
-
- ret = g_test_run ();
-
--
2.25.1