/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net>
- * and the Claws Mail team
+ * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
#include "socket.h"
#include "hooks.h"
#include "defs.h"
+#include "file-utils.h"
static GHashTable *warned_expired = NULL;
static gchar *get_certificate_path(const gchar *host, const gchar *port, const gchar *fp)
{
- if (fp != NULL && prefs_common_unsafe_ssl_certs())
- return g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "certs", G_DIR_SEPARATOR_S,
- host, ".", port, ".", fp, ".cert", NULL);
- else
- return g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "certs", G_DIR_SEPARATOR_S,
- host, ".", port, ".cert", NULL);
+ gchar *ret;
+ gchar *filename;
+
+ if (fp != NULL && prefs_common_unsafe_ssl_certs()) {
+ filename = g_strconcat(host, ".", port, ".", fp, ".cert", NULL);
+ } else {
+ filename = g_strconcat(host, ".", port, ".cert", NULL);
+ }
+ subst_for_filename(filename);
+
+ ret = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ "certs", G_DIR_SEPARATOR_S,
+ filename, NULL);
+
+ g_free(filename);
+ return ret;
+}
+
+static gchar *get_certificate_chain_path(const gchar *host, const gchar *port, const gchar *fp)
+{
+ gchar *tmp = get_certificate_path(host, port, fp);
+ gchar *result = g_strconcat(tmp, ".chain", NULL);
+
+ g_free(tmp);
+
+ return result;
}
char * readable_fingerprint(unsigned char *src, int len)
size = 0;
if (gnutls_x509_crt_init(&dest) != 0) {
- g_warning("couldn't gnutls_x509_crt_init\n");
+ g_warning("couldn't gnutls_x509_crt_init");
return NULL;
}
if (gnutls_x509_crt_export(src, GNUTLS_X509_FMT_DER, NULL, &size)
!= GNUTLS_E_SHORT_MEMORY_BUFFER) {
- g_warning("couldn't gnutls_x509_crt_export to get size\n");
+ g_warning("couldn't gnutls_x509_crt_export to get size");
gnutls_x509_crt_deinit(dest);
return NULL;
}
tmp.size = size;
ret = gnutls_x509_crt_import(dest, &tmp, GNUTLS_X509_FMT_DER);
if (ret) {
- g_warning("couldn't gnutls_x509_crt_import for real (%d %s)\n", ret, gnutls_strerror(ret));
+ g_warning("couldn't gnutls_x509_crt_import for real (%d %s)", ret, gnutls_strerror(ret));
gnutls_x509_crt_deinit(dest);
dest = NULL;
}
} else {
- g_warning("couldn't gnutls_x509_crt_export for real (%d %s)\n", ret, gnutls_strerror(ret));
+ g_warning("couldn't gnutls_x509_crt_export for real (%d %s)", ret, gnutls_strerror(ret));
gnutls_x509_crt_deinit(dest);
dest = NULL;
}
cert->port = port;
/* fingerprint */
- n = 128;
+ n = sizeof(md);
gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
cert->fingerprint = readable_fingerprint(md, (int)n);
return cert;
}
-#ifdef USE_GNUTLS
-static void gnutls_i2d_X509_fp(FILE *fp, gnutls_x509_crt_t x509_cert)
+static void gnutls_export_X509_fp(FILE *fp, gnutls_x509_crt_t x509_cert, gnutls_x509_crt_fmt_t format)
{
char output[10*1024];
size_t cert_size = 10*1024;
int r;
- if ((r = gnutls_x509_crt_export(x509_cert, GNUTLS_X509_FMT_DER, output, &cert_size)) < 0) {
- g_warning("couldn't export cert %s (%zd)\n", gnutls_strerror(r), cert_size);
+ if ((r = gnutls_x509_crt_export(x509_cert, format, output, &cert_size)) < 0) {
+ g_warning("couldn't export cert %s (%"G_GSIZE_FORMAT")", gnutls_strerror(r), cert_size);
return;
}
+#ifdef G_OS_WIN32
+ debug_print("writing %Iu bytes\n",cert_size);
+#else
debug_print("writing %zd bytes\n",cert_size);
- if (fwrite(&output, 1, cert_size, fp) < cert_size) {
- g_warning("failed to write cert\n");
+#endif
+ if (claws_fwrite(&output, 1, cert_size, fp) < cert_size) {
+ g_warning("failed to write cert: %d %s", errno, g_strerror(errno));
}
}
*output = malloc(cert_size);
if ((r = gnutls_x509_crt_export(x509_cert, GNUTLS_X509_FMT_DER, *output, &cert_size)) < 0) {
- g_warning("couldn't export cert %s (%zd)\n", gnutls_strerror(r), cert_size);
+ g_warning("couldn't export cert %s (%"G_GSIZE_FORMAT")", gnutls_strerror(r), cert_size);
free(*output);
*output = NULL;
return 0;
*output = malloc(key_size);
if ((r = gnutls_x509_privkey_export(pkey, GNUTLS_X509_FMT_DER, *output, &key_size)) < 0) {
- g_warning("couldn't export key %s (%zd)\n", gnutls_strerror(r), key_size);
+ g_warning("couldn't export key %s (%"G_GSIZE_FORMAT")", gnutls_strerror(r), key_size);
free(*output);
*output = NULL;
return 0;
return key_size;
}
-static int gnutls_d2i_X509_list_fp(FILE *fp, int format, gnutls_x509_crt_t **cert_list, gint *num_certs)
+static int gnutls_import_X509_list_fp(FILE *fp, gnutls_x509_crt_fmt_t format,
+ gnutls_x509_crt_t **cert_list, gint *num_certs)
{
gnutls_x509_crt_t *crt_list;
unsigned int max = 512;
tmp.data = malloc(s.st_size);
memset(tmp.data, 0, s.st_size);
tmp.size = s.st_size;
- if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
- perror("fread");
+ if (claws_fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
+ perror("claws_fread");
free(tmp.data);
free(crt_list);
return -EIO;
}
/* return one certificate, read from file */
-static gnutls_x509_crt_t gnutls_d2i_X509_fp(FILE *fp, int format)
+static gnutls_x509_crt_t gnutls_import_X509_fp(FILE *fp, gnutls_x509_crt_fmt_t format)
{
gnutls_x509_crt_t *certs = NULL;
gnutls_x509_crt_t cert = NULL;
int i, ncerts, r;
- if ((r = gnutls_d2i_X509_list_fp(fp, format, &certs, &ncerts)) < 0) {
+ if ((r = gnutls_import_X509_list_fp(fp, format, &certs, &ncerts)) < 0) {
return NULL;
}
return cert;
}
-static gnutls_x509_privkey_t gnutls_d2i_key_fp(FILE *fp, int format)
+static gnutls_x509_privkey_t gnutls_import_key_fp(FILE *fp, gnutls_x509_crt_fmt_t format)
{
gnutls_x509_privkey_t key = NULL;
gnutls_datum_t tmp;
tmp.data = malloc(s.st_size);
memset(tmp.data, 0, s.st_size);
tmp.size = s.st_size;
- if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
- perror("fread");
+ if (claws_fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
+ perror("claws_fread");
free(tmp.data);
return NULL;
}
gnutls_x509_privkey_init(&key);
- if ((r = gnutls_x509_privkey_import(key, &tmp, (format == 0)?GNUTLS_X509_FMT_DER:GNUTLS_X509_FMT_PEM)) < 0) {
+ if ((r = gnutls_x509_privkey_import(key, &tmp, format)) < 0) {
debug_print("key import failed: %s\n", gnutls_strerror(r));
gnutls_x509_privkey_deinit(key);
key = NULL;
return key;
}
-static gnutls_pkcs12_t gnutls_d2i_PKCS12_fp(FILE *fp, int format)
+static gnutls_pkcs12_t gnutls_import_PKCS12_fp(FILE *fp, gnutls_x509_crt_fmt_t format)
{
gnutls_pkcs12_t p12 = NULL;
gnutls_datum_t tmp;
int r;
if (fstat(fileno(fp), &s) < 0) {
log_error(LOG_PROTOCOL, _("Cannot stat P12 certificate file (%s)\n"),
- strerror(errno));
+ g_strerror(errno));
return NULL;
}
tmp.data = malloc(s.st_size);
memset(tmp.data, 0, s.st_size);
tmp.size = s.st_size;
- if (fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
+ if (claws_fread (tmp.data, 1, s.st_size, fp) < s.st_size) {
log_error(LOG_PROTOCOL, _("Cannot read P12 certificate file (%s)\n"),
- strerror(errno));
+ g_strerror(errno));
free(tmp.data);
return NULL;
}
gnutls_pkcs12_init(&p12);
- if ((r = gnutls_pkcs12_import(p12, &tmp, (format == 0)?GNUTLS_X509_FMT_DER:GNUTLS_X509_FMT_PEM,0)) < 0) {
+ if ((r = gnutls_pkcs12_import(p12, &tmp, format, 0)) < 0) {
log_error(LOG_PROTOCOL, _("Cannot import P12 certificate file (%s)\n"),
gnutls_strerror(r));
gnutls_pkcs12_deinit(p12);
return p12;
}
-#endif
-
static void ssl_certificate_save (SSLCertificate *cert)
{
gchar *file, *port;
file = get_certificate_path(cert->host, port, cert->fingerprint);
g_free(port);
- fp = g_fopen(file, "wb");
+ fp = claws_fopen(file, "wb");
if (fp == NULL) {
g_free(file);
debug_print("Can't save certificate !\n");
return;
}
-#ifdef USE_GNUTLS
- gnutls_i2d_X509_fp(fp, cert->x509_cert);
-#else
- i2d_X509_fp(fp, cert->x509_cert);
-#endif
+
+ gnutls_export_X509_fp(fp, cert->x509_cert, GNUTLS_X509_FMT_DER);
+
g_free(file);
- fclose(fp);
+ claws_safe_fclose(fp);
}
file = get_certificate_path(cert->host, buf, cert->fingerprint);
claws_unlink (file);
g_free(file);
+ file = get_certificate_chain_path(cert->host, buf, cert->fingerprint);
+ claws_unlink (file);
+ g_free(file);
g_free(buf);
}
if (fingerprint != NULL) {
file = get_certificate_path(host, buf, fingerprint);
- fp = g_fopen(file, "rb");
+ fp = claws_fopen(file, "rb");
}
if (fp == NULL) {
/* see if we have the old one */
debug_print("didn't get %s\n", file);
g_free(file);
file = get_certificate_path(host, buf, NULL);
- fp = g_fopen(file, "rb");
+ fp = claws_fopen(file, "rb");
if (fp) {
debug_print("got %s\n", file);
return NULL;
}
- if ((tmp_x509 = gnutls_d2i_X509_fp(fp, 0)) != NULL) {
+ if ((tmp_x509 = gnutls_import_X509_fp(fp, GNUTLS_X509_FMT_DER)) != NULL) {
cert = ssl_certificate_new(tmp_x509, host, port);
debug_print("got cert %p\n", cert);
gnutls_x509_crt_deinit(tmp_x509);
}
- fclose(fp);
+
+ claws_fclose(fp);
g_free(file);
if (must_rename) {
if ((r = gnutls_x509_crt_export(cert_a->x509_cert, GNUTLS_X509_FMT_DER, NULL, &cert_size_a))
!= GNUTLS_E_SHORT_MEMORY_BUFFER) {
- g_warning("couldn't gnutls_x509_crt_export to get size a %s\n", gnutls_strerror(r));
+ g_warning("couldn't gnutls_x509_crt_export to get size a %s", gnutls_strerror(r));
return FALSE;
}
if ((r = gnutls_x509_crt_export(cert_b->x509_cert, GNUTLS_X509_FMT_DER, NULL, &cert_size_b))
!= GNUTLS_E_SHORT_MEMORY_BUFFER) {
- g_warning("couldn't gnutls_x509_crt_export to get size b %s\n", gnutls_strerror(r));
+ g_warning("couldn't gnutls_x509_crt_export to get size b %s", gnutls_strerror(r));
return FALSE;
}
output_a = g_malloc(cert_size_a);
output_b = g_malloc(cert_size_b);
if ((r = gnutls_x509_crt_export(cert_a->x509_cert, GNUTLS_X509_FMT_DER, output_a, &cert_size_a)) < 0) {
- g_warning("couldn't gnutls_x509_crt_export a %s\n", gnutls_strerror(r));
+ g_warning("couldn't gnutls_x509_crt_export a %s", gnutls_strerror(r));
g_free(output_a);
g_free(output_b);
return FALSE;
}
if ((r = gnutls_x509_crt_export(cert_b->x509_cert, GNUTLS_X509_FMT_DER, output_b, &cert_size_b)) < 0) {
- g_warning("couldn't gnutls_x509_crt_export b %s\n", gnutls_strerror(r));
+ g_warning("couldn't gnutls_x509_crt_export b %s", gnutls_strerror(r));
g_free(output_a);
g_free(output_b);
return FALSE;
}
if (cert_size_a != cert_size_b) {
- g_warning("size differ %zd %zd\n", cert_size_a, cert_size_b);
+ g_warning("size differ %"G_GSIZE_FORMAT" %"G_GSIZE_FORMAT, cert_size_a, cert_size_b);
g_free(output_a);
g_free(output_b);
return FALSE;
}
if (memcmp(output_a, output_b, cert_size_a)) {
- g_warning("contents differ\n");
+ g_warning("contents differ");
g_free(output_a);
g_free(output_b);
return FALSE;
return TRUE;
}
-static guint check_cert(gnutls_x509_crt_t cert)
+static guint check_cert(SSLCertificate *cert)
{
- gnutls_x509_crt_t *ca_list;
- unsigned int max = 512;
+ gnutls_x509_crt_t *ca_list = NULL;
+ gnutls_x509_crt_t *chain = NULL;
+ unsigned int max_ca = 512, max_certs;
unsigned int flags = 0;
int r, i;
unsigned int status;
+ gchar *chain_file = NULL, *buf = NULL;
FILE *fp;
if (claws_ssl_get_cert_file())
- fp = g_fopen(claws_ssl_get_cert_file(), "r");
+ fp = claws_fopen(claws_ssl_get_cert_file(), "r");
else
return (guint)-1;
- if ((r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &ca_list, &max)) < 0) {
- debug_print("cert import failed: %s\n", gnutls_strerror(r));
- fclose(fp);
+ if (fp == NULL)
+ return (guint)-1;
+
+ if ((r = gnutls_import_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &ca_list, &max_ca)) < 0) {
+ debug_print("CA import failed: %s\n", gnutls_strerror(r));
+ claws_fclose(fp);
return (guint)-1;
}
+ claws_fclose(fp);
+ fp = NULL;
+
+ buf = g_strdup_printf("%d", cert->port);
+ chain_file = get_certificate_chain_path(cert->host, buf, cert->fingerprint);
+ g_free(buf);
+ if (is_file_exist(chain_file)) {
+ unsigned char md[128];
+ size_t n = 128;
+ char *fingerprint;
+
+ fp = claws_fopen(chain_file, "r");
+ if (fp == NULL) {
+ debug_print("claws_fopen %s failed: %s\n", chain_file, g_strerror(errno));
+ g_free(chain_file);
+ return (guint)-1;
+ }
+ if ((r = gnutls_import_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &chain, &max_certs)) < 0) {
+ debug_print("chain import failed: %s\n", gnutls_strerror(r));
+ claws_fclose(fp);
+ g_free(chain_file);
+ return (guint)-1;
+ }
+ g_free(chain_file);
+ claws_fclose(fp);
+ fp = NULL;
+
+ gnutls_x509_crt_get_fingerprint(chain[0], GNUTLS_DIG_MD5, md, &n);
+ fingerprint = readable_fingerprint(md, n);
+ if (!fingerprint || strcmp(fingerprint, cert->fingerprint)) {
+ debug_print("saved chain fingerprint does not match current : %s / %s\n",
+ cert->fingerprint, fingerprint);
+
+ return (guint)-1;
+ }
+ g_free(fingerprint);
+
+ r = gnutls_x509_crt_list_verify (chain,
+ max_certs,
+ ca_list, max_ca,
+ NULL, 0,
+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
+ &status);
+ if (r < 0)
+ debug_print("chain check failed: %s\n", gnutls_strerror(r));
- r = gnutls_x509_crt_verify(cert, ca_list, max, flags, &status);
- fclose(fp);
+ for (i = 0; i < max_certs; i++)
+ gnutls_x509_crt_deinit(chain[i]);
+ free(chain);
- for (i = 0; i < max; i++)
+ } else {
+ r = gnutls_x509_crt_verify(cert->x509_cert, ca_list, max_ca, flags, &status);
+ if (r < 0)
+ debug_print("cert check failed: %s\n", gnutls_strerror(r));
+ }
+
+ for (i = 0; i < max_ca; i++)
gnutls_x509_crt_deinit(ca_list[i]);
free(ca_list);
}
-char *ssl_certificate_check_signer (gnutls_x509_crt_t cert, guint status)
+static gboolean ssl_certificate_is_valid(SSLCertificate *cert, guint status)
+{
+ gchar *str_status = ssl_certificate_check_signer(cert, status);
+
+ if (str_status != NULL) {
+ g_free(str_status);
+ return FALSE;
+ }
+ return ssl_certificate_check_subject_cn(cert);
+}
+
+char *ssl_certificate_check_signer (SSLCertificate *cert, guint status)
{
+ gnutls_x509_crt_t x509_cert = cert ? cert->x509_cert : NULL;
+
+ if (!cert)
+ return g_strdup(_("Internal error"));
+
if (status == (guint)-1) {
status = check_cert(cert);
if (status == -1)
return g_strdup(_("Uncheckable"));
}
if (status & GNUTLS_CERT_INVALID) {
- if (gnutls_x509_crt_check_issuer(cert, cert))
+ if (gnutls_x509_crt_check_issuer(x509_cert, x509_cert))
return g_strdup(_("Self-signed certificate"));
}
if (status & GNUTLS_CERT_REVOKED)
return NULL;
}
-gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status, const gchar *host, gushort port)
+static void ssl_certificate_save_chain(gnutls_x509_crt_t *certs, gint len, const gchar *host, gushort port)
+{
+ gint i;
+ gchar *file = NULL;
+ FILE *fp = NULL;
+
+ for (i = 0; i < len; i++) {
+ size_t n;
+ unsigned char md[128];
+ gnutls_x509_crt_t cert = certs[i];
+
+ if (i == 0) {
+ n = sizeof(md);
+ gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_MD5, md, &n);
+ gchar *fingerprint = readable_fingerprint(md, n);
+ gchar *buf = g_strdup_printf("%d", port);
+
+ file = get_certificate_chain_path(host, buf, fingerprint);
+ g_free(fingerprint);
+
+ g_free(buf);
+
+ fp = claws_fopen(file, "wb");
+ if (fp == NULL) {
+ g_free(file);
+ debug_print("Can't save certificate !\n");
+ return;
+ }
+ g_free(file);
+ }
+
+ gnutls_export_X509_fp(fp, cert, GNUTLS_X509_FMT_PEM);
+
+ }
+ if (fp)
+ claws_safe_fclose(fp);
+}
+
+gboolean ssl_certificate_check (gnutls_x509_crt_t x509_cert, guint status,
+ const gchar *host, gushort port,
+ gboolean accept_if_valid)
{
SSLCertificate *current_cert = NULL;
SSLCertificate *known_cert;
SSLCertHookData cert_hook_data;
gchar *fingerprint;
size_t n;
- unsigned char md[128];
+ unsigned char md[128];
+ gboolean valid = FALSE;
current_cert = ssl_certificate_new(x509_cert, host, port);
-
+
if (current_cert == NULL) {
debug_print("Buggy certificate !\n");
return FALSE;
current_cert->status = status;
/* fingerprint */
- n = 128;
+ n = sizeof(md);
gnutls_x509_crt_get_fingerprint(x509_cert, GNUTLS_DIG_MD5, md, &n);
fingerprint = readable_fingerprint(md, n);
g_free(fingerprint);
+ if (accept_if_valid)
+ valid = ssl_certificate_is_valid(current_cert, status);
+ else
+ valid = FALSE; /* Force check */
+
if (known_cert == NULL) {
+ if (valid) {
+ ssl_certificate_save(current_cert);
+ ssl_certificate_destroy(current_cert);
+ return TRUE;
+ }
+
cert_hook_data.cert = current_cert;
cert_hook_data.old_cert = NULL;
cert_hook_data.expired = FALSE;
cert_hook_data.accept = FALSE;
-
+
hooks_invoke(SSLCERT_ASK_HOOKLIST, &cert_hook_data);
-
+
if (!cert_hook_data.accept) {
ssl_certificate_destroy(current_cert);
return FALSE;
return TRUE;
}
} else if (!ssl_certificate_compare (current_cert, known_cert)) {
+ if (valid) {
+ ssl_certificate_save(current_cert);
+ ssl_certificate_destroy(current_cert);
+ ssl_certificate_destroy(known_cert);
+ return TRUE;
+ }
+
cert_hook_data.cert = current_cert;
cert_hook_data.old_cert = known_cert;
cert_hook_data.expired = FALSE;
cert_hook_data.accept = FALSE;
-
+
hooks_invoke(SSLCERT_ASK_HOOKLIST, &cert_hook_data);
if (!cert_hook_data.accept) {
}
} else if (gnutls_x509_crt_get_expiration_time(current_cert->x509_cert) < time(NULL)) {
gchar *tmp = g_strdup_printf("%s:%d", current_cert->host, current_cert->port);
-
+
if (warned_expired == NULL)
warned_expired = g_hash_table_new(g_str_hash, g_str_equal);
-
+
if (g_hash_table_lookup(warned_expired, tmp)) {
g_free(tmp);
ssl_certificate_destroy(current_cert);
ssl_certificate_destroy(known_cert);
return TRUE;
}
-
+
cert_hook_data.cert = current_cert;
cert_hook_data.old_cert = NULL;
cert_hook_data.expired = TRUE;
cert_hook_data.accept = FALSE;
-
+
hooks_invoke(SSLCERT_ASK_HOOKLIST, &cert_hook_data);
if (!cert_hook_data.accept) {
return TRUE;
}
-gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len, const gchar *host, gushort port)
+gboolean ssl_certificate_check_chain(gnutls_x509_crt_t *certs, gint chain_len,
+ const gchar *host, gushort port,
+ gboolean accept_if_valid)
{
- int ncas = 0, ncrls = 0;
+ int ncas = 0;
gnutls_x509_crt_t *cas = NULL;
- gnutls_x509_crl_t *crls = NULL;
gboolean result = FALSE;
int i;
gint status;
if (claws_ssl_get_cert_file()) {
- FILE *fp = g_fopen(claws_ssl_get_cert_file(), "rb");
+ FILE *fp = claws_fopen(claws_ssl_get_cert_file(), "rb");
int r = -errno;
if (fp) {
- r = gnutls_d2i_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &cas, &ncas);
- fclose(fp);
+ r = gnutls_import_X509_list_fp(fp, GNUTLS_X509_FMT_PEM, &cas, &ncas);
+ claws_fclose(fp);
}
if (r < 0)
- g_warning("Can't read SSL_CERT_FILE %s: %s\n",
+ g_warning("Can't read SSL_CERT_FILE '%s': %s",
claws_ssl_get_cert_file(),
gnutls_strerror(r));
} else {
GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
&status);
- result = ssl_certificate_check(certs[0], status, host, port);
+ result = ssl_certificate_check(certs[0], status, host, port,
+ accept_if_valid);
+
+ if (result == TRUE) {
+ ssl_certificate_save_chain(certs, chain_len, host, port);
+ }
for (i = 0; i < ncas; i++)
gnutls_x509_crt_deinit(cas[i]);
return NULL;
if (is_file_exist(file)) {
- FILE *fp = g_fopen(file, "r");
+ FILE *fp = claws_fopen(file, "r");
if (fp) {
- x509 = gnutls_d2i_X509_fp(fp, 1);
- fclose(fp);
+ x509 = gnutls_import_X509_fp(fp, GNUTLS_X509_FMT_PEM);
+ claws_fclose(fp);
return x509;
} else {
log_error(LOG_PROTOCOL, _("Cannot open certificate file %s: %s\n"),
- file, strerror(errno));
+ file, g_strerror(errno));
}
} else {
log_error(LOG_PROTOCOL, _("Certificate file %s missing (%s)\n"),
- file, strerror(errno));
+ file, g_strerror(errno));
}
return NULL;
}
return NULL;
if (is_file_exist(file)) {
- FILE *fp = g_fopen(file, "r");
+ FILE *fp = claws_fopen(file, "r");
if (fp) {
- key = gnutls_d2i_key_fp(fp, 1);
- fclose(fp);
+ key = gnutls_import_key_fp(fp, GNUTLS_X509_FMT_PEM);
+ claws_fclose(fp);
return key;
} else {
log_error(LOG_PROTOCOL, _("Cannot open key file %s (%s)\n"),
- file, strerror(errno));
+ file, g_strerror(errno));
}
} else {
log_error(LOG_PROTOCOL, _("Key file %s missing (%s)\n"), file,
- strerror(errno));
+ g_strerror(errno));
}
return NULL;
}
return;
if (is_file_exist(file)) {
- FILE *fp = g_fopen(file, "r");
+ FILE *fp = claws_fopen(file, "r");
if (fp) {
- p12 = gnutls_d2i_PKCS12_fp(fp, 0);
- fclose(fp);
+ p12 = gnutls_import_PKCS12_fp(fp, GNUTLS_X509_FMT_DER);
+ claws_fclose(fp);
if (!p12) {
log_error(LOG_PROTOCOL, _("Failed to read P12 certificate file %s\n"), file);
}
} else {
log_error(LOG_PROTOCOL, _("Cannot open P12 certificate file %s (%s)\n"),
- file, strerror(errno));
+ file, g_strerror(errno));
}
} else {
log_error(LOG_PROTOCOL, _("P12 Certificate file %s missing (%s)\n"), file,
- strerror(errno));
+ g_strerror(errno));
}
if (p12 != NULL) {
if ((r = parse_pkcs12(p12, password, pkey, x509)) == 0) {
if(gnutls_x509_crt_get_dn_by_oid(cert->x509_cert,
GNUTLS_OID_X520_COMMON_NAME, 0, 0, subject_cn, &n))
- strncpy(subject_cn, _("<not in certificate>"), BUFFSIZE);
+ return g_strdup(_("<not in certificate>"));
return g_strdup(subject_cn);
}
projects / claws.git / blobdiff