Add Key Fingerprints to rpmsinfoMsg()

ffesti · Sep 20, 2024 · 3f239a8 · 3f239a8
1 parent f585dcb
commit 3f239a8
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/lib/rpmvs.c b/lib/rpmvs.c
@@ -306,13 +306,30 @@ const char *rpmsinfoDescr(struct rpmsinfo_s *sinfo)
 char *rpmsinfoMsg(struct rpmsinfo_s *sinfo)
 {
     char *msg = NULL;
+    char *fphex = NULL;
+    char *fpmsg = NULL;
+    if (sinfo->rc == RPMRC_OK && sinfo->key) {
+	uint8_t *fp;
+	size_t fplen;
+	if (!rpmPubkeyFingerPrint(sinfo->key, &fp, &fplen)) {
+	    fphex = rpmhex(fp, fplen);
+	    free(fp);
+	}
+    }
+    if (fphex)
+	rasprintf(&fpmsg, _(", Key Fingerprint: %s"), fphex);
+    else
+	rstrcat(&fpmsg, "");
+
     if (sinfo->msg) {
-	rasprintf(&msg, "%s: %s (%s)",
-		rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc), sinfo->msg);
+	rasprintf(&msg, "%s: %s%s (%s)",
+	    rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc), fpmsg, sinfo->msg);
     } else {
-	rasprintf(&msg, "%s: %s",
-		rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc));
+	rasprintf(&msg, "%s: %s%s",
+		  rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc), fpmsg);
     }
+    free(fphex);
+    free(fpmsg);
     return msg;
 }