lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new KeyExpired function

Browse source
This commit is contained in:
Daniel Huigens 2019-04-27 07:22:10 +02:00
parent ea2fcb9438
commit 2091fc106c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crypto/key.go
View file

@ -320,7 +320,7 @@ func (pm *PmCrypto) IsKeyExpiredBin(publicKey []byte) (bool, error) {
if subkey.Sig.FlagsValid && if subkey.Sig.FlagsValid &&
subkey.Sig.FlagEncryptCommunications && subkey.Sig.FlagEncryptCommunications &&
subkey.PublicKey.PubKeyAlgo.CanEncrypt() && subkey.PublicKey.PubKeyAlgo.CanEncrypt() &&
!subkey.Sig.KeyExpired(now) && !subkey.PublicKey.KeyExpired(subkey.Sig, now) &&
(maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) { (maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) {
candidateSubkey = i candidateSubkey = i
maxTime = subkey.Sig.CreationTime maxTime = subkey.Sig.CreationTime
@ -349,7 +349,7 @@ func (pm *PmCrypto) IsKeyExpiredBin(publicKey []byte) (bool, error) {
i := firstIdentity i := firstIdentity
if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications && if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications &&
e.PrimaryKey.PubKeyAlgo.CanEncrypt() && e.PrimaryKey.PubKeyAlgo.CanEncrypt() &&
!i.SelfSignature.KeyExpired(now) { !e.PrimaryKey.KeyExpired(i.SelfSignature, now) {
return false, nil return false, nil
} }
} }

2
crypto/keyring.go
View file

@ -639,7 +639,7 @@ func FilterExpiredKeys(contactKeys []*KeyRing) (filteredKeys []*KeyRing, err err
hasExpired := false hasExpired := false
hasUnexpired := false hasUnexpired := false
for _, subkey := range entity.Subkeys { for _, subkey := range entity.Subkeys {
if subkey.Sig.KeyExpired(now) { if subkey.PublicKey.KeyExpired(subkey.Sig, now) {
hasExpired = true hasExpired = true
} else { } else {
hasUnexpired = true hasUnexpired = true

4
crypto/message.go
View file

@ -140,8 +140,8 @@ func processSignatureExpiration(md *openpgp.MessageDetails, verifyTime int64) {
if verifyTime > 0 { if verifyTime > 0 {
created := md.Signature.CreationTime.Unix() created := md.Signature.CreationTime.Unix()
expires := int64(math.MaxInt64) expires := int64(math.MaxInt64)
if md.Signature.KeyLifetimeSecs != nil { if md.Signature.SigLifetimeSecs != nil {
expires = int64(*md.Signature.KeyLifetimeSecs) + created expires = int64(*md.Signature.SigLifetimeSecs) + created
} }
if created-internal.CreationTimeOffset <= verifyTime && verifyTime <= expires { if created-internal.CreationTimeOffset <= verifyTime && verifyTime <= expires {
md.SignatureError = nil md.SignatureError = nil