gogost-streebog is split to streebog{256,512} by analogy with sha*

diff --git a/common.mk b/common.mk
index d86b24ca093ac586fb9c111e48fb9d1d42370f1a..e528f9a5f2c290b606693b7b60db951312b26e81 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,7 +1,12 @@
 LDFLAGS = -X cypherpunks.ru/gogost.Version=$(VERSION)
 
-gogost-streebog:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/gogost/cmd/gogost-streebog
+all: streebog256 streebog512
+
+streebog256:
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/gogost/cmd/streebog256
+
+streebog512:
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/gogost/cmd/streebog512
 
 bench:
        GOPATH=$(GOPATH) go test -benchmem -bench . cypherpunks.ru/gogost/...

diff --git a/makedist.sh b/makedist.sh
index f7f1ab18e78c8603103cb8a38ead34f746d853d0..ffc4ca1a974078500f16b625f4c7e1735a0c704e 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -20,7 +20,7 @@ gpg --detach-sign --sign --local-user 82343436696FC85A gogost-"$release".tar.xz
 tarball=gogost-"$release".tar.xz
 size=$(( $(wc -c < $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
-hashsb=$($HOME/work/gogost/gogost-streebog < $tarball)
+hashsb=$($HOME/work/gogost/streebog256 < $tarball)
 
 cat <<EOF
 An entry for documentation:

diff --git a/src/cypherpunks.ru/gogost/cmd/gogost-streebog/main.go b/src/cypherpunks.ru/gogost/cmd/streebog256/main.go
similarity index 75%
rename from src/cypherpunks.ru/gogost/cmd/gogost-streebog/main.go
rename to src/cypherpunks.ru/gogost/cmd/streebog256/main.go
index 2817a2ac64d00e4cbd49ecb0ce3ff96e945c818c..7edade2e1249c1a947fcf11f58afd8eca6cda40c 100644 (file)
--- a/src/cypherpunks.ru/gogost/cmd/gogost-streebog/main.go
+++ b/src/cypherpunks.ru/gogost/cmd/streebog256/main.go
@@ -14,25 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-// Command-line 34.11-2012 hash function.
+// Command-line 34.11-2012 256-bit hash function.
 package main
 
 import (
        "encoding/hex"
        "flag"
        "fmt"
-       "hash"
        "io"
        "os"
 
        "cypherpunks.ru/gogost"
        "cypherpunks.ru/gogost/gost34112012256"
-       "cypherpunks.ru/gogost/gost34112012512"
 )
 
 var (
-       digestSize = flag.Int("size", 256, "Digest size in bits (either 256 or 512)")
-       version    = flag.Bool("version", false, "Print version information")
+       version = flag.Bool("version", false, "Print version information")
 )
 
 func main() {
@@ -41,12 +38,7 @@ func main() {
                fmt.Println(gogost.Version)
                return
        }
-       var h hash.Hash
-       if *digestSize == 256 {
-               h = gost34112012256.New()
-       } else {
-               h = gost34112012512.New()
-       }
+       h := gost34112012256.New()
        io.Copy(h, os.Stdin)
        fmt.Println(hex.EncodeToString(h.Sum(nil)))
 }

diff --git a/src/cypherpunks.ru/gogost/cmd/streebog512/main.go b/src/cypherpunks.ru/gogost/cmd/streebog512/main.go
new file mode 100644 (file)
index 0000000..2e35a58
--- /dev/null
+++ b/src/cypherpunks.ru/gogost/cmd/streebog512/main.go
@@ -0,0 +1,44 @@
+// GoGOST -- Pure Go GOST cryptographic functions library
+// Copyright (C) 2015-2016 Sergey Matveev <stargrave@stargrave.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Command-line 34.11-2012 512-bit hash function.
+package main
+
+import (
+       "encoding/hex"
+       "flag"
+       "fmt"
+       "io"
+       "os"
+
+       "cypherpunks.ru/gogost"
+       "cypherpunks.ru/gogost/gost34112012512"
+)
+
+var (
+       version = flag.Bool("version", false, "Print version information")
+)
+
+func main() {
+       flag.Parse()
+       if *version {
+               fmt.Println(gogost.Version)
+               return
+       }
+       h := gost34112012512.New()
+       io.Copy(h, os.Stdin)
+       fmt.Println(hex.EncodeToString(h.Sum(nil)))
+}