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

Fixing an issue where a secret subkey wasn't being used to decrypt #188

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixing an issue where a secret subkey wasn't being used to decrypt #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ObjectivePGP/PGPPartialKey.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ - (nullable PGPSecretKeyPacket *)decryptionPacketForKeyID:(PGPKeyID *)keyID erro
}

for (PGPPartialSubKey *subKey in self.subKeys) {
let signaturePacket = subKey.bindingSignature;
if (signaturePacket.canBeUsedToEncrypt && PGPEqualObjects(PGPCast(subKey.primaryKeyPacket, PGPSecretKeyPacket).keyID, keyID)) {
//Assume the primary key packet is always capable if if its a secret key packet
if (PGPEqualObjects(PGPCast(subKey.primaryKeyPacket, PGPSecretKeyPacket).keyID, keyID)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this is correct.
This makes always use the first subkey. What if there's multiple subkeys, ale there's one that is valid, and it's not the first from the list?

return PGPCast(subKey.primaryKeyPacket, PGPSecretKeyPacket);
}
}
Expand Down