summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiraj Kumar Goit <niraj.g@samsung.com>2021-01-27 19:14:08 +0530
committerNiraj Kumar Goit <niraj.g@samsung.com>2021-01-27 19:18:42 +0530
commitcf94fb3ffa303075783f8b04285ca4bd0fb451c4 (patch)
tree39f5acd669d52066abfc8b9a9b5dee5f8606fdc5
parent913f1e05c1f3ac7897646f76d873bf570064fc67 (diff)
downloadconnman-cf94fb3ffa303075783f8b04285ca4bd0fb451c4.tar.gz
connman-cf94fb3ffa303075783f8b04285ca4bd0fb451c4.tar.bz2
connman-cf94fb3ffa303075783f8b04285ca4bd0fb451c4.zip
Error checking in passphrase decryption method.
If Dbus fails to append argument in dbus-message, do not call a dbus method to decrypt passphrase. Change-Id: Ic3b63ea9e6827ca1bf3753d750026119ec1bfd1a Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
-rwxr-xr-xgsupplicant/supplicant.c8
-rw-r--r--packaging/connman.spec2
2 files changed, 9 insertions, 1 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 02e6a629..cfdb183a 100755
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -7485,8 +7485,16 @@ static int send_decryption_request(const char *passphrase,
if (!msg)
return -EINVAL;
+#if defined TIZEN_EXT
+ if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &passphrase,
+ DBUS_TYPE_INVALID)) {
+ SUPPLICANT_DBG("Could not fulfill decryption request");
+ return -ENOMEM;
+ }
+#else
dbus_message_append_args(msg, DBUS_TYPE_STRING, &passphrase,
DBUS_TYPE_INVALID);
+#endif
if (!dbus_connection_send_with_reply(connection, msg,
&call, DBUS_TIMEOUT_USE_DEFAULT)) {
diff --git a/packaging/connman.spec b/packaging/connman.spec
index f1a29fa3..aa1cfbbb 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -6,7 +6,7 @@
Name: connman
Version: 1.38
-Release: 3
+Release: 4
License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net