From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 29 Jun 2021 11:57:02 +0000 (+0300)
Subject: No triple password query
X-Git-Tag: v7.0.0^2~3
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=9f87b8eeb6f058f391b6b54e199fc28ffc6335c3

No triple password query
---

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 467d5d0..191b513 100644
--- 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 e06cae8..f7a2e82 100644
--- 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 d960d28..810da34 100644
--- 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)