.gitignore | 1 - bench.do | 3 +-- clean.do | 2 +- default.do | 3 +-- go.mod | 2 +- go.sum | 6 ++++-- gogost.go | 2 +- install.texi | 24 ++++++++++++------------ makedist.sh | 37 ++++++++----------------------------- module-name.do | 2 -- news.texi | 5 +++++ diff --git a/.gitignore b/.gitignore index 9993e14ed853004f250ad4fdea0c3748d3ec58a58bead500e5c5bc29a1e65ca9..f9f200acf8555413faf8b109d423137c6f06e21d793dcdba49aa504298c50622 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -module-name VERSION diff --git a/bench.do b/bench.do index 13d1051f33d4444b7d0d392018d721444f25a24f840669bb01cbc5c41373c1a6..e434fd320988772fb42926b7375a6783d1b18c9c134ab8594fde408fbbf5e8da 100644 --- a/bench.do +++ b/bench.do @@ -1,3 +1,2 @@ -redo-ifchange module-name exec >&2 -go test -benchmem -bench . `cat module-name`/... +go test -benchmem -bench . ./... diff --git a/clean.do b/clean.do index 0211ad84e2fa080f2549d47c134ca20537f83e44984482883132b8eaccc38111..f7c87aeecbed1aa77cd4aeb97f8e33b7ba9a9b42fc7aec0439a20b0d5c98b6da 100644 --- a/clean.do +++ b/clean.do @@ -1 +1 @@ -rm -f module-name streebog256 streebog512 VERSION +rm -f streebog256 streebog512 VERSION diff --git a/default.do b/default.do index 334956cd7108a09ab5386b80a6f7532f8c678617c71b582697d51bc51e7ee6d8..8511f601fe5e539a0a9327223347de1f1a9993123f743e3815a2d57021784dc1 100644 --- a/default.do +++ b/default.do @@ -1,2 +1 @@ -redo-ifchange module-name -go build -o $3 `cat module-name`/cmd/$1 +go build -o $3 ./cmd/$1 diff --git a/go.mod b/go.mod index f2569fe33a30b9b986f4ca46b181100b5fe2e6715d5890d9ba8a8e99e8643e05..bc581712ae3a1d0c6da604f7e0459759d029a14852aa1ad3817a7ffb0536e98e 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.cypherpunks.ru/gogost/v5 go 1.12 -require golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a +require golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad diff --git a/go.sum b/go.sum index ecee1180a47ac7d50ba8c96b5f90bb6445ed38f298a7f3a0f3b28bf0b586943b..259c658da6c119a1942ad2b0cfa9ba53911f56abb700c4e9bff6f910fe650adf 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/gogost.go b/gogost.go index d882a31bb990a14bbda87a479b91eccbc70cff11c74cd64b1c57b9ed5bdbc70f..60f8d57a0051b308b215918044bfff285072786de3500971413680425887b128 100644 --- a/gogost.go +++ b/gogost.go @@ -1,4 +1,4 @@ // Pure Go GOST cryptographic functions library. package gogost -const Version = "5.1.0" +const Version = "5.1.1" diff --git a/install.texi b/install.texi index 6250cfb94ed252ff3adf5079828b683541eef3fc47cb713ccd786bb36f9a1da7..d333642ed18c30218cedea6b068043139c9b4d893fe560772be561e4628f256a 100644 --- a/install.texi +++ b/install.texi @@ -10,7 +10,7 @@ $ [fetch|wget] http://www.gogost.cypherpunks.ru/gogost-@value{VERSION}.tar.xz.sig $ gpg --verify gogost-@value{VERSION}.tar.xz.sig gogost-@value{VERSION}.tar.xz $ xz --decompress --stdout gogost-@value{VERSION}.tar.xz | tar xf - $ cd gogost-@value{VERSION} -$ redo bench all +$ redo all $ echo hello world | ./streebog256 f72018189a5cfb803dbe1f2149cf554c40093d8e7f81c21e08ac5bcd09d9934d @end example @@ -27,10 +27,9 @@ And then you can include its source code in your project for example like this: @example -$ mkdir -p myproj/src -$ cp -r gogost-@value{VERSION}/src/go.cypherpunks.ru myproj/src -$ export GOPATH=$PWD/myproj -$ cd myproj/src +$ mkdir -p myproj/vendor/go.cypherpunks.ru/gogost +$ mv gogost-@value{VERSION} myproj/vendor/go.cypherpunks.ru/gogost/v5 +$ cd myproj $ cat > main.go < /home/stargrave/gogost-@value{VERSION}/src/go.cypherpunks.ru/gogost/v5 +replace go.cypherpunks.ru/gogost/v5 => /path/to/gogost-@value{VERSION} @end example You can obtain development source code with -@command{git clone git://git.cypherpunks.ru/gogost.git}. +@command{git clone git://git.cypherpunks.ru/gogost.git} +(also you can use @url{https://git.cypherpunks.ru/gogost.git}). diff --git a/makedist.sh b/makedist.sh index a384f35e522c8e6cf3ed7edb7a2077ec870a050c9c5055ce35710d432f984982..38fa8cd09021ee78a8f83e9aebee5030102d5c7c09f60f532a54233b0ea5a514 100755 --- a/makedist.sh +++ b/makedist.sh @@ -9,33 +9,10 @@ redo-ifchange streebog256 git clone . $tmp/gogost-$release cd $tmp/gogost-$release git checkout v$release -redo module-name VERSION -mod_name=`cat module-name` - -crypto_mod_path=$(sed -n 's#^require \(golang.org/x/crypto\) \(.*\)$#\1@\2#p' go.mod) -mkdir -p src/$mod_name -mv \ - gost28147 \ - gost3410 \ - gost34112012256 \ - gost34112012512 \ - gost341194 \ - gost3412128 \ - gost341264 \ - gost3413 \ - mgm \ - prfplus \ - cmd internal gogost.go go.mod go.sum src/$mod_name - -echo $mod_name > module-name -find . -name "*.do" -exec perl -i -npe "s/^go/GOPATH=\`pwd\` go/" {} \; +redo VERSION +go mod vendor mkdir contrib cp ~/work/redo/minimal/do contrib/do - -mkdir -p src/golang.org/x/crypto -( cd $GOPATH/pkg/mod/$crypto_mod_path ; \ - tar cf - AUTHORS CONTRIBUTORS LICENSE PATENTS README.md pbkdf2 hkdf ) | - tar xfC - src/golang.org/x/crypto cat > download.texi <