From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 26 Jan 2022 07:27:42 +0000 (+0300)
Subject: Fix encrypted packet magic number check
X-Git-Tag: v8.5.0^2~4
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=48a641aeb2476f7dabb5cd4977108a4788e78f24

Fix encrypted packet magic number check
---

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index c9be0de..41e8c61 100644
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -218,7 +218,7 @@ func main() {
 				continue
 			}
 			pktEnc, pktEncRaw, err := ctx.HdrRead(fd)
-			if err != nil {
+			if err == nil {
 				switch pktEnc.Magic {
 				case nncp.MagicNNCPEv1.B:
 					err = nncp.MagicNNCPEv1.TooOld()
@@ -229,6 +229,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("is not an encrypted packet")
 				}