Fix Rot to use decrypted Keys before trying to decrypt other keys

Author: thequailman

go/keys.go

@@ -49,8 +49,6 @@ func (c *cfg) decryptPrivateKey(ctx context.Context) errs.Err {
 		return errNotInitialized
 	}
 
-	c.decryptKeysEncrypted(ctx)
-
 	var err error
 
 	var out []byte
@@ -69,6 +67,23 @@ func (c *cfg) decryptPrivateKey(ctx context.Context) errs.Err {
 		}
 	}
 
+	if c.privateKey.IsNil() {
+		c.decryptKeysEncrypted(ctx)
+		keys := c.keys.Keys()
+
+		for i := range c.DecryptKeys {
+			out, err = c.DecryptKeys[i].PrivateKey.Decrypt(keys)
+			if err == nil {
+				k, err := cryptolib.ParseKey[cryptolib.KeyProviderPrivate](string(out))
+				if err == nil {
+					c.privateKey = k
+
+					break
+				}
+			}
+		}
+	}
+
 	if err != nil {
 		return logger.Error(ctx, errs.ErrReceiver.Wrap(err))
 	}