From 4e4c16760abdbc2ab34b159e52c5c027a1b2ad26 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 26 Nov 2003 08:54:48 +0000 Subject: mostly implement a viewer for certificates. 2003-11-26 Chris Toshok * gui/certificate-viewer.[ch]: mostly implement a viewer for certificates. * gui/smime-ui.glade: fingerprints-sh1 -> fingerprints-sha1. * gui/certificate-manager.c (import_your): new function, use e-pkcs12 to implement it. (initialize_yourcerts_ui): hook up the import button. (view_contact): new function, bring up the certificate viewer. (initialize_contactcerts_ui): hook up the view button. (view_ca): new function, bring up the certificate viewer. (initialize_authoritycerts_ui): hook up the view button. * gui/Makefile.am (libevolution_smime_la_SOURCES): add certificate-viewer.[ch] * lib/e-cert.c (e_cert_dispose): free all the new cached foo. (e_cert_populate): populate all the new cached foo. (e_cert_get_issuer_cn): new function. (e_cert_get_issuer_org): same. (e_cert_get_issuer_org_unit): same. (e_cert_get_issued_on_time): same. (e_cert_get_issued_on): same. (e_cert_get_expires_on_time): same. (e_cert_get_expires_on): same. (e_cert_get_serial_number): same. (e_cert_get_sha1_fingerprint): same. (e_cert_get_md5_fingerprint): same. * lib/e-cert.h: add prototypes for lots more accessors. * lib/e-cert-db.c (e_cert_db_find_cert_by_key): fix typo. (e_cert_db_find_cert_by_email_address): call CERT_DestroyCertificate to free the cert. (default_nickname): new function. (e_cert_db_import_user_cert): implement. (e_cert_db_import_server_cert): add blurb. * lib/e-pkcs12.[ch]: new files. * lib/Makefile.am (libessmime_la_SOURCES): add e-pkcs12.[ch] svn path=/trunk/; revision=23486 --- smime/gui/Makefile.am | 2 + smime/gui/certificate-manager.c | 70 +++++++++++++++++++++- smime/gui/certificate-viewer.c | 125 ++++++++++++++++++++++++++++++++++++++++ smime/gui/certificate-viewer.h | 31 ++++++++++ smime/gui/smime-ui.glade | 2 +- 5 files changed, 228 insertions(+), 2 deletions(-) create mode 100644 smime/gui/certificate-viewer.c create mode 100644 smime/gui/certificate-viewer.h (limited to 'smime/gui') diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index e71756fa39..aba4c31548 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -23,6 +23,8 @@ noinst_LTLIBRARIES = libevolution-smime.la libevolution_smime_la_SOURCES = \ certificate-manager.c \ certificate-manager.h \ + certificate-viewer.c \ + certificate-viewer.h \ e-cert-selector.c \ e-cert-selector.h diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 48f9ef38b1..41caa775a5 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -29,9 +29,11 @@ #include #include "evolution-config-control.h" #include "certificate-manager.h" +#include "certificate-viewer.h" #include "e-cert.h" #include "e-cert-db.h" +#include "e-pkcs12.h" #include "nss.h" #include @@ -114,6 +116,26 @@ handle_selection_changed (GtkTreeSelection *selection, gtk_widget_set_sensitive (view_button, cert_selected); } +static void +import_your (GtkWidget *widget, CertificateManagerData *cfm) +{ + GtkWidget *filesel = gtk_file_selection_new (_("Select a cert to import...")); + + if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { + const char *filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel)); + EPKCS12 *pkcs12 = e_pkcs12_new (); + + if (e_pkcs12_import_from_file (pkcs12, filename, NULL /* XXX */)) { + /* there's no telling how many certificates were added during the import, + so we blow away the contact cert display and regenerate it. */ + unload_certs (cfm, E_CERT_USER); + load_certs (cfm, E_CERT_USER, add_user_cert); + } + } + + gtk_widget_destroy (filesel); +} + static void yourcerts_selection_changed (GtkTreeSelection *selection, CertificateManagerData *cfm) { @@ -170,7 +192,7 @@ initialize_yourcerts_ui (CertificateManagerData *cfm) g_signal_connect (selection, "changed", G_CALLBACK (yourcerts_selection_changed), cfm); if (cfm->import_your_button) { - /* g_signal_connect */ + g_signal_connect (cfm->import_your_button, "clicked", G_CALLBACK (import_your), cfm); } if (cfm->delete_your_button) { @@ -190,6 +212,26 @@ initialize_yourcerts_ui (CertificateManagerData *cfm) } } +static void +view_contact (GtkWidget *widget, CertificateManagerData *cfm) +{ + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->contactcerts_treeview)), + NULL, + &iter)) { + ECert *cert; + + gtk_tree_model_get (GTK_TREE_MODEL (cfm->contactcerts_treemodel), + &iter, + 3, &cert, + -1); + + if (cert) + certificate_viewer_show (cert); + } +} + static void import_contact (GtkWidget *widget, CertificateManagerData *cfm) { @@ -297,6 +339,9 @@ initialize_contactcerts_ui (CertificateManagerData *cfm) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->contactcerts_treeview)); g_signal_connect (selection, "changed", G_CALLBACK (contactcerts_selection_changed), cfm); + if (cfm->view_contact_button) + g_signal_connect (cfm->view_contact_button, "clicked", G_CALLBACK (view_contact), cfm); + if (cfm->import_contact_button) g_signal_connect (cfm->import_contact_button, "clicked", G_CALLBACK (import_contact), cfm); @@ -324,6 +369,26 @@ iter_string_compare (GtkTreeModel *model, return g_utf8_collate (string1, string2); } +static void +view_ca (GtkWidget *widget, CertificateManagerData *cfm) +{ + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->authoritycerts_treeview)), + NULL, + &iter)) { + ECert *cert; + + gtk_tree_model_get (GTK_TREE_MODEL (cfm->authoritycerts_treemodel), + &iter, + 1, &cert, + -1); + + if (cert) + certificate_viewer_show (cert); + } +} + static void import_ca (GtkWidget *widget, CertificateManagerData *cfm) { @@ -421,6 +486,9 @@ initialize_authoritycerts_ui (CertificateManagerData *cfm) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->authoritycerts_treeview)); g_signal_connect (selection, "changed", G_CALLBACK (authoritycerts_selection_changed), cfm); + if (cfm->view_ca_button) + g_signal_connect (cfm->view_ca_button, "clicked", G_CALLBACK (view_ca), cfm); + if (cfm->import_ca_button) g_signal_connect (cfm->import_ca_button, "clicked", G_CALLBACK (import_ca), cfm); diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c new file mode 100644 index 0000000000..4a0bc3327d --- /dev/null +++ b/smime/gui/certificate-viewer.c @@ -0,0 +1,125 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Chris Toshok + * + * Copyright (C) 2003 Ximian, Inc. (www.ximian.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * + */ + +#include "certificate-viewer.h" + +#include + +#include +#include + +#define GLADE_FILE_NAME "smime-ui.glade" + +typedef struct { + GladeXML *gui; + GtkWidget *dialog; +} CertificateViewerData; + +static void +free_data (gpointer data, GObject *where_the_object_was) +{ + CertificateViewerData *cvm = data; + + g_object_unref (cvm->gui); + g_free (cvm); +} + + +GtkWidget* +certificate_viewer_show (ECert *cert) +{ + CertificateViewerData *cvm_data; + CERTCertificate *mcert; + GtkWidget *label; + const char *text; + + mcert = e_cert_get_internal_cert (cert); + + cvm_data = g_new0 (CertificateViewerData, 1); + cvm_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL); + + cvm_data->dialog = glade_xml_get_widget (cvm_data->gui, "certificate-viewer-dialog"); + + /* issued to */ + if (e_cert_get_cn (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-to-cn"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_cn (cert)); + } + + if (e_cert_get_org (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-to-o"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_org (cert)); + } + + if (e_cert_get_org_unit (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-to-ou"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_org_unit (cert)); + } + + text = e_cert_get_serial_number (cert); + label = glade_xml_get_widget (cvm_data->gui, "issued-to-serial"); + gtk_label_set_text (GTK_LABEL (label), text); + + /* issued by */ + if (e_cert_get_issuer_cn (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-by-cn"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_issuer_cn (cert)); + } + + if (e_cert_get_issuer_org (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-by-o"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_issuer_org (cert)); + } + + if (e_cert_get_issuer_org_unit (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "issued-by-ou"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_issuer_org_unit (cert)); + } + + /* validity */ + if (e_cert_get_issued_on (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "validity-issued-on"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_issued_on (cert)); + } + + if (e_cert_get_expires_on (cert)) { + label = glade_xml_get_widget (cvm_data->gui, "validity-expires-on"); + gtk_label_set_text (GTK_LABEL (label), e_cert_get_expires_on (cert)); + } + + /* fingerprints */ + text = e_cert_get_sha1_fingerprint (cert); + label = glade_xml_get_widget (cvm_data->gui, "fingerprints-sha1"); + gtk_label_set_text (GTK_LABEL (label), text); + + text = e_cert_get_md5_fingerprint (cert); + label = glade_xml_get_widget (cvm_data->gui, "fingerprints-md5"); + gtk_label_set_text (GTK_LABEL (label), text); + + g_object_weak_ref (G_OBJECT (cvm_data->dialog), free_data, cvm_data); + + g_signal_connect (cvm_data->dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); + + gtk_widget_show (cvm_data->dialog); + return cvm_data->dialog; +} diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h new file mode 100644 index 0000000000..ab60043a39 --- /dev/null +++ b/smime/gui/certificate-viewer.h @@ -0,0 +1,31 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Chris Toshok + * + * Copyright (C) 2003 Ximian, Inc. (www.ximian.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef _CERTIFICATE_VIEWER_H_ +#define _CERTIFICATE_VIEWER_H + +#include +#include "e-cert.h" + +GtkWidget* certificate_viewer_show (ECert *cert); + +#endif /* _CERTIFICATE_VIEWER_H_ */ diff --git a/smime/gui/smime-ui.glade b/smime/gui/smime-ui.glade index 3cd6f764f7..57475c1cbc 100644 --- a/smime/gui/smime-ui.glade +++ b/smime/gui/smime-ui.glade @@ -745,7 +745,7 @@ - + True True <Not Part of Certificate> -- cgit v1.2.3