summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-10-24 18:49:08 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-11-26 14:24:41 +0100
commit0081a5cf6f992433e105c65fd3ed8708809e92f1 (patch)
tree673f9ccde7ccf4d1bb15da80b03d6b5f5b4c6a49
parent0b1e2dfda1ce6f68be6ddb15e31aed4a72711b59 (diff)
downloadnetwork-manager-applet-lr/wifi-dialog-fixes.tar.gz
wireless-security/eap: tolerate missing CA on secrets_onlylr/wifi-dialog-fixes
The user chose not to use a CA certificate when creating the connection, when we ask for secrets there's no way for them to reconsider.
-rw-r--r--src/wireless-security/eap-method-peap.c3
-rw-r--r--src/wireless-security/eap-method-tls.c3
-rw-r--r--src/wireless-security/eap-method-ttls.c3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/wireless-security/eap-method-peap.c b/src/wireless-security/eap-method-peap.c
index a3b30068..37fd39d9 100644
--- a/src/wireless-security/eap-method-peap.c
+++ b/src/wireless-security/eap-method-peap.c
@@ -429,6 +429,9 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
ca_not_required = TRUE;
}
+ if (secrets_only)
+ ca_not_required = TRUE;
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_not_required_checkbox"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index fe12dd63..e0f32945 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -472,6 +472,9 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
ca_not_required = TRUE;
}
+ if (secrets_only)
+ ca_not_required = TRUE;
+
method->client_cert_chooser = nma_cert_chooser_new ("User",
secrets_only ? NMA_CERT_CHOOSER_FLAG_PASSWORDS : 0);
gtk_grid_attach (GTK_GRID (widget), method->client_cert_chooser, 0, 4, 2, 1);
diff --git a/src/wireless-security/eap-method-ttls.c b/src/wireless-security/eap-method-ttls.c
index 1495a1f6..6140029d 100644
--- a/src/wireless-security/eap-method-ttls.c
+++ b/src/wireless-security/eap-method-ttls.c
@@ -479,6 +479,9 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
ca_not_required = TRUE;
}
+ if (secrets_only)
+ ca_not_required = TRUE;
+
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_not_required_checkbox"));
g_assert (widget);
g_signal_connect (G_OBJECT (widget), "toggled",