From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 26 Jan 2022 07:28:03 +0000 (+0300)
Subject: Fix nncp-bundle workability
X-Git-Tag: v8.5.0^2~3
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=736537b32863e22660c8c4246c71bb4c320d2086

Fix nncp-bundle workability
---

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 61db762..cbf7f3e 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.5.0
+@subsection Релиз 8.5.0
+@itemize
+
+@item
+Исправлена работоспособность @command{nncp-bundle}.
+
+@end itemize
+
 @node Релиз 8.4.0
 @subsection Релиз 8.4.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index fbb1d46..3114c1a 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_5_0
+@section Release 8.5.0
+@itemize
+
+@item
+Fixed @command{nncp-bundle} workability.
+
+@end itemize
+
 @node Release 8_4_0
 @section Release 8.4.0
 @itemize
diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 42a9417..d5603a9 100644
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -316,6 +316,8 @@ func main() {
 			case nncp.MagicNNCPEv4.B:
 				err = nncp.MagicNNCPEv4.TooOld()
 			case nncp.MagicNNCPEv5.B:
+				err = nncp.MagicNNCPEv5.TooOld()
+			case nncp.MagicNNCPEv6.B:
 			default:
 				err = errors.New("Bad packet magic number")
 			}
diff --git a/src/nncp.go b/src/nncp.go
index b9457d3..b2303c0 100644
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-	Version string = "8.4.0"
+	Version string = "8.5.0"
 
 	Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )