X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=56ea4ca7c473e0acf9c920ab32e5a6afb4b6f633;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=ec9bdd20fa499ab0e6fe738c135fc496dd98c1a7;hpb=116c4cf07862ff127054fca98b1fdac9451fb3a0;p=nncp.git

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index ec9bdd2..56ea4ca 100644
--- 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()}},