diff options
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | masterkey.go | 2 | ||||
| -rw-r--r-- | password.go | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -180,7 +180,7 @@ func main() { fmt.Printf("Password: ") } currentPassword = readPassword() - cryptfs.Info.Printf("\nDecrypting master key... ") + cryptfs.Info.Printf("Decrypting master key... ") cryptfs.Warn.Disable() // Silence DecryptBlock() error messages on incorrect password key, cf, err = cryptfs.LoadConfFile(cfname, currentPassword) cryptfs.Warn.Enable() diff --git a/masterkey.go b/masterkey.go index 69f268c..a1889b4 100644 --- a/masterkey.go +++ b/masterkey.go @@ -25,7 +25,7 @@ func printMasterKey(key []byte) { } } - fmt.Printf(` + cryptfs.Info.Printf(` ATTENTION: Your master key is: %s diff --git a/password.go b/password.go index 821ecb4..6b3452a 100644 --- a/password.go +++ b/password.go @@ -9,9 +9,8 @@ import ( func readPasswordTwice() string { fmt.Printf("Password: ") p1 := readPassword() - fmt.Printf("\nRepeat: ") + fmt.Printf("Repeat: ") p2 := readPassword() - fmt.Printf("\n") if p1 != p2 { fmt.Printf("Passwords do not match\n") os.Exit(ERREXIT_PASSWORD) @@ -23,6 +22,7 @@ func readPasswordTwice() string { func readPassword() string { fd := int(os.Stdin.Fd()) p, err := terminal.ReadPassword(fd) + fmt.Printf("\n") if err != nil { fmt.Printf("Error: Could not read password: %v\n", err) os.Exit(ERREXIT_PASSWORD) |