From 2091fc106cb983f64b79cfe36898eb23fda138df Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@protonmail.com>
Date: Sat, 27 Apr 2019 07:22:10 +0200
Subject: [PATCH] Use new KeyExpired function

---
 crypto/key.go     | 4 ++--
 crypto/keyring.go | 2 +-
 crypto/message.go | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/key.go b/crypto/key.go
index 1a965fa..d844b14 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -320,7 +320,7 @@ func (pm *PmCrypto) IsKeyExpiredBin(publicKey []byte) (bool, error) {
 			if subkey.Sig.FlagsValid &&
 				subkey.Sig.FlagEncryptCommunications &&
 				subkey.PublicKey.PubKeyAlgo.CanEncrypt() &&
-				!subkey.Sig.KeyExpired(now) &&
+				!subkey.PublicKey.KeyExpired(subkey.Sig, now) &&
 				(maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) {
 				candidateSubkey = i
 				maxTime = subkey.Sig.CreationTime
@@ -349,7 +349,7 @@ func (pm *PmCrypto) IsKeyExpiredBin(publicKey []byte) (bool, error) {
 			i := firstIdentity
 			if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications &&
 				e.PrimaryKey.PubKeyAlgo.CanEncrypt() &&
-				!i.SelfSignature.KeyExpired(now) {
+				!e.PrimaryKey.KeyExpired(i.SelfSignature, now) {
 				return false, nil
 			}
 		}
diff --git a/crypto/keyring.go b/crypto/keyring.go
index 82c8c8a..18f75fb 100644
--- a/crypto/keyring.go
+++ b/crypto/keyring.go
@@ -639,7 +639,7 @@ func FilterExpiredKeys(contactKeys []*KeyRing) (filteredKeys []*KeyRing, err err
 			hasExpired := false
 			hasUnexpired := false
 			for _, subkey := range entity.Subkeys {
-				if subkey.Sig.KeyExpired(now) {
+				if subkey.PublicKey.KeyExpired(subkey.Sig, now) {
 					hasExpired = true
 				} else {
 					hasUnexpired = true
diff --git a/crypto/message.go b/crypto/message.go
index 3fce8ca..d86d958 100644
--- a/crypto/message.go
+++ b/crypto/message.go
@@ -140,8 +140,8 @@ func processSignatureExpiration(md *openpgp.MessageDetails, verifyTime int64) {
 		if verifyTime > 0 {
 			created := md.Signature.CreationTime.Unix()
 			expires := int64(math.MaxInt64)
-			if md.Signature.KeyLifetimeSecs != nil {
-				expires = int64(*md.Signature.KeyLifetimeSecs) + created
+			if md.Signature.SigLifetimeSecs != nil {
+				expires = int64(*md.Signature.SigLifetimeSecs) + created
 			}
 			if created-internal.CreationTimeOffset <= verifyTime && verifyTime <= expires {
 				md.SignatureError = nil