PGPainless/pgpainless
PGPainless
/
pgpainless
mirror of https://github.com/pgpainless/pgpainless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix KeyAccessor.ViaKeyId sourcing primary user-id signature

This commit is contained in:
Paul Schaub 2022-01-15 00:59:01 +01:00
parent e177dafd60
commit b58bdf8ff1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyAccessor.java
View File

@ -110,18 +110,13 @@ public abstract class KeyAccessor {
@Override @Override
public @Nonnull PGPSignature getSignatureWithPreferences() { public @Nonnull PGPSignature getSignatureWithPreferences() {
PGPSignature signature; String primaryUserId = info.getPrimaryUserId();
if (key.getPrimaryKeyId() != key.getSubkeyId()) { // If the key is located by Key ID, the algorithm of the primary User ID of the key provides the
signature = info.getCurrentSubkeyBindingSignature(key.getSubkeyId()); // preferred symmetric algorithm.
} else { PGPSignature signature = info.getLatestUserIdCertification(primaryUserId);
if (signature == null) {
signature = info.getLatestDirectKeySelfSignature(); signature = info.getLatestDirectKeySelfSignature();
} }
if (signature != null) {
return signature;
}
signature = info.getLatestUserIdCertification(info.getPrimaryUserId());
if (signature == null) { if (signature == null) {
throw new IllegalStateException("No valid signature found."); throw new IllegalStateException("No valid signature found.");
} }