Avoid short-circuit return when hashed subpackets absent
@@ -301,9 +301,11 @@ private long getExpirationTimeFromSig(
if (!selfSigned || sig.getKeyID() == this.getKeyID())
{
PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets();
-
- if (hashed != null)
+ if (hashed == null)
{
+ continue;
+ }
+
long current = hashed.getKeyExpirationTime();
if (sig.getKeyID() == this.getKeyID())
@@ -322,11 +324,6 @@ private long getExpirationTimeFromSig(
}
}
}
- else
- {
- return 0;
- }
- }
}
return expiryTime;
