gocryptfs-xray: dumpmasterkey: disable "Reading password from stdin"

...and also exit with the proper exit code when we get an error.

1 files changed, 4 insertions, 0 deletions

diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index 6cce1c6..85470ec 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -10,7 +10,9 @@ import (
 	"github.com/rfjakob/gocryptfs/internal/configfile"
 	"github.com/rfjakob/gocryptfs/internal/contentenc"
 	"github.com/rfjakob/gocryptfs/internal/cryptocore"
+	"github.com/rfjakob/gocryptfs/internal/exitcodes"
 	"github.com/rfjakob/gocryptfs/internal/readpassword"
+	"github.com/rfjakob/gocryptfs/internal/tlog"
 )
 
 const (
@@ -57,10 +59,12 @@ func main() {
 }
 
 func dumpMasterKey(fn string) {
+	tlog.Info.Enabled = false
 	pw := readpassword.Once("")
 	masterkey, _, err := configfile.LoadConfFile(fn, pw)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
+		exitcodes.Exit(err)
 	}
 	fmt.Println(hex.EncodeToString(masterkey))
 }