diff options
| author | taesub kim <taesub.kim@samsung.com> | 2016-06-12 19:14:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-06-12 19:14:12 -0700 |
| commit | e3f92763324a7eb0dcc52deb17108135515c1a43 (patch) | |
| tree | 1ecb93968ace0d9f1fc6c623654007c59b583b87 | |
| parent | 33e329f02bcfe11acf546eecce8153e821d37079 (diff) | |
| parent | 908cdc77eee10d6f01640889386c9cc51453080e (diff) | |
| download | connman-e3f92763324a7eb0dcc52deb17108135515c1a43.tar.gz connman-e3f92763324a7eb0dcc52deb17108135515c1a43.tar.bz2 connman-e3f92763324a7eb0dcc52deb17108135515c1a43.zip | |
Merge "[SPIN] Admit to connect EAP-TLS without passphrase of privatekey." into tizen
| -rwxr-xr-x | gsupplicant/supplicant.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index 329bf6bd..fc8fd3d9 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -4490,8 +4490,10 @@ static void add_network_security_tls(DBusMessageIter *dict, if (!ssid->private_key_path) return; +#if !defined TIZEN_EXT if (!ssid->private_key_passphrase) return; +#endif if (ssid->ca_cert_path) supplicant_dbus_dict_append_basic(dict, "ca_cert", @@ -4500,9 +4502,11 @@ static void add_network_security_tls(DBusMessageIter *dict, supplicant_dbus_dict_append_basic(dict, "private_key", DBUS_TYPE_STRING, &ssid->private_key_path); +#if !defined TIZEN_EXT supplicant_dbus_dict_append_basic(dict, "private_key_passwd", DBUS_TYPE_STRING, &ssid->private_key_passphrase); +#endif supplicant_dbus_dict_append_basic(dict, "client_cert", DBUS_TYPE_STRING, &ssid->client_cert_path); @@ -4534,8 +4538,10 @@ static void add_network_security_peap(DBusMessageIter *dict, if (!ssid->private_key_path) return; +#if !defined TIZEN_EXT if (!ssid->private_key_passphrase) return; +#endif supplicant_dbus_dict_append_basic(dict, "client_cert", DBUS_TYPE_STRING, @@ -4545,9 +4551,11 @@ static void add_network_security_peap(DBusMessageIter *dict, DBUS_TYPE_STRING, &ssid->private_key_path); +#if !defined TIZEN_EXT supplicant_dbus_dict_append_basic(dict, "private_key_passwd", DBUS_TYPE_STRING, &ssid->private_key_passphrase); +#endif } |