diff --git a/README.md b/README.md index 1776de2..4b52979 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ You need two things: Next, build sigtool: - git clone https://github.com/opencoff/sigtool + git clone https://git.rgst.io/homelab/sigtool/v3 cd sigtool make diff --git a/go.mod b/go.mod index 9809162..64a58c9 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,24 @@ -module github.com/opencoff/sigtool +module git.rgst.io/homelab/sigtool/v3 go 1.23.4 require ( github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a - github.com/opencoff/go-fio v0.5.7 + github.com/opencoff/go-fio v0.5.13 github.com/opencoff/go-mmap v0.1.5 - github.com/opencoff/go-utils v1.0.1 - github.com/opencoff/pflag v1.0.6-sh1 + github.com/opencoff/go-utils v1.0.2 + github.com/opencoff/pflag v1.0.7 github.com/planetscale/vtprotobuf v0.6.0 - golang.org/x/crypto v0.31.0 - google.golang.org/protobuf v1.36.0 + golang.org/x/crypto v0.35.0 + google.golang.org/protobuf v1.36.5 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/pkg/xattr v0.4.10 // indirect - github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect + github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/term v0.29.0 // indirect ) //replace github.com/opencoff/go-mmap => ../go-mmap diff --git a/go.sum b/go.sum index 3cd7fc0..68999cc 100644 --- a/go.sum +++ b/go.sum @@ -4,29 +4,45 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/opencoff/go-fio v0.5.7 h1:0meYV1C0vCWJYmnkivCJ+0ydWmTqjWPWO/CRoAJWSMM= github.com/opencoff/go-fio v0.5.7/go.mod h1:iXfyUCgT/U1rr2Lz9ZIODyRpdFFJtkOlbsO6rhgfxyQ= +github.com/opencoff/go-fio v0.5.13 h1:j0vcntRgk475Lw27FOZ35Vw0U7zEY6UFCDfXKynXisY= +github.com/opencoff/go-fio v0.5.13/go.mod h1:mehrXmBVDrLdmPrzeuihR1Fv9SnAo+P+riSQybhOg3k= github.com/opencoff/go-mmap v0.1.5 h1:RKPtevC4mOW5bi9skBPPo4nFTIH4lVWAL20Tff+FjLg= github.com/opencoff/go-mmap v0.1.5/go.mod h1:y/6Jk/tDUc00k3oSQpiJX++20Nw7xFSlc5kLkhGnRXw= github.com/opencoff/go-utils v1.0.1 h1:3Ibx2DQP+nQiany99sDVSgVvtyYaErpBrUjCRhZFnIs= github.com/opencoff/go-utils v1.0.1/go.mod h1:kh14Pqqe/QYGRph7ue4GWzLrlTOW8O/728qsuDFygeI= +github.com/opencoff/go-utils v1.0.2 h1:BANRL8ZxgHpuo8gQBAzT3M9Im3aNFhaWW28jhc86LNs= +github.com/opencoff/go-utils v1.0.2/go.mod h1:eZkEVQVzNfuE8uGepyhscMsqcXq7liGbBHYYwgYaoy8= github.com/opencoff/pflag v1.0.6-sh1 h1:6RO8GgnpH928yu6earGDD01FnFT//bDJ1hCovcVVqY4= github.com/opencoff/pflag v1.0.6-sh1/go.mod h1:2bXtpAD/5h/2LarkbsRwiUxqnvB1nZBzn9Xjad1P41A= +github.com/opencoff/pflag v1.0.7 h1:o5cQIuX75bDcdJ6AXl68gzpA72a3CJ2MPStaMnEuwi4= +github.com/opencoff/pflag v1.0.7/go.mod h1:2bXtpAD/5h/2LarkbsRwiUxqnvB1nZBzn9Xjad1P41A= github.com/pkg/xattr v0.4.10 h1:Qe0mtiNFHQZ296vRgUjRCoPHPqH7VdTOrZx3g0T+pGA= github.com/pkg/xattr v0.4.10/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= github.com/planetscale/vtprotobuf v0.6.0 h1:nBeETjudeJ5ZgBHUz1fVHvbqUKnYOXNhsIEabROxmNA= github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4= github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= +github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg= +github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/sign/README.md b/sign/README.md index a867cc2..480aeaf 100644 --- a/sign/README.md +++ b/sign/README.md @@ -1,10 +1,10 @@ -[![GoDoc](https://godoc.org/github.com/opencoff/sigtool/sign?status.svg)](https://godoc.org/github.com/opencoff/sigtool/sign) +[![GoDoc](https://godoc.org/git.rgst.io/homelab/sigtool/v3/sign?status.svg)](https://godoc.org/git.rgst.io/homelab/sigtool/v3/sign) # sigtool/sign - Ed25519 signature calculation and verification This is a small library that makes it easier to create and serialize Ed25519 keys, and sign, verify files using those keys. The library uses mmap(2) to read and process very large files. -The companion program [sigtool](https://github.com/opencoff/sigtool) uses this library. +The companion program [sigtool](https://git.rgst.io/homelab/sigtool/v3) uses this library. ## License GPL v2.0 diff --git a/sign/encrypt.go b/sign/encrypt.go index 6db7e1c..ea190ed 100644 --- a/sign/encrypt.go +++ b/sign/encrypt.go @@ -70,13 +70,14 @@ import ( "crypto/subtle" "encoding/binary" "fmt" - "golang.org/x/crypto/curve25519" - "golang.org/x/crypto/hkdf" "hash" "io" "os" - "github.com/opencoff/sigtool/internal/pb" + "golang.org/x/crypto/curve25519" + "golang.org/x/crypto/hkdf" + + "git.rgst.io/homelab/sigtool/v3/internal/pb" ) // Encryption chunk size = 4MB diff --git a/src/crypt.go b/src/crypt.go index 9de5638..2754d90 100644 --- a/src/crypt.go +++ b/src/crypt.go @@ -20,10 +20,10 @@ import ( "os" "strings" + "git.rgst.io/homelab/sigtool/v3/sign" "github.com/opencoff/go-fio" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" - "github.com/opencoff/sigtool/sign" ) // sigtool encrypt [-i|--identity my.key] to.pub [to.pub] [ssh.pub] inputfile|- [-o output] diff --git a/src/gen.go b/src/gen.go index d99e16f..5530d76 100644 --- a/src/gen.go +++ b/src/gen.go @@ -18,9 +18,9 @@ import ( "os" "path" + "git.rgst.io/homelab/sigtool/v3/sign" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" - "github.com/opencoff/sigtool/sign" ) // Run the generate command diff --git a/src/sign.go b/src/sign.go index f6e92b0..3478d40 100644 --- a/src/sign.go +++ b/src/sign.go @@ -18,10 +18,10 @@ import ( "io" "os" + "git.rgst.io/homelab/sigtool/v3/sign" "github.com/opencoff/go-fio" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" - "github.com/opencoff/sigtool/sign" ) // Run the 'sign' command. diff --git a/src/sigtool.go b/src/sigtool.go index f22975a..4b31955 100644 --- a/src/sigtool.go +++ b/src/sigtool.go @@ -20,9 +20,9 @@ import ( "path" "strings" + "git.rgst.io/homelab/sigtool/v3/sign" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" - "github.com/opencoff/sigtool/sign" ) var Z string = path.Base(os.Args[0]) diff --git a/src/verify.go b/src/verify.go index 87ebd48..e05ff12 100644 --- a/src/verify.go +++ b/src/verify.go @@ -17,8 +17,8 @@ import ( "fmt" "os" + "git.rgst.io/homelab/sigtool/v3/sign" flag "github.com/opencoff/pflag" - "github.com/opencoff/sigtool/sign" ) func verify(args []string) {