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

Use the stronger certificate fingerprint.

Browse Source 
If a cert has a SHA256 use that one and only use SHA1 as fallback.

Closes: https://github.com/profanity-im/profanity/issues/2068
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-11-04 17:46:48 +01:00
parent 0acea8d0d2
commit a07cff8a99
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/config/tlscerts.c
View File

@@ -95,13 +95,13 @@ tlscerts_set_current(const TLSCertificate* cert)
if (current_fp) {
free(current_fp);
}
current_fp = strdup(cert->fingerprint_sha1);
current_fp = strdup(cert->fingerprint);
}
gboolean
tlscerts_current_fingerprint_equals(const TLSCertificate* cert)
{
return g_strcmp0(current_fp, cert->fingerprint_sha1) == 0;
return g_strcmp0(current_fp, cert->fingerprint) == 0;
}
void
@@ -116,7 +116,7 @@ tlscerts_clear_current(void)
gboolean
tlscerts_exists(const TLSCertificate* cert)
{
return g_key_file_has_group(tlscerts, cert->fingerprint_sha1);
return g_key_file_has_group(tlscerts, cert->fingerprint);
}
GList*
@@ -154,11 +154,15 @@ tlscerts_new(const char* fingerprint_sha1, int version, const char* serialnumber
{
TLSCertificate* cert = calloc(1, sizeof(TLSCertificate));
if (fingerprint_sha1) {
cert->fingerprint_sha1 = strdup(fingerprint_sha1);
}
if (fingerprint_sha256) {
cert->fingerprint_sha256 = strdup(fingerprint_sha256);
cert->fingerprint = cert->fingerprint_sha256;
}
if (fingerprint_sha1) {
cert->fingerprint_sha1 = strdup(fingerprint_sha1);
if (!cert->fingerprint) {
cert->fingerprint = cert->fingerprint_sha1;
}
}
cert->version = version;
if (serialnumber) {
@@ -261,33 +265,33 @@ tlscerts_add(const TLSCertificate* cert)
return;
}
if (!cert->fingerprint_sha1) {
if (!cert->fingerprint) {
return;
}
autocomplete_add(certs_ac, cert->fingerprint_sha1);
autocomplete_add(certs_ac, cert->fingerprint);
g_key_file_set_integer(tlscerts, cert->fingerprint_sha1, "version", cert->version);
g_key_file_set_integer(tlscerts, cert->fingerprint, "version", cert->version);
if (cert->serialnumber) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "serialnumber", cert->serialnumber);
g_key_file_set_string(tlscerts, cert->fingerprint, "serialnumber", cert->serialnumber);
}
if (cert->subjectname) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "subjectname", cert->subjectname);
g_key_file_set_string(tlscerts, cert->fingerprint, "subjectname", cert->subjectname);
}
if (cert->issuername) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "issuername", cert->issuername);
g_key_file_set_string(tlscerts, cert->fingerprint, "issuername", cert->issuername);
}
if (cert->notbefore) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "start", cert->notbefore);
g_key_file_set_string(tlscerts, cert->fingerprint, "start", cert->notbefore);
}
if (cert->notafter) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "end", cert->notafter);
g_key_file_set_string(tlscerts, cert->fingerprint, "end", cert->notafter);
}
if (cert->key_alg) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "keyalg", cert->key_alg);
g_key_file_set_string(tlscerts, cert->fingerprint, "keyalg", cert->key_alg);
}
if (cert->signature_alg) {
g_key_file_set_string(tlscerts, cert->fingerprint_sha1, "signaturealg", cert->signature_alg);
g_key_file_set_string(tlscerts, cert->fingerprint, "signaturealg", cert->signature_alg);
}
_save_tlscerts();