45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From cf1ececd9378fc14125c929833043f26e8f3486d Mon Sep 17 00:00:00 2001
|
|
From: Michal Srb <michal@redhat.com>
|
|
Date: Thu, 4 Dec 2025 21:14:52 +0100
|
|
Subject: [PATCH] Revert "Use rpmPubkeyKeyIDAsHex() to obtain the gpg key in
|
|
hex format"
|
|
|
|
This reverts commit 0158baaaba86b2c37b03922c2875a666ecc9b687.
|
|
---
|
|
src/daemon/rpm.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
|
|
index 1b745f70..524dc749 100644
|
|
--- a/src/daemon/rpm.c
|
|
+++ b/src/daemon/rpm.c
|
|
@@ -90,7 +90,7 @@ void rpm_destroy()
|
|
rpmFreeRpmrc();
|
|
#endif
|
|
|
|
- g_list_free_full(g_steal_pointer(&list_fingerprints), g_free);
|
|
+ g_list_free_full(g_steal_pointer(&list_fingerprints), free);
|
|
}
|
|
|
|
|
|
@@ -113,7 +113,7 @@ void rpm_load_gpgkey(const char* filename)
|
|
pubkey = rpmPubkeyNew(pkt, pklen);
|
|
if (pubkey != NULL)
|
|
{
|
|
- fingerprint = g_strdup(rpmPubkeyKeyIDAsHex(pubkey));
|
|
+ fingerprint = rpmhex(pubkey->keyid, sizeof(pubkey->keyid));
|
|
if (fingerprint != NULL)
|
|
list_fingerprints = g_list_append(list_fingerprints, fingerprint);
|
|
|
|
@@ -123,7 +123,7 @@ void rpm_load_gpgkey(const char* filename)
|
|
rpmPubkey subkey = subkeys[i];
|
|
if (subkey != NULL)
|
|
{
|
|
- fingerprint = g_strdup(rpmPubkeyKeyIDAsHex(subkey));
|
|
+ fingerprint = rpmhex(subkey->keyid, sizeof(subkey->keyid));
|
|
if (fingerprint != NULL)
|
|
list_fingerprints = g_list_append(list_fingerprints, fingerprint);
|
|
}
|
|
--
|
|
2.52.0
|
|
|