[NetworkManager-openconnect/lr/sad-cert] properties: load certificates & key from the connection




commit 76f0f2af815c55763bca19347e1919983bdd6d30
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Jun 15 17:13:19 2022 +0200

    properties: load certificates & key from the connection
    
    This has been omitted whilst porting to the Gtk4-ready NmaCertChooser.
    
    Fixes: 650bfa6f60f8 ('properties: use NmaCertChooser')

 properties/auth-helpers.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index d40f4ad..1dc506a 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -41,6 +41,7 @@ tls_pw_init_auth_widget (GtkBuilder *builder,
                          gpointer user_data)
 {
        GtkWidget *widget;
+       const char *value;
        GtkSizeGroup *group;
 
        g_return_if_fail (builder != NULL);
@@ -52,9 +53,26 @@ tls_pw_init_auth_widget (GtkBuilder *builder,
        nma_cert_chooser_add_to_size_group (NMA_CERT_CHOOSER (widget), group);
        g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (changed_cb), user_data);
 
+
+       if (s_vpn) {
+               value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_CACERT);
+               if (value && strlen (value))
+                       nma_cert_chooser_set_cert_uri (NMA_CERT_CHOOSER (widget), value);
+       }
+
        widget = GTK_WIDGET (gtk_builder_get_object (builder, "cert_chooser"));
        nma_cert_chooser_add_to_size_group (NMA_CERT_CHOOSER (widget), group);
        g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (changed_cb), user_data);
+
+       if (s_vpn) {
+               value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_USERCERT);
+               if (value && strlen (value))
+                       nma_cert_chooser_set_cert_uri (NMA_CERT_CHOOSER (widget), value);
+
+               value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_PRIVKEY);
+               if (value && strlen (value))
+                       nma_cert_chooser_set_key_uri (NMA_CERT_CHOOSER (widget), value);
+       }
 }
 
 gboolean


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