Skip to content
Permalink
Browse files

cmd/age: improve incorrect passphrase error message

Fixes #41
  • Loading branch information
FiloSottile committed Dec 31, 2019
1 parent 7935150 commit e43cf8b4a2d571df8dcb30783a460acbf188adb4
Showing with 12 additions and 1 deletion.
  1. +9 −1 cmd/age/encrypted_keys.go
  2. +3 −0 internal/age/age.go
@@ -110,7 +110,15 @@ func (i *LazyScryptIdentity) Unwrap(block *format.Recipient) (fileKey []byte, er
if err != nil {
return nil, err
}
return ii.Unwrap(block)
fileKey, err = ii.Unwrap(block)
if err == age.ErrIncorrectIdentity {
// The API will just ignore the identity if the passphrase is wrong, and
// move on, eventually returning "no identity matched a recipient".
// Since we only supply one identity from the CLI, make it a fatal
// error with a better message.
return nil, fmt.Errorf("incorrect passphrase")
}
return fileKey, err
}

// stdinInUse is set in main. It's a singleton like os.Stdin.
@@ -127,6 +127,9 @@ RecipientsLoop:
fileKey, err = i.Unwrap(r)
if err != nil {
if err == ErrIncorrectIdentity {
// TODO: we should collect these errors and return them as an
// []error type with an Error method. That will require turning
// ErrIncorrectIdentity into an interface or wrapper error.
continue
}
return nil, err

0 comments on commit e43cf8b

Please sign in to comment.
You can’t perform that action at this time.