From 758cf055a9738e5d2ae9d9a469032988f12bc686 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 13 Dec 2019 17:57:51 +0300
Subject: [PATCH] Fix invalid placeholders of newly generated private and
 public Noise keys

---
 doc/news.ru.texi            | 5 +++++
 doc/news.texi               | 4 ++++
 src/cmd/nncp-cfgnew/main.go | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index d99a621..54dbe00 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -5,6 +5,11 @@
 @subsection Релиз 5.1.2
 @itemize
 
+@item
+Исправлена ошибка: в новосозданных конфигурационных файлах, приватный
+публичный ключ Noise были поменяны местами, что приводило к
+невозможности online аутентификации нод.
+
 @item
 Явная синхронизация (fsync) директорий для гарантированного
 переименования файлов.
diff --git a/doc/news.texi b/doc/news.texi
index 5b9d06b..85095ba 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -7,6 +7,10 @@ See also this page @ref{Новости, on russian}.
 @section Release 5.1.2
 @itemize
 
+@item
+Bugfix: private and public Noise keys were swapped in newly created
+configuration files, that lead to inability to authenticate online peers.
+
 @item
 Explicit directories fsync-ing for guaranteed files renaming.
 
diff --git a/src/cmd/nncp-cfgnew/main.go b/src/cmd/nncp-cfgnew/main.go
index e2eac99..70bd1dc 100644
--- a/src/cmd/nncp-cfgnew/main.go
+++ b/src/cmd/nncp-cfgnew/main.go
@@ -86,8 +86,8 @@ func main() {
 			nncp.ToBase32(nodeOur.ExchPrv[:]),
 			nncp.ToBase32(nodeOur.SignPub[:]),
 			nncp.ToBase32(nodeOur.SignPrv[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
 			nncp.ToBase32(nodeOur.NoisePrv[:]),
+			nncp.ToBase32(nodeOur.NoisePub[:]),
 			nodeOur.Id.String(),
 			nncp.ToBase32(nodeOur.ExchPub[:]),
 			nncp.ToBase32(nodeOur.SignPub[:]),
@@ -220,8 +220,8 @@ func main() {
 			nncp.ToBase32(nodeOur.ExchPrv[:]),
 			nncp.ToBase32(nodeOur.SignPub[:]),
 			nncp.ToBase32(nodeOur.SignPrv[:]),
-			nncp.ToBase32(nodeOur.NoisePub[:]),
 			nncp.ToBase32(nodeOur.NoisePrv[:]),
+			nncp.ToBase32(nodeOur.NoisePub[:]),
 			nodeOur.Id.String(),
 			nncp.ToBase32(nodeOur.ExchPub[:]),
 			nncp.ToBase32(nodeOur.SignPub[:]),
-- 
2.44.0