fix expire of gpg relative to key creation https://tools.ietf.org/html/rfc4880#section-5.2.3.6

sapk · sapk · commit a8d6e495925a · 2019-04-16T01:29:07.000+02:00
diff --git a/models/gpg_key.go b/models/gpg_key.go
@@ -248,7 +248,7 @@ func parseGPGKey(ownerID int64, e *openpgp.Entity) (*GPGKey, error) {
 	}
 	expiry := time.Time{}
 	if selfSig.KeyLifetimeSecs != nil {
-		expiry = selfSig.CreationTime.Add(time.Duration(*selfSig.KeyLifetimeSecs) * time.Second)
+		expiry = pubkey.CreationTime.Add(time.Duration(*selfSig.KeyLifetimeSecs) * time.Second)
 	}
 
 	//Parse Subkeys

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ func parseGPGKey(ownerID int64, e openpgp.Entity) (GPGKey, error) {`
`248`	`248`	`}`
`249`	`249`	`expiry := time.Time{}`
`250`	`250`	`if selfSig.KeyLifetimeSecs != nil {`
`251`		`- expiry = selfSig.CreationTime.Add(time.Duration(selfSig.KeyLifetimeSecs) time.Second)`
	`251`	`+ expiry = pubkey.CreationTime.Add(time.Duration(selfSig.KeyLifetimeSecs) time.Second)`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`//Parse Subkeys`