dkforest

commit 2884d9537f9eaa234be0d541f3e9df72eef94080
parent 80c67256578daf24956af8559802a25f00879c3c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu,  8 Feb 2024 20:29:56 -0800

improve error message when pgp key has expired

Diffstat:
M
pkg/utils/utils.go
 | 
12
+++---------

1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -554,15 +554,9 @@ func GeneratePgpEncryptedMessage(pkey, msg string) (string, error) {
 	armoredWriter, _ := armor.Encode(buffer, "PGP MESSAGE", nil)
 	w, err := openpgp.Encrypt(armoredWriter, []*openpgp.Entity{e}, nil, nil, nil)
 	if err != nil {
-
-		//i := e.PrimaryIdentity()
-		//sig := i.SelfSignature
-		//if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 {
-		//	expiry := e.PrimaryKey.CreationTime.Add(time.Duration(*sig.KeyLifetimeSecs) * time.Second)
-		//}
-		//if e.PrimaryKey.KeyExpired(sig, time.Now()) {
-		//}
-
+		if e.PrimaryKey.KeyExpired(e.PrimaryIdentity().SelfSignature, time.Now()) { // Primary key has expired
+			return "", errors.New("PGP key has expired")
+		}
 		// openpgp: invalid argument: cannot encrypt a message to key id xxx because it has no encryption keys
 		// Likely your key is expired or had expired subkeys. (https://github.com/keybase/keybase-issues/issues/2072#issuecomment-183702559)
 		logrus.Error(err)