diff options
| author | Jaehyun Kim <jeik01.kim@samsung.com> | 2021-02-24 08:31:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review> | 2021-02-24 08:31:21 +0000 |
| commit | a424f79696a666ac27812d23af170552e760309d (patch) | |
| tree | 5e26bdf23178c87e9105f7f9d0d0a25e3e68ee61 | |
| parent | d180a9d2152fdd28ea68f0fbe0ef52e9c7ceac5a (diff) | |
| parent | cf94fb3ffa303075783f8b04285ca4bd0fb451c4 (diff) | |
| download | connman-accepted/tizen_unified.tar.gz connman-accepted/tizen_unified.tar.bz2 connman-accepted/tizen_unified.zip | |
Merge "Error checking in passphrase decryption method." into tizenHEADsubmit/tizen/20210224.083420accepted/tizen/unified/20210225.130544tizenaccepted/tizen_unified
| -rwxr-xr-x | gsupplicant/supplicant.c | 8 | ||||
| -rw-r--r-- | packaging/connman.spec | 2 |
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 80309a88..501c10ef 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 |