]> Sergey Matveev's repositories - meta4ra.git/commitdiff
Use external utilities for hash calculation
authorSergey Matveev <stargrave@stargrave.org>
Wed, 3 May 2023 14:35:53 +0000 (17:35 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 3 May 2023 14:35:53 +0000 (17:35 +0300)
cmd/meta4-create/main.go
common.go
contrib/shake128sum [new file with mode: 0755]
contrib/shake256sum [new file with mode: 0755]
contrib/streebog256sum [new file with mode: 0755]
contrib/streebog512sum [new file with mode: 0755]
go.mod
go.sum [deleted file]

index 1c799af9bbe1d3c7e8cfb6d865b5cc9b8f6e21fc..b5d9abac4175411f8079f19ecf5cb37754825cae 100644 (file)
@@ -20,86 +20,84 @@ package main
 
 import (
        "bufio"
-       "crypto/sha256"
-       "crypto/sha512"
-       "encoding/hex"
+       "bytes"
        "encoding/xml"
        "flag"
-       "hash"
        "io"
        "log"
        "os"
+       "os/exec"
        "path"
+       "strings"
        "sync"
        "time"
 
-       "go.cypherpunks.ru/gogost/v5/gost34112012256"
-       "go.cypherpunks.ru/gogost/v5/gost34112012512"
        "go.stargrave.org/meta4ra"
-       "golang.org/x/crypto/sha3"
 )
 
-type MultiHasher struct {
-       sha256h      hash.Hash
-       sha512h      hash.Hash
-       streebog256h hash.Hash
-       streebog512h hash.Hash
-       shake128h    sha3.ShakeHash
-       shake256h    sha3.ShakeHash
-       g            sync.WaitGroup
+type Hasher struct {
+       names []string
+       cmds  []*exec.Cmd
+       ins   []io.WriteCloser
+       outs  []io.ReadCloser
+       wg    sync.WaitGroup
 }
 
-func NewMultiHasher() *MultiHasher {
-       return &MultiHasher{
-               sha256h:      sha256.New(),
-               sha512h:      sha512.New(),
-               streebog256h: gost34112012256.New(),
-               streebog512h: gost34112012512.New(),
-               shake128h:    sha3.NewShake128(),
-               shake256h:    sha3.NewShake256(),
-       }
-}
-
-func (h *MultiHasher) Write(p []byte) (n int, err error) {
-       h.g.Add(6)
-       go func() {
-               if _, err := h.sha256h.Write(p); err != nil {
-                       panic(err)
+func NewHasher(hashes string) *Hasher {
+       h := Hasher{}
+       for _, hc := range strings.Split(hashes, ",") {
+               cols := strings.SplitN(hc, ":", 2)
+               name, cmdline := cols[0], cols[1]
+               cmd := exec.Command(cmdline)
+               in, err := cmd.StdinPipe()
+               if err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.sha512h.Write(p); err != nil {
-                       panic(err)
+               out, err := cmd.StdoutPipe()
+               if err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.streebog256h.Write(p); err != nil {
-                       panic(err)
+               if err = cmd.Start(); err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.streebog512h.Write(p); err != nil {
-                       panic(err)
+               h.names = append(h.names, name)
+               h.ins = append(h.ins, in)
+               h.outs = append(h.outs, out)
+               h.cmds = append(h.cmds, cmd)
+       }
+       return &h
+}
+
+func (h *Hasher) Write(p []byte) (n int, err error) {
+       h.wg.Add(len(h.names))
+       for _, in := range h.ins {
+               go func(in io.WriteCloser) {
+                       if _, err := io.Copy(in, bytes.NewReader(p)); err != nil {
+                               log.Fatalln(err)
+                       }
+                       h.wg.Done()
+               }(in)
+       }
+       h.wg.Wait()
+       return len(p), nil
+}
+
+func (h *Hasher) Sums() []meta4ra.Hash {
+       sums := make([]meta4ra.Hash, 0, len(h.names))
+       for i, name := range h.names {
+               if err := h.ins[i].Close(); err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.shake128h.Write(p); err != nil {
-                       panic(err)
+               dgst, err := io.ReadAll(h.outs[i])
+               if err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       go func() {
-               if _, err := h.shake256h.Write(p); err != nil {
-                       panic(err)
+               sums = append(sums, meta4ra.Hash{Type: name, Hash: string(dgst[:len(dgst)-1])})
+               if err = h.cmds[i].Wait(); err != nil {
+                       log.Fatalln(err)
                }
-               h.g.Done()
-       }()
-       h.g.Wait()
-       return len(p), nil
+       }
+       return sums
 }
 
 func main() {
@@ -107,6 +105,18 @@ func main() {
        mtime := flag.String("mtime", "", "Take that file's mtime as a Published date")
        desc := flag.String("desc", "", "Description")
        sig := flag.String("sig", "", "Path to signature file")
+       hashesDef := []string{
+               "sha-256:sha256",
+               "sha-512:sha512",
+               "shake128:shake128sum",
+               "shake256:shake256sum",
+               "streebog-256:streebog256sum",
+               "streebog-512:streebog512sum",
+               "skein-256:skein256",
+               "skein-512:skein512",
+               "blake3-256:b3sum",
+       }
+       hashes := flag.String("hashes", strings.Join(hashesDef, ","), "hash-name:command-s")
        torrent := flag.String("torrent", "", "Torrent URL")
        log.SetFlags(log.Lshortfile)
        flag.Parse()
@@ -117,34 +127,19 @@ func main() {
        for _, u := range flag.Args() {
                urls = append(urls, meta4ra.URL{URL: u})
        }
+       h := NewHasher(*hashes)
        br := bufio.NewReaderSize(os.Stdin, 1<<20)
        buf := make([]byte, 1<<20)
-       h := NewMultiHasher()
        size, err := io.CopyBuffer(h, br, buf)
        if err != nil {
                log.Fatalln(err)
        }
-       shake128 := make([]byte, 32)
-       if _, err = io.ReadFull(h.shake128h, shake128); err != nil {
-               panic(err)
-       }
-       shake256 := make([]byte, 64)
-       if _, err = io.ReadFull(h.shake256h, shake256); err != nil {
-               panic(err)
-       }
        f := meta4ra.File{
                Name:        path.Base(*fn),
                Description: *desc,
                Size:        uint64(size),
                URLs:        urls,
-               Hashes: []meta4ra.Hash{
-                       {Type: meta4ra.HashSHA256, Hash: hex.EncodeToString(h.sha256h.Sum(nil))},
-                       {Type: meta4ra.HashSHA512, Hash: hex.EncodeToString(h.sha512h.Sum(nil))},
-                       {Type: meta4ra.HashStreebog256, Hash: hex.EncodeToString(h.streebog256h.Sum(nil))},
-                       {Type: meta4ra.HashStreebog512, Hash: hex.EncodeToString(h.streebog512h.Sum(nil))},
-                       {Type: meta4ra.HashSHAKE128, Hash: hex.EncodeToString(shake128)},
-                       {Type: meta4ra.HashSHAKE256, Hash: hex.EncodeToString(shake256)},
-               },
+               Hashes:      h.Sums(),
        }
        if *sig != "" {
                sigData, err := os.ReadFile(*sig)
index f8d8a45fe31238a397bcc65c41737c3552193397..0c56faf34736d4ae84ca446b1a52a88fd4ed36f3 100644 (file)
--- a/common.go
+++ b/common.go
@@ -24,14 +24,8 @@ import (
 )
 
 const (
-       Generator       = "meta4ra/0.2.0"
+       Generator       = "meta4ra/0.3.0"
        GPGSigMediaType = "application/pgp-signature"
-       HashSHA256      = "sha-256"
-       HashSHA512      = "sha-512"
-       HashStreebog256 = "streebog-256"
-       HashStreebog512 = "streebog-512"
-       HashSHAKE128    = "shake128"
-       HashSHAKE256    = "shake256"
 )
 
 type Metalink struct {
diff --git a/contrib/shake128sum b/contrib/shake128sum
new file mode 100755 (executable)
index 0000000..5d4ec85
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+# sha3sum is expected to be from p5-Digest-SHA3
+
+sha3sum -a 128000 | ( dd bs=1 count=64 2>/dev/null ; printf "\n" )
diff --git a/contrib/shake256sum b/contrib/shake256sum
new file mode 100755 (executable)
index 0000000..d02f597
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+# sha3sum is expected to be from p5-Digest-SHA3
+
+sha3sum -a 256000 | ( dd bs=1 count=128 2>/dev/null ; printf "\n" )
diff --git a/contrib/streebog256sum b/contrib/streebog256sum
new file mode 100755 (executable)
index 0000000..9a4c9be
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec rhash --printf "%{gost12-256}\n" -
diff --git a/contrib/streebog512sum b/contrib/streebog512sum
new file mode 100755 (executable)
index 0000000..51c25b0
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec rhash --printf "%{gost12-512}\n" -
diff --git a/go.mod b/go.mod
index 19e71d867487eef9413c6663a5eec6c485550277..47276ebdfabcbc7d4f37aa76127661033a7c374f 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,3 @@
 module go.stargrave.org/meta4ra
 
 go 1.20
-
-require (
-       go.cypherpunks.ru/gogost/v5 v5.10.0
-       golang.org/x/crypto v0.8.0
-)
-
-require golang.org/x/sys v0.7.0 // indirect
diff --git a/go.sum b/go.sum
deleted file mode 100644 (file)
index 960d8db..0000000
--- a/go.sum
+++ /dev/null
@@ -1,6 +0,0 @@
-go.cypherpunks.ru/gogost/v5 v5.10.0 h1:2y0Xu17euJiSNsAwmm7/RQhm3R9oRuS5UeTth0uBt/w=
-go.cypherpunks.ru/gogost/v5 v5.10.0/go.mod h1:lq0ROvdwQiQGh44ZqcUDTkzRnkeaJFkd8qdJoJIkcKg=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=