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

Fix NPEs in KeyRingInfo.getExpirationDateForUse()

Browse source
This commit is contained in:
Paul Schaub 2021-06-24 15:07:41 +02:00
parent 09ba0c954d
commit a6e5ca898f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
View file

@ -660,12 +660,16 @@ public class KeyRingInfo {
} }
if (nonExpiringSubkeys.isEmpty()) { if (nonExpiringSubkeys.isEmpty()) {
if (latestSubkeyExpirationDate.before(primaryExpiration)) { if (latestSubkeyExpirationDate != null) {
return latestSubkeyExpirationDate; if (primaryExpiration == null) {
return latestSubkeyExpirationDate;
}
if (latestSubkeyExpirationDate.before(primaryExpiration)) {
return latestSubkeyExpirationDate;
}
} }
return primaryExpiration;
} }
return null; return primaryExpiration;
} }
/** /**