devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 06:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save trusted certificates to tlscerts file with more information

Browse Source
This commit is contained in:
James Booth
2015-09-24 00:18:18 +01:00
parent 40ce5cb0e0
commit d96e68ea53
8 changed files with 264 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/event/server_events.c
View File

@@ -44,6 +44,7 @@
#include "config/account.h"
#include "roster_list.h"
#include "window_list.h"
#include "config/tlscerts.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
@@ -643,12 +644,9 @@ int
sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
const char * const notbefore, const char * const notafter)
{
GList *trusted = prefs_get_trusted_certs();
if (g_list_find_custom(trusted, certfp, (GCompareFunc)g_strcmp0)) {
prefs_free_trusted_certs(trusted);
if (tlscerts_exists(certfp)) {
return 1;
}
prefs_free_trusted_certs(trusted);
char *domain = NULL;
char *org = NULL;
@@ -676,15 +674,12 @@ sv_ev_certfail(const char * const errormsg, const char * const certname, const c
cons_show_error("TLS certificate verification failed: %s", errormsg);
if (domain) {
cons_show(" Domain : %s", domain);
free(domain);
}
if (org) {
cons_show(" Organisation : %s", org);
free(org);
}
if (email) {
cons_show(" Email : %s", email);
free(email);
}
cons_show(" Fingerprint : %s", certfp);
cons_show(" Start : %s", notbefore);
@@ -712,13 +707,26 @@ sv_ev_certfail(const char * const errormsg, const char * const certname, const c
if (g_strcmp0(cmd, "/tls allow") == 0) {
free(cmd);
free(domain);
free(org);
free(email);
return 1;
} else if (g_strcmp0(cmd, "/tls always") == 0) {
prefs_add_trusted_cert(certfp);
if (!tlscerts_exists(certfp)) {
TLSCertificate *cert = tlscerts_new(certfp, domain, org, email, notbefore, notafter);
tlscerts_add(cert);
tlscerts_free(cert);
}
free(cmd);
free(domain);
free(org);
free(email);
return 1;
} else {
free(cmd);
free(domain);
free(org);
free(email);
return 0;
}
}

1
src/event/server_events.h
View File

@@ -89,5 +89,4 @@ void sv_ev_roster_received(void);
int sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp,
const char * const notbefore, const char * const notafter);
#endif