No triple password query

[nncp.git] / src / cmd / nncp-cfgenc / main.go

diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go
index d960d28b2a1365def2a093f488cb2fb33012cabf..810da3470588570a58a53956ea89c5f8f15ccc8a 100644 (file)
--- a/src/cmd/nncp-cfgenc/main.go
+++ b/src/cmd/nncp-cfgenc/main.go
@@ -91,27 +91,19 @@ func main() {
        }
 
        os.Stderr.WriteString("Passphrase:") // #nosec G104
-       password, err := term.ReadPassword(0)
+       password1, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }
-       os.Stderr.WriteString("\n") // #nosec G104
-
        if *decrypt {
-               cfgRaw, err := nncp.DeEBlob(data, password)
+               cfgRaw, err := nncp.DeEBlob(data, password1)
                if err != nil {
                        log.Fatalln(err)
                }
                os.Stdout.Write(cfgRaw) // #nosec G104
                return
        }
-
-       password1, err := term.ReadPassword(0)
-       if err != nil {
-               log.Fatalln(err)
-       }
-       os.Stderr.WriteString("\n")                 // #nosec G104
-       os.Stderr.WriteString("Repeat passphrase:") // #nosec G104
+       os.Stderr.WriteString("\nRepeat passphrase:") // #nosec G104
        password2, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)