PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-26 22:32:07 +01:00
Code Issues Releases Wiki Activity

KeyAccessor.ViaKeyId: Differentiate between primary key (direct-key sig) and subkey

Browse source
This commit is contained in:
Paul Schaub 2021-11-27 16:03:32 +01:00
parent b44a97760a
commit c7dc7f755c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyAccessor.java
View file

@ -110,7 +110,13 @@ public abstract class KeyAccessor {
@Override @Override
public @Nonnull PGPSignature getSignatureWithPreferences() { public @Nonnull PGPSignature getSignatureWithPreferences() {
PGPSignature signature = info.getLatestDirectKeySelfSignature(); PGPSignature signature;
if (key.getPrimaryKeyId() != key.getSubkeyId()) {
signature = info.getCurrentSubkeyBindingSignature(key.getSubkeyId());
} else {
signature = info.getLatestDirectKeySelfSignature();
}
if (signature != null) { if (signature != null) {
return signature; return signature;
} }