diff options
| author | Jakob Unterwurzacher | 2022-01-03 15:18:59 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2022-01-03 15:18:59 +0100 |
| commit | 4b251f3ce1f0a0472ed10a00aeef70c69ba03a5d (patch) | |
| tree | a93b7b37d5b3118decd8a52f2db2e76d09d82b70 /gocryptfs-xray | |
| parent | 1eaf1211a259a38cdf3e7dad2e00e140409bef9a (diff) | |
readpassword: bubble up errors instead of exiting the process
This allows cleanups to happen in the caller, like removing
the control socket.
Fixes https://github.com/rfjakob/gocryptfs/issues/634
Diffstat (limited to 'gocryptfs-xray')
| -rw-r--r-- | gocryptfs-xray/xray_main.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go index 35f409f..534a400 100644 --- a/gocryptfs-xray/xray_main.go +++ b/gocryptfs-xray/xray_main.go @@ -148,7 +148,11 @@ func dumpMasterKey(fn string, fido2Path string) { } pw = fido2.Secret(fido2Path, cf.FIDO2.CredentialID, cf.FIDO2.HMACSalt) } else { - pw = readpassword.Once(nil, nil, "") + pw, err = readpassword.Once(nil, nil, "") + if err != nil { + tlog.Fatal.Println(err) + os.Exit(exitcodes.ReadPassword) + } } masterkey, err := cf.DecryptMasterKey(pw) // Purge password from memory |