MTH

[nncp.git] / src / cmd / nncp-reass / main.go

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index ec9bdd20fa499ab0e6fe738c135fc496dd98c1a7..56ea4ca7c473e0acf9c920ab32e5a6afb4b6f633 100644 (file)
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -35,8 +35,7 @@ import (
 
        xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/dustin/go-humanize"
-       "go.cypherpunks.ru/nncp/v6"
-       "golang.org/x/crypto/blake2b"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -68,7 +67,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
                return false
        }
        fd.Close() // #nosec G104
-       if metaPkt.Magic != nncp.MagicNNCPMv1 {
+       if metaPkt.Magic != nncp.MagicNNCPMv2 {
                ctx.LogE("reass", les, nncp.BadMagic, logMsg)
                return false
        }
@@ -152,10 +151,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo
                if err != nil {
                        log.Fatalln("Can not stat file:", err)
                }
-               hsh, err = blake2b.New256(nil)
-               if err != nil {
-                       log.Fatalln(err)
-               }
+               hsh = nncp.MTHNew(fi.Size(), 0)
                if _, err = nncp.CopyProgressed(
                        hsh, bufio.NewReader(fd), "check",
                        nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},