No triple password query

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 467d5d0c808e0f5f81b381cea87ad501d70799da..191b513defe1c97d1f86729f83566c5e7457b1a7 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -34,6 +34,9 @@
 MultiCast Discovery использует
 @verb{|ff02::4e4e:4350|} адрес вместо @verb{|ff02::1|}.
 
+@item
+@command{nncp-cfgenc} ошибочно трижды спрашивал парольную фразу при шифровании.
+
 @item
 Обновлены зависимые библиотеки.
 

diff --git a/doc/news.texi b/doc/news.texi
index e06cae8e52d149b7dd8091a7df728da2106333be..f7a2e820ec4b21d805e6c336af62faa9ad5eda61 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -35,6 +35,9 @@ packet's header is used as an associated data during encryption.
 MultiCast Discovery uses
 @verb{|ff02::4e4e:4350|} address instead of @verb{|ff02::1|}.
 
+@item
+@command{nncp-cfgenc} mistakenly asked passphrase three times during encryption.
+
 @item
 Updated dependencies.
 

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)