PoC 1

dmnks · dmnks · commit 63b3fe2cae1d · 2025-10-10T10:33:22.000+02:00
diff --git a/lib/keystore.cc b/lib/keystore.cc
@@ -350,7 +350,11 @@ rpmRC keystore_rpmdb::delete_key(rpmtxn txn, const string & keyid, unsigned int
 
 rpmRC keystore_rpmdb::delete_key(rpmtxn txn, rpmPubkey key)
 {
-    return delete_key(txn, rpmPubkeyFingerprintAsHex(key));
+    rpmRC rc = RPMRC_FAIL;
+    rc = delete_key(txn, rpmPubkeyFingerprintAsHex(key));
+    if (rc == RPMRC_NOTFOUND)
+	rc = delete_key(txn, rpmPubkeyKeyIDAsHex(key)+8);
+    return rc;
 }
 
 rpmRC keystore_rpmdb::delete_store(rpmtxn txn)

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,11 @@ rpmRC keystore_rpmdb::delete_key(rpmtxn txn, const string & keyid, unsigned int`
`350`	`350`
`351`	`351`	`rpmRC keystore_rpmdb::delete_key(rpmtxn txn, rpmPubkey key)`
`352`	`352`	`{`
`353`		`- return delete_key(txn, rpmPubkeyFingerprintAsHex(key));`
	`353`	`+ rpmRC rc = RPMRC_FAIL;`
	`354`	`+ rc = delete_key(txn, rpmPubkeyFingerprintAsHex(key));`
	`355`	`+ if (rc == RPMRC_NOTFOUND)`
	`356`	`+ rc = delete_key(txn, rpmPubkeyKeyIDAsHex(key)+8);`
	`357`	`+ return rc;`
`354`	`358`	`}`
`355`	`359`
`356`	`360`	`rpmRC keystore_rpmdb::delete_store(rpmtxn txn)`