summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaehyun Kim <jeik01.kim@samsung.com>2019-07-29 08:58:04 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2019-07-29 08:58:04 +0000
commitd9c4473ac7a38978f0c8922ddb72849320faab75 (patch)
tree574307584b7c0ca9a15f0801b27cb5d0f3525e34 /src
parentd9e04fb45fc32e3109e322bd02e6b7e395908ea0 (diff)
parent744ba68df7010ee6a3a962daad47d106998c15fa (diff)
downloadconnman-d9c4473ac7a38978f0c8922ddb72849320faab75.tar.gz
connman-d9c4473ac7a38978f0c8922ddb72849320faab75.tar.bz2
connman-d9c4473ac7a38978f0c8922ddb72849320faab75.zip
Merge "Add OWE security mode support" into tizensubmit/tizen/20190731.014248submit/tizen/20190729.091802
Diffstat (limited to 'src')
-rw-r--r--src/service.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/service.c b/src/service.c
index c59a2269..6331ae41 100644
--- a/src/service.c
+++ b/src/service.c
@@ -352,6 +352,8 @@ enum connman_service_security __connman_service_string2security(const char *str)
return CONNMAN_SERVICE_SECURITY_RSN;
if (!strcmp(str, "sae"))
return CONNMAN_SERVICE_SECURITY_SAE;
+ if (!strcmp(str, "owe"))
+ return CONNMAN_SERVICE_SECURITY_OWE;
#endif
return CONNMAN_SERVICE_SECURITY_UNKNOWN;
@@ -374,6 +376,8 @@ static const char *security2string(enum connman_service_security security)
return "rsn";
case CONNMAN_SERVICE_SECURITY_SAE:
return "sae";
+ case CONNMAN_SERVICE_SECURITY_OWE:
+ return "owe";
#else
case CONNMAN_SERVICE_SECURITY_RSN:
return "psk";
@@ -8216,6 +8220,9 @@ static int service_connect(struct connman_service *service)
switch (service->security) {
case CONNMAN_SERVICE_SECURITY_UNKNOWN:
case CONNMAN_SERVICE_SECURITY_NONE:
+#if defined TIZEN_EXT
+ case CONNMAN_SERVICE_SECURITY_OWE:
+#endif
break;
case CONNMAN_SERVICE_SECURITY_WEP:
case CONNMAN_SERVICE_SECURITY_PSK:
@@ -8296,6 +8303,7 @@ static int service_connect(struct connman_service *service)
case CONNMAN_SERVICE_SECURITY_RSN:
#if defined TIZEN_EXT
case CONNMAN_SERVICE_SECURITY_SAE:
+ case CONNMAN_SERVICE_SECURITY_OWE:
#endif
break;
case CONNMAN_SERVICE_SECURITY_8021X:
@@ -9050,6 +9058,8 @@ static enum connman_service_security convert_wifi_security(const char *security)
#if defined TIZEN_EXT
else if (g_str_equal(security, "sae"))
return CONNMAN_SERVICE_SECURITY_SAE;
+ else if (g_str_equal(security, "owe"))
+ return CONNMAN_SERVICE_SECURITY_OWE;
else if (g_str_equal(security, "ft_psk") == TRUE)
return CONNMAN_SERVICE_SECURITY_PSK;
else if (g_str_equal(security, "ft_ieee8021x") == TRUE)