proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 07:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a critical warning when loading a PKCS-7 certificate with no DN

Browse Source
This commit is contained in:
Richard Hughes 2019-03-07 15:32:37 +00:00
parent 06ef7f7e46
commit 6bc7098640
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fu-keyring-pkcs7.c
View File

@ -172,6 +172,7 @@ fu_keyring_pkcs7_datum_to_dn_str (const gnutls_datum_t *raw)
if (rc < 0) if (rc < 0)
return NULL; return NULL;
str = (gnutls_datum_t *) gnutls_malloc (sizeof (gnutls_datum_t)); str = (gnutls_datum_t *) gnutls_malloc (sizeof (gnutls_datum_t));
str->data = NULL;
rc = gnutls_x509_dn_get_str2 (dn, str, 0); rc = gnutls_x509_dn_get_str2 (dn, str, 0);
if (rc < 0) if (rc < 0)
return NULL; return NULL;
@ -185,7 +186,7 @@ fu_keyring_pkcs7_verify_data (FuKeyring *keyring,
GError **error) GError **error)
{ {
FuKeyringPkcs7 *self = FU_KEYRING_PKCS7 (keyring); FuKeyringPkcs7 *self = FU_KEYRING_PKCS7 (keyring);
gnutls_datum_t datum; gnutls_datum_t datum = { 0 };
gint64 timestamp_newest = 0; gint64 timestamp_newest = 0;
int count; int count;
int rc; int rc;
@ -263,7 +264,8 @@ fu_keyring_pkcs7_verify_data (FuKeyring *keyring,
g_autofree gchar *dn = NULL; g_autofree gchar *dn = NULL;
timestamp_newest = signing_time; timestamp_newest = signing_time;
dn = fu_keyring_pkcs7_datum_to_dn_str (&info.issuer_dn); dn = fu_keyring_pkcs7_datum_to_dn_str (&info.issuer_dn);
g_string_assign (authority_newest, dn); if (dn != NULL)
g_string_assign (authority_newest, dn);
} }
gnutls_pkcs7_signature_info_deinit (&info); gnutls_pkcs7_signature_info_deinit (&info);
} }