Replace Twofish/HKDF with ChaCha20/BLAKE2X for speed and simplicity

[nncp.git] / src / cypherpunks.ru / nncp / cmd / nncp-pkt / main.go

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
index 82bcffbd5d0fe444e0908fc5e15106a9fa46ae1f..891298bf3ebde2f3b4d9077aba50f3050c91e39d 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
@@ -26,7 +26,6 @@ import (
        "flag"
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "os"
 
@@ -112,15 +111,14 @@ func main() {
        }
        var pktEnc nncp.PktEnc
        _, err = xdr.Unmarshal(bytes.NewReader(beginning), &pktEnc)
-       if err == nil && pktEnc.Magic == nncp.MagicNNCPEv1 {
+       if err == nil && pktEnc.Magic == nncp.MagicNNCPEv3 {
                if *dump {
-                       cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
+                       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
                        if err != nil {
-                               log.Fatalln("Can not read config:", err)
+                               log.Fatalln("Error during initialization:", err)
                        }
-                       ctx, err := nncp.CfgParse(cfgRaw)
-                       if err != nil {
-                               log.Fatalln("Can not parse config:", err)
+                       if ctx.Self == nil {
+                               log.Fatalln("Config lacks private keys")
                        }
                        bufW := bufio.NewWriter(os.Stdout)
                        if _, _, err = nncp.PktEncRead(
@@ -140,8 +138,8 @@ func main() {
                        return
                }
                fmt.Printf(
-                       "Packet type: encrypted\nNiceness: %d\nSender: %s\n",
-                       pktEnc.Nice, pktEnc.Sender,
+                       "Packet type: encrypted\nNiceness: %d\nSender: %s\nRecipient: %s\n",
+                       pktEnc.Nice, pktEnc.Sender, pktEnc.Recipient,
                )
                return
        }