X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftx.go;h=20482efb234bc5a99e4b2fc5b792d7a976ff8c3a;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=73fbe4ec12bfa118d7d7ff1ab15c6f1ed2667fa1;hpb=116c4cf07862ff127054fca98b1fdac9451fb3a0;p=nncp.git diff --git a/src/tx.go b/src/tx.go index 73fbe4e..20482ef 100644 --- a/src/tx.go +++ b/src/tx.go @@ -36,7 +36,6 @@ import ( xdr "github.com/davecgh/go-xdr/xdr2" "github.com/dustin/go-humanize" "github.com/klauspost/compress/zstd" - "golang.org/x/crypto/blake2b" "golang.org/x/crypto/chacha20poly1305" ) @@ -406,13 +405,13 @@ func (ctx *Ctx) TxFile( leftSize := fileSize metaPkt := ChunkedMeta{ - Magic: MagicNNCPMv1, + Magic: MagicNNCPMv2, FileSize: uint64(fileSize), ChunkSize: uint64(chunkSize), - Checksums: make([][32]byte, 0, (fileSize/chunkSize)+1), + Checksums: make([][MTHSize]byte, 0, (fileSize/chunkSize)+1), } for i := int64(0); i < (fileSize/chunkSize)+1; i++ { - hsh := new([32]byte) + hsh := new([MTHSize]byte) metaPkt.Checksums = append(metaPkt.Checksums, *hsh) } var sizeToSend int64 @@ -431,10 +430,7 @@ func (ctx *Ctx) TxFile( if err != nil { return err } - hsh, err = blake2b.New256(nil) - if err != nil { - return err - } + hsh = MTHNew(0, 0) _, err = ctx.Tx( node, pkt,