cmd/age,internal/stream: improve error messages

Author: FiloSottile

cmd/age/age.go

@@ -181,7 +181,7 @@ func main() {
 		}
 		if armorFlag {
 			errorWithHint("-a/--armor can't be used with -d/--decrypt",
-				"note that armored files are detected automatically")
+				"note that armored files are detected automatically, try again without -a/--armor")
 		}
 		if passFlag {
 			errorWithHint("-p/--passphrase can't be used with -d/--decrypt",

internal/stream/stream.go

@@ -118,7 +118,7 @@ func (r *Reader) readChunk() (last bool, err error) {
 		out, err = r.a.Open(outBuf, r.nonce[:], in, nil)
 	}
 	if err != nil {
-		return false, errors.New("failed to decrypt and authenticate payload chunk")
+		return false, errors.New("failed to decrypt and authenticate payload chunk, file may be corrupted or tampered with")
 	}
 
 	incNonce(&r.nonce)