Fix incorrect encryption mode

Combine the RSN and WPA pairwise to get correct key encryption mode

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 8007b46..a7aabe1 100644 (file)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -946,10 +946,8 @@ const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network)
            network->best_bss->security == G_SUPPLICANT_SECURITY_IEEE8021X) {
                unsigned int pairwise;
 
-               if (network->best_bss->rsn_selected)
-                       pairwise = network->best_bss->rsn_pairwise;
-               else
-                       pairwise = network->best_bss->wpa_pairwise;
+               pairwise = network->best_bss->rsn_pairwise |
+                               network->best_bss->wpa_pairwise;
 
                if ((pairwise & G_SUPPLICANT_PAIRWISE_CCMP) &&
                    (pairwise & G_SUPPLICANT_PAIRWISE_TKIP))

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 4f9edf2..4981ad4 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,5 +1,5 @@
 Name:           connman
-Version:        1.3_17
+Version:        1.3_18
 Release:        1
 License:        GPLv2
 Summary:        Connection Manager