Add rpmKeyringVerifySig2 that return the matching key

Add the key to rpmsinfo_s so we have the key available with the verified signature and can print the key's finger print when desired
ffesti · Sep 23, 2024 · 760f81e · 760f81e
1 parent bbc00e4
commit 760f81e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/include/rpm/rpmkeyring.h b/include/rpm/rpmkeyring.h
@@ -56,6 +56,16 @@ int rpmKeyringAddKey(rpmKeyring keyring, rpmPubkey key);
  */
 rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx);
 
+/** \ingroup rpmkeyring
+ * Perform combined keyring lookup and signature verification
+ * @param keyring	keyring handle
+ * @param sig		OpenPGP signature parameters
+ * @param ctx		signature hash context
+ * @param keyptr	matching key
+ * @return		RPMRC_OK / RPMRC_FAIL / RPMRC_NOKEY
+ */
+rpmRC rpmKeyringVerifySig2(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx,  rpmPubkey * keyptr);
+
 /** \ingroup rpmkeyring
  * Reference a keyring.
  * @param keyring	keyring handle

diff --git a/lib/rpmvs.c b/lib/rpmvs.c
@@ -144,6 +144,7 @@ static void rpmsinfoInit(const struct vfyinfo_s *vinfo,
     *sinfo = vinfo->vi; /* struct assignment */
     sinfo->wrapped = (vinfo->sigh == 0);
     sinfo->strength = sinfo->type;
+    sinfo->key = NULL;
 
     if (td == NULL) {
 	rc = RPMRC_NOTFOUND;
@@ -591,9 +592,11 @@ static rpmRC
 verifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo)
 {
     rpmRC res = RPMRC_FAIL;
-    if (pgpSignatureType(sinfo->sig) == PGPSIGTYPE_BINARY)
-	res = rpmKeyringVerifySig(keyring, sinfo->sig, sinfo->ctx);
-
+    if (pgpSignatureType(sinfo->sig) == PGPSIGTYPE_BINARY) {
+	rpmPubkey key;
+	res = rpmKeyringVerifySig2(keyring, sinfo->sig, sinfo->ctx, &key);
+	sinfo->key = key;
+    }
     return res;
 }
 

diff --git a/lib/rpmvs.h b/lib/rpmvs.h
@@ -23,6 +23,7 @@ struct rpmsinfo_s {
     int id;
     int wrapped;
     int strength;
+    rpmPubkey key;
     unsigned int keyid;
     union {
 	pgpDigParams sig;

diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
@@ -298,7 +298,7 @@ static rpmPubkey findbySig(rpmKeyring keyring, pgpDigParams sig)
     return key;
 }
 
-rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx)
+rpmRC rpmKeyringVerifySig2(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx, rpmPubkey * keyptr)
 {
     rpmRC rc = RPMRC_FAIL;
 
@@ -319,10 +319,16 @@ rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx)
 	    rpmlog(rc ? RPMLOG_ERR : RPMLOG_WARNING, "%s\n", lints);
 	    free(lints);
 	}
-    }
-
-    if (keyring)
+	if (keyptr)
+	    *keyptr = key;
+   }
+     if (keyring)
 	pthread_rwlock_unlock(&keyring->lock);
 
     return rc;
 }
+
+rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx)
+{
+    return rpmKeyringVerifySig2(keyring, sig, ctx, NULL);
+}