diff --git a/go.mod b/go.mod index 310d090..9809162 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,24 @@ module github.com/opencoff/sigtool -go 1.21.1 +go 1.23.4 require ( github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a - github.com/opencoff/go-mmap v0.1.2 - github.com/opencoff/go-utils v0.9.3 + github.com/opencoff/go-fio v0.5.7 + 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/planetscale/vtprotobuf v0.6.0 - golang.org/x/crypto v0.21.0 - google.golang.org/protobuf v1.33.0 + golang.org/x/crypto v0.31.0 + google.golang.org/protobuf v1.36.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.18.0 // indirect + 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 ) //replace github.com/opencoff/go-mmap => ../go-mmap diff --git a/go.sum b/go.sum index 98b0e60..3cd7fc0 100644 --- a/go.sum +++ b/go.sum @@ -2,24 +2,31 @@ github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFn github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0= 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-mmap v0.1.2 h1:2yrYleq0x9cBruDRTafs7GZt4tCYmsUlvyN77HnY9hA= -github.com/opencoff/go-mmap v0.1.2/go.mod h1:+UjRnKQ3l5dLqSNAczz7zKI8LJ7mBhJhaSqU4S91tFs= -github.com/opencoff/go-utils v0.9.3 h1:Gdx1uB6QZ9/8FNU4h+94xGJ+onu8bQLRE4gyKRrrDD8= -github.com/opencoff/go-utils v0.9.3/go.mod h1:nNx572v21m3AkY9JomSXUG8iruY56Fm2zceNKNJDJaU= +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-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/pflag v1.0.6-sh1 h1:6RO8GgnpH928yu6earGDD01FnFT//bDJ1hCovcVVqY4= github.com/opencoff/pflag v1.0.6-sh1/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= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4= +github.com/puzpuzpuz/xsync/v3 v3.4.0/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/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/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= 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.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= +google.golang.org/protobuf v1.36.0/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/iomisc.go b/sign/iomisc.go index 45ddc05..cdc1eb3 100644 --- a/sign/iomisc.go +++ b/sign/iomisc.go @@ -16,8 +16,8 @@ package sign import ( "encoding/binary" "fmt" + "github.com/opencoff/go-fio" "github.com/opencoff/go-mmap" - "github.com/opencoff/go-utils" "hash" "os" ) @@ -28,9 +28,9 @@ import ( func writeFile(fn string, b []byte, ovwrite bool, mode uint32) error { var opts uint32 if ovwrite { - opts |= utils.OPT_OVERWRITE + opts |= fio.OPT_OVERWRITE } - sf, err := utils.NewSafeFile(fn, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(mode)) + sf, err := fio.NewSafeFile(fn, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(mode)) if err != nil { return err } diff --git a/src/crypt.go b/src/crypt.go index f04b580..9de5638 100644 --- a/src/crypt.go +++ b/src/crypt.go @@ -20,6 +20,7 @@ import ( "os" "strings" + "github.com/opencoff/go-fio" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" "github.com/opencoff/sigtool/sign" @@ -142,9 +143,9 @@ func encrypt(args []string) { var opts uint32 if force { - opts |= utils.OPT_OVERWRITE + opts |= fio.OPT_OVERWRITE } - sf, err := utils.NewSafeFile(outfile, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode) + sf, err := fio.NewSafeFile(outfile, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode) if err != nil { Die("%s", err) } @@ -308,9 +309,9 @@ func decrypt(args []string) { var opts uint32 if force { - opts |= utils.OPT_OVERWRITE + opts |= fio.OPT_OVERWRITE } - sf, err := utils.NewSafeFile(outfile, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode) + sf, err := fio.NewSafeFile(outfile, opts, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode) if err != nil { Die("%s", err) } diff --git a/src/sign.go b/src/sign.go index 154ff4a..f6e92b0 100644 --- a/src/sign.go +++ b/src/sign.go @@ -18,6 +18,7 @@ import ( "io" "os" + "github.com/opencoff/go-fio" "github.com/opencoff/go-utils" flag "github.com/opencoff/pflag" "github.com/opencoff/sigtool/sign" @@ -70,9 +71,9 @@ Options: if outf != "-" { var opts uint32 if force { - opts |= utils.OPT_OVERWRITE + opts |= fio.OPT_OVERWRITE } - sf, err := utils.NewSafeFile(outf, opts, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) + sf, err := fio.NewSafeFile(outf, opts, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) if err != nil { Die("can't create sig file: %s", err) }