[network-manager-applet/lr/wifi-dialog-fixes: 6/6] wireless-security/eap: tolerate missing CA on secrets_only



commit 3a69f55283e84c01f49ffdf2a4bc6c75d7615972
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Oct 24 18:49:08 2018 +0200

    wireless-security/eap: tolerate missing CA on secrets_only
    
    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.

 src/wireless-security/eap-method-peap.c | 3 +++
 src/wireless-security/eap-method-tls.c  | 3 +++
 src/wireless-security/eap-method-ttls.c | 3 +++
 3 files changed, 9 insertions(+)
---
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 934dbad4..c2c0a389 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 da245684..868d3cb5 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",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]