From bf8e29caa43d6b4ff0242cc25e096e73b5d4e88c Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 18 Jan 2021 17:09:34 +0100 Subject: [PATCH] Add KeyRingInfo.getExpirationDate(fingerprint) to get subkey exp dates --- .../src/main/java/org/pgpainless/key/info/KeyRingInfo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; }