From 48a641aeb2476f7dabb5cd4977108a4788e78f24 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 26 Jan 2022 10:27:42 +0300 Subject: [PATCH] Fix encrypted packet magic number check --- src/cmd/nncp-xfer/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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") } -- 2.44.0