bin/meta4ra-hashers-detect | 2 +- cmd/check.go | 2 +- cmd/create.go | 2 +- cmd/dl.go | 2 +- cmd/hash.go | 2 +- cmd/list.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- internal/common.go | 2 +- internal/thirdparty.go | 4 ++-- makedist | 4 ++++ diff --git a/bin/meta4ra-hashers-detect b/bin/meta4ra-hashers-detect index c3f8b5e3bdf4c22882a11a7dc1226432b05372f5cf24ee7c2a10a283cea6223a..403aa7a30623d2284e3b4689b98fb5aff3b038778125d696fa77c5001973e2fe 100755 --- a/bin/meta4ra-hashers-detect +++ b/bin/meta4ra-hashers-detect @@ -94,7 +94,7 @@ unhexdump="hexdump -v -e '/1 \"%02x\"' ; echo" n=streebog-512 if [ -z "$desired" ] || [ $desired = "$n" ] ; then HSH=84d883ede9fa6ce855d82d8c278ecd9f5fc88bf0602831ae0c38b9b506ea3cb02f3fa076b8f5664adf1ff862c0157da4cc9a83e141b738ff9268a9ba3ed6f563 - check $n streebog512 || # go.cypherpunks.su/gogost + check $n streebog512 || # go.stargrave.org/gogost check $n "nettle-hash --algorithm=streebog512 --raw | $unxxd" || check $n "nettle-hash --algorithm=streebog512 --raw | $unhexdump" || check $n "libressl dgst -streebog512" || diff --git a/cmd/check.go b/cmd/check.go index 4fd658f82a503b89501d76d16654a9a32c485e3e66a0ffd705cd0744278c3ce7..91224e7da1cab73a5d44685588e7c7a7cb71a03e88faa4f62c0b11ddf38328fa 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -27,7 +27,7 @@ "path" "strings" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runCheck() { diff --git a/cmd/create.go b/cmd/create.go index 3e4d743dcaa0a642e4330c5bb8e5fb19e0ef8fc31cc59af10626f4705f975963..f4c2064498cf648b142adcb51e8cf5c63a4642ddbf270f0985a7244a54486a85 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -27,7 +27,7 @@ "os" "path" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runCreate() { diff --git a/cmd/dl.go b/cmd/dl.go index 354edc22851fac509788699d54195f829ab94ec892c2c5d89eee8210757d51b4..82038d7fbc5cec9c9d6f612c5c56d9a0a090f87fcb7b62b8205b0b3bd856ec88 100644 --- a/cmd/dl.go +++ b/cmd/dl.go @@ -25,7 +25,7 @@ "net/http" "os" "time" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runDl() { diff --git a/cmd/hash.go b/cmd/hash.go index 2b7471d16265f8c24b77dfb0d1d68213fd3c7209090fc1f8dbc0aca7d725af6c..557414a8edab608b649fbf00720e35404dc25f468f8814ff1fad7bff6ee57a2d 100644 --- a/cmd/hash.go +++ b/cmd/hash.go @@ -24,7 +24,7 @@ "log" "os" "strings" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runHash() { diff --git a/cmd/list.go b/cmd/list.go index 605af89954cbef8144b69a6c6ab83c1878969eee2326e91dd28cb84ab24df3bc..889eda2eaa1c67bed613feac09cdb74fc4ee5d5b99e273db58aa3bd05ab8db98 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -24,7 +24,7 @@ "log" "os" "strings" - meta4ra "go.stargrave.org/meta4ra/internal" + meta4ra "go.stargrave.org/meta4ra/v2/internal" ) func runList() { diff --git a/go.mod b/go.mod index bcba64af0532132f38ba7120e732ba6f7d372107bdfe5c981e942fa699e5b052..a9d04bafc69bdf3b9811ca7f5c974b88bebae2a64200f7339400ebc12815d31b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.stargrave.org/meta4ra +module go.stargrave.org/meta4ra/v2 go 1.24.0 @@ -6,7 +6,7 @@ require ( github.com/dchest/skein v0.0.0-20171112102903-d7f1022db390 github.com/dustin/go-humanize v1.0.1 github.com/zeebo/xxh3 v1.0.2 - go.cypherpunks.su/gogost/v6 v6.1.0 + go.stargrave.org/gogost/v7 v7.0.0 golang.org/x/crypto v0.33.0 lukechampine.com/blake3 v1.4.1 ) diff --git a/go.sum b/go.sum index b7880ba9649eb81fd2ec66ac1f1b5029098b5af143e0b85a65ff91ac430fd210..7718d36e5421d4ebd1fae5cd3d6902327a049dafe62a64c228eda98fc6970542 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.cypherpunks.su/gogost/v6 v6.1.0 h1:RJHFxDZ2j/TIfHXGn4AG0fTDg19GEX/oVFAgMvLCIPM= -go.cypherpunks.su/gogost/v6 v6.1.0/go.mod h1:cj9i0r80PN7jrwMqBAWhaY8JetCeg4x5jjnZsVRkaPI= +go.stargrave.org/gogost/v7 v7.0.0 h1:yTkNKH9TBrb4nZyMXrAateyZYDvauwH1gCVBL+TwF38= +go.stargrave.org/gogost/v7 v7.0.0/go.mod h1:NlrCXlmZahvPeDbIcidlrQ4u7U5FrJJOAPZGKped/Zs= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= diff --git a/internal/common.go b/internal/common.go index 8ee54920ca63370a753a1a9a3785b7cd69c59598662584911c7e1ff63460d170..3a9bd26a256f00424c6dd3ad726c7f745438e484e2d381f6853ee3973b3ccb02 100644 --- a/internal/common.go +++ b/internal/common.go @@ -21,7 +21,7 @@ "runtime" ) const ( - Generator = "meta4ra/2.0.0" + Generator = "meta4ra/2.1.0" SigMediaTypePGP = "application/pgp-signature" SigMediaTypeSSH = "application/ssh-signature" BufLen = 1 << 20 diff --git a/internal/thirdparty.go b/internal/thirdparty.go index a5d4d33b8c072ec7cf85385f868aa89faee0347d6fb85c7af828c2af795d917e..d8cdf18b6b6a56d378563bea35fe267c3127123f9f1c8e106920d5e5bb71c5a3 100644 --- a/internal/thirdparty.go +++ b/internal/thirdparty.go @@ -21,8 +21,8 @@ import ( "hash" "github.com/dchest/skein" - "go.cypherpunks.su/gogost/v6/gost34112012256" - "go.cypherpunks.su/gogost/v6/gost34112012512" + "go.stargrave.org/gogost/v7/gost34112012256" + "go.stargrave.org/gogost/v7/gost34112012512" "golang.org/x/crypto/blake2b" "lukechampine.com/blake3" ) diff --git a/makedist b/makedist index 37c562ea8379607ab1d830375dbe436795e3ab594d913efe47f63d6f5c795711..5f627e87261266e092b4870f6322e210f7730d97f835c9256f7578860ad29174 100755 --- a/makedist +++ b/makedist @@ -33,6 +33,8 @@ "4|ru|https://msk.www.meta4ra.stargrave.org/download/$tarball" \ "4|ru|https://spb.www.meta4ra.stargrave.org/download/$tarball" \ "5|ru|http://y.www.meta4ra.stargrave.org/download/$tarball" \ "5|ru|http://[322:3bd:cc26:9545:b00b:66d6:6245:e58b]/download/$tarball" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/meta4ra.stargrave.org/download/$tarball" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/meta4ra.stargrave.org/download/$tarball" \ <$tarball >$tarball.meta4 meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ -id "OpenSSH signature" \ @@ -44,6 +46,8 @@ "4|ru|https://msk.www.meta4ra.stargrave.org/download/$tarball.sig" \ "4|ru|https://spb.www.meta4ra.stargrave.org/download/$tarball.sig" \ "5|ru|http://y.www.meta4ra.stargrave.org/download/$tarball.sig" \ "5|ru|http://[322:3bd:cc26:9545:b00b:66d6:6245:e58b]/download/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/meta4ra.stargrave.org/download/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/meta4ra.stargrave.org/download/$tarball.sig" \ <$tarball.sig >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4