diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java index 635e5ae4..6671dcb9 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java @@ -215,7 +215,11 @@ public class KeyRingInfo { * @return expiration date */ public Date getExpirationDate() { - long validSeconds = getPublicKey().getValidSeconds(); + return getExpirationDate(new OpenPgpV4Fingerprint(getPublicKey())); + } + + public Date getExpirationDate(OpenPgpV4Fingerprint fingerprint) { + long validSeconds = keys.getPublicKey(fingerprint.getKeyId()).getValidSeconds(); if (validSeconds == 0) { return null; }