[PATCH] iwd: Fix connection with invalid passphrase format

[PATCH] iwd: Fix connection with invalid passphrase format

[VAUTRIN Emmanuel (Canal Plus Prestataire)]

[-- Attachment #1: Type: text/plain, Size: 1171 bytes --]

It is no more possible to connect to a secure network, after entering
an invalid passphrase format, for example 64 characters.
In this case, the user agent still needs to be called, to request a new
passphrase.
---
 plugins/iwd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/iwd.c b/plugins/iwd.c
index ee3ed83e5957..f2d368336d1a 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -241,7 +241,9 @@ static void cm_network_connect_cb(DBusMessage *message, void *user_data)
                        return;

                DBG("%s connect failed: %s", path, dbus_error);
-               if (!strcmp(dbus_error, "net.connman.iwd.Failed"))
+               if (!strcmp(dbus_error, "net.connman.iwd.Failed") ||
+                                       !strcmp(dbus_error,
+                                       "net.connman.iwd.InvalidFormat"))
                        connman_network_set_error(iwdn->network,
                                        CONNMAN_NETWORK_ERROR_INVALID_KEY);
                else if (!iwdn->autoconnect)
--
2.25.1

Hello,

Please find the well formatted patch in attachment.

Emmanuel


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-iwd-Fix-connection-with-invalid-passphrase-format.patch --]
[-- Type: text/x-patch; name="0001-iwd-Fix-connection-with-invalid-passphrase-format.patch", Size: 1109 bytes --]

From 8cbd34aa536284a5349ee61a0bdba126b8b42fbf Mon Sep 17 00:00:00 2001
From: Emmanuel VAUTRIN <Emmanuel.VAUTRIN@cpexterne.org>
Date: Fri, 8 Apr 2022 17:24:19 +0200
Subject: [PATCH] iwd: Fix connection with invalid passphrase format

It is no more possible to connect to a secure network, after entering
an invalid passphrase format, for example 64 characters.
In this case, the user agent still needs to be called, to request a new
passphrase.
---
 plugins/iwd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/iwd.c b/plugins/iwd.c
index ee3ed83e5957..f2d368336d1a 100644
--- a/plugins/iwd.c
+++ b/plugins/iwd.c
@@ -241,7 +241,9 @@ static void cm_network_connect_cb(DBusMessage *message, void *user_data)
 			return;
 
 		DBG("%s connect failed: %s", path, dbus_error);
-		if (!strcmp(dbus_error, "net.connman.iwd.Failed"))
+		if (!strcmp(dbus_error, "net.connman.iwd.Failed") ||
+					!strcmp(dbus_error,
+					"net.connman.iwd.InvalidFormat"))
 			connman_network_set_error(iwdn->network,
 					CONNMAN_NETWORK_ERROR_INVALID_KEY);
 		else if (!iwdn->autoconnect)
-- 
2.25.1

Re: [PATCH] iwd: Fix connection with invalid passphrase format

[Daniel Wagner]

On Mon, Apr 11, 2022 at 08:03:38AM +0000, VAUTRIN Emmanuel (Canal Plus Prestataire) wrote:
> It is no more possible to connect to a secure network, after entering
> an invalid passphrase format, for example 64 characters.
> In this case, the user agent still needs to be called, to request a new
> passphrase.

Thanks, patch applied.

RE: [PATCH] iwd: Fix connection with invalid passphrase format

[VAUTRIN Emmanuel (Canal Plus Prestataire)]

> Thanks, patch applied.
Great. Thank you Daniel!