Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement merging of new key material when importing pubkeys #3083

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Implement merging of new key material when importing pubkeys #3083

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4621abc
Fix error handling in rpmtsImportPubkey
mlschroe May 7, 2024
0872648
Make subkeys available right away when a pubkey is imported
mlschroe May 7, 2024
5926604
Split subkey initialization into its own function
mlschroe May 7, 2024
2292bb2
Add rpmKeyringModify to change the keys of a keyring
mlschroe May 7, 2024
8ac10de
Add a method to lookup a key from the keyring
mlschroe May 7, 2024
885a3ab
Support pubkey merging in the keyring code
mlschroe May 7, 2024
028d84b
Merge keys and update the database in rpmtsImportPubkey()
mlschroe May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Make subkeys available right away when a pubkey is imported 
This is useful for API users that do not re-read the keys
from the database.
  • Loading branch information
@mlschroe
mlschroe committed May 8, 2024
commit 0872648ba02180f708fe56e85ae554deeea4fbd6
2 changes: 2 additions & 0 deletions lib/rpmts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,8 @@ rpmRC rpmtsImportPubkey(const rpmts ts, const unsigned char * pkt, size_t pktlen
krc = rpmKeyringAddKey(keyring, pubkey);
if (krc < 0)
goto exit;
for (i = 0; i < subkeysCount; i++)
rpmKeyringAddKey(keyring, subkeys[i]);

/* If we dont already have the key, make a persistent record of it */
if (krc == 0) {
Expand Down