From c1a1c0bba92c817da72443e8e5c3d0160acc10eb Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 09:11:07 -0500 Subject: [PATCH 1/9] build: update runner and go version --- .github/workflows/pr.yml | 6 +++--- .github/workflows/push.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b5b6ddeed5..556876d773 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,7 +11,7 @@ jobs: - name: install Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x - name: install deps run: go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest @@ -37,7 +37,7 @@ jobs: skip-pkg-cache: true test: - runs-on: ubuntu-22.04-16core + runs-on: ubuntu-latest-128 permissions: pull-requests: write outputs: @@ -48,7 +48,7 @@ jobs: - name: install Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x - name: install deps run: | diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index de5c293f71..8b95384f10 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -14,7 +14,7 @@ jobs: - name: install Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x - name: install deps run: go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest @@ -42,8 +42,8 @@ jobs: test: strategy: matrix: - go-version: [1.21.x] - os: [ubuntu-22.04-16core, windows-latest, macos-latest] + go-version: [1.23.x] + os: [ubuntu-latest-128, windows-latest, macos-latest] runs-on: ${{ matrix.os }} needs: - staticcheck From fe7f39dcafb4e36a1022101e20bde517cfb90bb3 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 09:48:15 -0500 Subject: [PATCH 2/9] build: fix new gosec linter --- .github/workflows/pr.yml | 2 +- .github/workflows/push.yml | 2 +- ecc/bls12-377/fr/sis/sis_test.go | 2 +- ecc/bn254/fr/sis/sis_test.go | 2 +- ecc/bn254/fr/tensor-commitment/commitment.go | 5 +++-- ecc/stark-curve/hash_to_g1.go | 3 ++- ecc/stark-curve/marshal.go | 12 ++++++------ field/generator/config/field_config.go | 2 +- field/hash/hashutils.go | 9 ++++++--- internal/generator/config/hash_to_curve.go | 2 +- utils/unsafe/dump_slice.go | 17 +++++++++-------- 11 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 556876d773..881f81418c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,7 +32,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.54 + version: v1.60 args: -v --timeout=5m skip-pkg-cache: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8b95384f10..7e7bde3768 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -35,7 +35,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.54 + version: v1.60 args: -v --timeout=5m skip-pkg-cache: true diff --git a/ecc/bls12-377/fr/sis/sis_test.go b/ecc/bls12-377/fr/sis/sis_test.go index 9243aede27..f9d802e621 100644 --- a/ecc/bls12-377/fr/sis/sis_test.go +++ b/ecc/bls12-377/fr/sis/sis_test.go @@ -404,7 +404,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) { } sum := r.Sum(nil) var rlen [4]byte - binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) + binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum)) var result fr.Vector _, err := result.ReadFrom(reader) diff --git a/ecc/bn254/fr/sis/sis_test.go b/ecc/bn254/fr/sis/sis_test.go index 24a14b46c9..cab3fbd489 100644 --- a/ecc/bn254/fr/sis/sis_test.go +++ b/ecc/bn254/fr/sis/sis_test.go @@ -368,7 +368,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) { } sum := r.Sum(nil) var rlen [4]byte - binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) + binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum)) var result fr.Vector _, err := result.ReadFrom(reader) diff --git a/ecc/bn254/fr/tensor-commitment/commitment.go b/ecc/bn254/fr/tensor-commitment/commitment.go index 923cbef2af..64de4a0132 100644 --- a/ecc/bn254/fr/tensor-commitment/commitment.go +++ b/ecc/bn254/fr/tensor-commitment/commitment.go @@ -134,7 +134,7 @@ func NewTCParams(codeRate, NbColumns, NbRows int, makeHash func() hash.Hash) (*T res.Domains[1] = fft.NewDomain(uint64(codeRate * NbColumns)) // size of the matrix - res.NbColumns = int(res.Domains[0].Cardinality) + res.NbColumns = int(res.Domains[0].Cardinality) // #nosec G115 not overflow territory here res.NbRows = NbRows // rate @@ -285,7 +285,8 @@ func (tc *TensorCommitment) Commit() (Digest, error) { // now we hash each columns of _p res := make([][]byte, tc.params.Domains[1].Cardinality) - parallel.Execute(int(tc.params.Domains[1].Cardinality), func(start, stop int) { + cardinality := int(tc.params.Domains[1].Cardinality) // #nosec G115 not overflow territory here + parallel.Execute(cardinality, func(start, stop int) { hasher := tc.params.MakeHash() for i := start; i < stop; i++ { hasher.Reset() diff --git a/ecc/stark-curve/hash_to_g1.go b/ecc/stark-curve/hash_to_g1.go index 58d319230f..20b5a0998b 100644 --- a/ecc/stark-curve/hash_to_g1.go +++ b/ecc/stark-curve/hash_to_g1.go @@ -93,7 +93,8 @@ func MapToCurve1(u *fp.Element) G1Affine { signsNotEqual := g1Sgn0(u) ^ g1Sgn0(&y) // 34. e3 = sgn0(u) == sgn0(y) tv1.Neg(&y) - y.Select(int(signsNotEqual), &y, &tv1) // 35. y = CMOV(-y, y, e3) # Select correct sign of y + // 35. y = CMOV(-y, y, e3) # Select correct sign of y + y.Select(int(signsNotEqual), &y, &tv1) // #nosec G115 not overflow territory here return G1Affine{x, y} } diff --git a/ecc/stark-curve/marshal.go b/ecc/stark-curve/marshal.go index f2c78c3e9b..c815b491cd 100644 --- a/ecc/stark-curve/marshal.go +++ b/ecc/stark-curve/marshal.go @@ -330,7 +330,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { return case []fr.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } @@ -347,7 +347,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { return nil case []fp.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } @@ -365,7 +365,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { case []G1Affine: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } @@ -420,7 +420,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { return case []fr.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } @@ -437,7 +437,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { return nil case []fp.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } @@ -455,7 +455,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { case []G1Affine: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here if err != nil { return } diff --git a/field/generator/config/field_config.go b/field/generator/config/field_config.go index 457a89d7d2..7c8b57d15a 100644 --- a/field/generator/config/field_config.go +++ b/field/generator/config/field_config.go @@ -415,7 +415,7 @@ func (f *FieldConfig) WriteElement(element Element) string { var subElementNames string if length > 1 { builder.WriteString("\n") - subElementNames = CoordNameForExtensionDegree(uint8(length)) + subElementNames = CoordNameForExtensionDegree(uint8(length)) // #nosec G115 not overflow territory here } for i, e := range element { if length > 1 { diff --git a/field/hash/hashutils.go b/field/hash/hashutils.go index 7c3b970686..9cf35d0328 100644 --- a/field/hash/hashutils.go +++ b/field/hash/hashutils.go @@ -18,7 +18,7 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if len(dst) > 255 { return nil, errors.New("invalid domain size (>255 bytes)") } - sizeDomain := uint8(len(dst)) + sizeDomain := uint8(len(dst)) // #nosec G115 not overflow territory here, checked above // Z_pad = I2OSP(0, r_in_bytes) // l_i_b_str = I2OSP(len_in_bytes, 2) @@ -31,7 +31,9 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if _, err := h.Write(msg); err != nil { return nil, err } - if _, err := h.Write([]byte{uint8(lenInBytes >> 8), uint8(lenInBytes), uint8(0)}); err != nil { + s := uint8(lenInBytes >> 8) // #nosec G115 not overflow territory here + b := uint8(lenInBytes) // #nosec G115 not overflow territory here + if _, err := h.Write([]byte{s, b, 0}); err != nil { return nil, err } if _, err := h.Write(dst); err != nil { @@ -71,7 +73,8 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if _, err := h.Write(strxor); err != nil { return nil, err } - if _, err := h.Write([]byte{uint8(i)}); err != nil { + bi := uint8(i) // #nosec G115 not overflow territory here + if _, err := h.Write([]byte{bi}); err != nil { return nil, err } if _, err := h.Write(dst); err != nil { diff --git a/internal/generator/config/hash_to_curve.go b/internal/generator/config/hash_to_curve.go index cb7c5b9142..7bd11fc811 100644 --- a/internal/generator/config/hash_to_curve.go +++ b/internal/generator/config/hash_to_curve.go @@ -77,7 +77,7 @@ func (parameters *HashSuiteSvdw) GetInfo(baseField *field.FieldConfig, g *Point, func (suite *HashSuiteSswu) GetInfo(baseField *field.FieldConfig, g *Point, name string) HashSuiteInfo { f := field.NewTower(baseField, g.CoordExtDegree, g.CoordExtRoot) - fieldSizeMod256 := uint8(f.Size.Bits()[0]) + fieldSizeMod256 := uint8(f.Size.Bits()[0]) // #nosec G115 false positive Z := toBigIntSlice(suite.Z) var c []field.Element diff --git a/utils/unsafe/dump_slice.go b/utils/unsafe/dump_slice.go index 7a14c61c13..291bd2e96b 100644 --- a/utils/unsafe/dump_slice.go +++ b/utils/unsafe/dump_slice.go @@ -15,7 +15,7 @@ import ( // (e.g. 32 vs 64 bit, big endian vs little endian). func WriteSlice[S ~[]E, E any](w io.Writer, s S) error { var e E - size := int(unsafe.Sizeof(e)) + size := int(unsafe.Sizeof(e)) // #nosec G115 not overflow territory here if err := binary.Write(w, binary.LittleEndian, uint64(len(s))); err != nil { return err } @@ -43,9 +43,10 @@ func ReadSlice[S ~[]E, E any](r io.Reader, maxElements ...int) (s S, read int, e length := binary.LittleEndian.Uint64(buf[:]) var e E - size := int(unsafe.Sizeof(e)) + size := int(unsafe.Sizeof(e)) // #nosec G115 not overflow territory here limit := length - if len(maxElements) == 1 && maxElements[0] > 0 && int(length) > maxElements[0] { + iLength := int(length) // #nosec G115 safe to ignore + if len(maxElements) == 1 && maxElements[0] > 0 && iLength > maxElements[0] { limit = uint64(maxElements[0]) } @@ -57,16 +58,16 @@ func ReadSlice[S ~[]E, E any](r io.Reader, maxElements ...int) (s S, read int, e // directly read the bytes from reader into the target memory area // (slice data) - data := unsafe.Slice((*byte)(unsafe.Pointer(&toReturn[0])), size*int(limit)) + data := unsafe.Slice((*byte)(unsafe.Pointer(&toReturn[0])), size*int(limit)) // #nosec G115 safe to ignore if _, err := io.ReadFull(r, data); err != nil { return nil, read, err } - read += size * int(limit) + read += size * int(limit) // #nosec G115 safe to ignore // advance the reader if we had more elements than we wanted if length > limit { - advance := int(length-limit) * size + advance := int(length-limit) * size // #nosec G115 not overflow territory here if _, err := io.CopyN(io.Discard, r, int64(advance)); err != nil { return nil, read, err } @@ -82,7 +83,7 @@ const marker uint64 = 0xdeadbeef // This is used to ensure that the dump was written on the same architecture. func WriteMarker(w io.Writer) error { marker := marker - _, err := w.Write(unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8)) + _, err := w.Write(unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8)) // #nosec G115 unsafe, but we know it. return err } @@ -94,7 +95,7 @@ func ReadMarker(r io.Reader) error { return err } marker := marker - d := unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8) + d := unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8) // #nosec G115 unsafe, but we know it. if !bytes.Equal(d, buf[:]) { return errors.New("marker mismatch: dump was not written on the same architecture") } From b4df832527363d97662eea7dc9eedc58784078d0 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 09:50:53 -0500 Subject: [PATCH 3/9] build: update go.mod --- go.mod | 16 +- go.sum | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 613 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 9d51c11c65..f1e439cbc4 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,22 @@ module github.com/consensys/gnark-crypto -go 1.19 +go 1.22 require ( - github.com/bits-and-blooms/bitset v1.7.0 + github.com/bits-and-blooms/bitset v1.14.2 github.com/consensys/bavard v0.1.13 - github.com/leanovate/gopter v0.2.9 + github.com/leanovate/gopter v0.2.11 github.com/mmcloughlin/addchain v0.4.0 - github.com/spf13/cobra v1.5.0 - github.com/stretchr/testify v1.8.2 - golang.org/x/crypto v0.17.0 - golang.org/x/sys v0.15.0 + github.com/spf13/cobra v1.8.1 + github.com/stretchr/testify v1.9.0 + golang.org/x/crypto v0.26.0 + golang.org/x/sys v0.24.0 gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/go.sum b/go.sum index d9471f8966..e6a6f98bbc 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,184 @@ -github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo= -github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.14.2 h1:YXVoyPndbdvcEVcseEovVfp0qjJp7S+i5+xgp/Nfbdc= +github.com/bits-and-blooms/bitset v1.14.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -17,39 +186,457 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= -github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= +github.com/leanovate/gopter v0.2.11 h1:vRjThO1EKPb/1NsDXuDrzldR28RLkBflWYcU9CvzWu4= +github.com/leanovate/gopter v0.2.11/go.mod h1:aK3tzZP/C+p1m3SPRE4SYZFGP7jjkuSI4f7Xvpt0S9c= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= From 1b01334d258b32a928e21e9985c73b6f1c611848 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 10:00:44 -0500 Subject: [PATCH 4/9] Revert "build: fix new gosec linter" This reverts commit fe7f39dcafb4e36a1022101e20bde517cfb90bb3. --- .github/workflows/pr.yml | 2 +- .github/workflows/push.yml | 2 +- ecc/bls12-377/fr/sis/sis_test.go | 2 +- ecc/bn254/fr/sis/sis_test.go | 2 +- ecc/bn254/fr/tensor-commitment/commitment.go | 5 ++--- ecc/stark-curve/hash_to_g1.go | 3 +-- ecc/stark-curve/marshal.go | 12 ++++++------ field/generator/config/field_config.go | 2 +- field/hash/hashutils.go | 9 +++------ internal/generator/config/hash_to_curve.go | 2 +- utils/unsafe/dump_slice.go | 17 ++++++++--------- 11 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 881f81418c..556876d773 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,7 +32,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.60 + version: v1.54 args: -v --timeout=5m skip-pkg-cache: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7e7bde3768..8b95384f10 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -35,7 +35,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.60 + version: v1.54 args: -v --timeout=5m skip-pkg-cache: true diff --git a/ecc/bls12-377/fr/sis/sis_test.go b/ecc/bls12-377/fr/sis/sis_test.go index f9d802e621..9243aede27 100644 --- a/ecc/bls12-377/fr/sis/sis_test.go +++ b/ecc/bls12-377/fr/sis/sis_test.go @@ -404,7 +404,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) { } sum := r.Sum(nil) var rlen [4]byte - binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here + binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum)) var result fr.Vector _, err := result.ReadFrom(reader) diff --git a/ecc/bn254/fr/sis/sis_test.go b/ecc/bn254/fr/sis/sis_test.go index cab3fbd489..24a14b46c9 100644 --- a/ecc/bn254/fr/sis/sis_test.go +++ b/ecc/bn254/fr/sis/sis_test.go @@ -368,7 +368,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) { } sum := r.Sum(nil) var rlen [4]byte - binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here + binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum)) var result fr.Vector _, err := result.ReadFrom(reader) diff --git a/ecc/bn254/fr/tensor-commitment/commitment.go b/ecc/bn254/fr/tensor-commitment/commitment.go index 64de4a0132..923cbef2af 100644 --- a/ecc/bn254/fr/tensor-commitment/commitment.go +++ b/ecc/bn254/fr/tensor-commitment/commitment.go @@ -134,7 +134,7 @@ func NewTCParams(codeRate, NbColumns, NbRows int, makeHash func() hash.Hash) (*T res.Domains[1] = fft.NewDomain(uint64(codeRate * NbColumns)) // size of the matrix - res.NbColumns = int(res.Domains[0].Cardinality) // #nosec G115 not overflow territory here + res.NbColumns = int(res.Domains[0].Cardinality) res.NbRows = NbRows // rate @@ -285,8 +285,7 @@ func (tc *TensorCommitment) Commit() (Digest, error) { // now we hash each columns of _p res := make([][]byte, tc.params.Domains[1].Cardinality) - cardinality := int(tc.params.Domains[1].Cardinality) // #nosec G115 not overflow territory here - parallel.Execute(cardinality, func(start, stop int) { + parallel.Execute(int(tc.params.Domains[1].Cardinality), func(start, stop int) { hasher := tc.params.MakeHash() for i := start; i < stop; i++ { hasher.Reset() diff --git a/ecc/stark-curve/hash_to_g1.go b/ecc/stark-curve/hash_to_g1.go index 20b5a0998b..58d319230f 100644 --- a/ecc/stark-curve/hash_to_g1.go +++ b/ecc/stark-curve/hash_to_g1.go @@ -93,8 +93,7 @@ func MapToCurve1(u *fp.Element) G1Affine { signsNotEqual := g1Sgn0(u) ^ g1Sgn0(&y) // 34. e3 = sgn0(u) == sgn0(y) tv1.Neg(&y) - // 35. y = CMOV(-y, y, e3) # Select correct sign of y - y.Select(int(signsNotEqual), &y, &tv1) // #nosec G115 not overflow territory here + y.Select(int(signsNotEqual), &y, &tv1) // 35. y = CMOV(-y, y, e3) # Select correct sign of y return G1Affine{x, y} } diff --git a/ecc/stark-curve/marshal.go b/ecc/stark-curve/marshal.go index c815b491cd..f2c78c3e9b 100644 --- a/ecc/stark-curve/marshal.go +++ b/ecc/stark-curve/marshal.go @@ -330,7 +330,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { return case []fr.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } @@ -347,7 +347,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { return nil case []fp.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } @@ -365,7 +365,7 @@ func (enc *Encoder) encode(v interface{}) (err error) { case []G1Affine: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } @@ -420,7 +420,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { return case []fr.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } @@ -437,7 +437,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { return nil case []fp.Element: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } @@ -455,7 +455,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) { case []G1Affine: // write slice length - err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here + err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) if err != nil { return } diff --git a/field/generator/config/field_config.go b/field/generator/config/field_config.go index 7c8b57d15a..457a89d7d2 100644 --- a/field/generator/config/field_config.go +++ b/field/generator/config/field_config.go @@ -415,7 +415,7 @@ func (f *FieldConfig) WriteElement(element Element) string { var subElementNames string if length > 1 { builder.WriteString("\n") - subElementNames = CoordNameForExtensionDegree(uint8(length)) // #nosec G115 not overflow territory here + subElementNames = CoordNameForExtensionDegree(uint8(length)) } for i, e := range element { if length > 1 { diff --git a/field/hash/hashutils.go b/field/hash/hashutils.go index 9cf35d0328..7c3b970686 100644 --- a/field/hash/hashutils.go +++ b/field/hash/hashutils.go @@ -18,7 +18,7 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if len(dst) > 255 { return nil, errors.New("invalid domain size (>255 bytes)") } - sizeDomain := uint8(len(dst)) // #nosec G115 not overflow territory here, checked above + sizeDomain := uint8(len(dst)) // Z_pad = I2OSP(0, r_in_bytes) // l_i_b_str = I2OSP(len_in_bytes, 2) @@ -31,9 +31,7 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if _, err := h.Write(msg); err != nil { return nil, err } - s := uint8(lenInBytes >> 8) // #nosec G115 not overflow territory here - b := uint8(lenInBytes) // #nosec G115 not overflow territory here - if _, err := h.Write([]byte{s, b, 0}); err != nil { + if _, err := h.Write([]byte{uint8(lenInBytes >> 8), uint8(lenInBytes), uint8(0)}); err != nil { return nil, err } if _, err := h.Write(dst); err != nil { @@ -73,8 +71,7 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) { if _, err := h.Write(strxor); err != nil { return nil, err } - bi := uint8(i) // #nosec G115 not overflow territory here - if _, err := h.Write([]byte{bi}); err != nil { + if _, err := h.Write([]byte{uint8(i)}); err != nil { return nil, err } if _, err := h.Write(dst); err != nil { diff --git a/internal/generator/config/hash_to_curve.go b/internal/generator/config/hash_to_curve.go index 7bd11fc811..cb7c5b9142 100644 --- a/internal/generator/config/hash_to_curve.go +++ b/internal/generator/config/hash_to_curve.go @@ -77,7 +77,7 @@ func (parameters *HashSuiteSvdw) GetInfo(baseField *field.FieldConfig, g *Point, func (suite *HashSuiteSswu) GetInfo(baseField *field.FieldConfig, g *Point, name string) HashSuiteInfo { f := field.NewTower(baseField, g.CoordExtDegree, g.CoordExtRoot) - fieldSizeMod256 := uint8(f.Size.Bits()[0]) // #nosec G115 false positive + fieldSizeMod256 := uint8(f.Size.Bits()[0]) Z := toBigIntSlice(suite.Z) var c []field.Element diff --git a/utils/unsafe/dump_slice.go b/utils/unsafe/dump_slice.go index 291bd2e96b..7a14c61c13 100644 --- a/utils/unsafe/dump_slice.go +++ b/utils/unsafe/dump_slice.go @@ -15,7 +15,7 @@ import ( // (e.g. 32 vs 64 bit, big endian vs little endian). func WriteSlice[S ~[]E, E any](w io.Writer, s S) error { var e E - size := int(unsafe.Sizeof(e)) // #nosec G115 not overflow territory here + size := int(unsafe.Sizeof(e)) if err := binary.Write(w, binary.LittleEndian, uint64(len(s))); err != nil { return err } @@ -43,10 +43,9 @@ func ReadSlice[S ~[]E, E any](r io.Reader, maxElements ...int) (s S, read int, e length := binary.LittleEndian.Uint64(buf[:]) var e E - size := int(unsafe.Sizeof(e)) // #nosec G115 not overflow territory here + size := int(unsafe.Sizeof(e)) limit := length - iLength := int(length) // #nosec G115 safe to ignore - if len(maxElements) == 1 && maxElements[0] > 0 && iLength > maxElements[0] { + if len(maxElements) == 1 && maxElements[0] > 0 && int(length) > maxElements[0] { limit = uint64(maxElements[0]) } @@ -58,16 +57,16 @@ func ReadSlice[S ~[]E, E any](r io.Reader, maxElements ...int) (s S, read int, e // directly read the bytes from reader into the target memory area // (slice data) - data := unsafe.Slice((*byte)(unsafe.Pointer(&toReturn[0])), size*int(limit)) // #nosec G115 safe to ignore + data := unsafe.Slice((*byte)(unsafe.Pointer(&toReturn[0])), size*int(limit)) if _, err := io.ReadFull(r, data); err != nil { return nil, read, err } - read += size * int(limit) // #nosec G115 safe to ignore + read += size * int(limit) // advance the reader if we had more elements than we wanted if length > limit { - advance := int(length-limit) * size // #nosec G115 not overflow territory here + advance := int(length-limit) * size if _, err := io.CopyN(io.Discard, r, int64(advance)); err != nil { return nil, read, err } @@ -83,7 +82,7 @@ const marker uint64 = 0xdeadbeef // This is used to ensure that the dump was written on the same architecture. func WriteMarker(w io.Writer) error { marker := marker - _, err := w.Write(unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8)) // #nosec G115 unsafe, but we know it. + _, err := w.Write(unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8)) return err } @@ -95,7 +94,7 @@ func ReadMarker(r io.Reader) error { return err } marker := marker - d := unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8) // #nosec G115 unsafe, but we know it. + d := unsafe.Slice((*byte)(unsafe.Pointer(&marker)), 8) if !bytes.Equal(d, buf[:]) { return errors.New("marker mismatch: dump was not written on the same architecture") } From 9ceb42fe98d33879981d97e1484c400eee31ae07 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 10:03:48 -0500 Subject: [PATCH 5/9] build: update linter and github actions stuff --- .github/workflows/pr.yml | 12 ++++++------ .github/workflows/push.yml | 12 ++++++------ .golangci.yml | 5 ++++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 556876d773..15fac96577 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: with: fetch-depth: 0 - name: install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.23.x @@ -30,9 +30,9 @@ jobs: find . -type f -name '*.go' -exec sed -i 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; # on macos: find . -type f -name '*.go' -exec sed -i '' -E 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.54 + version: v1.60 args: -v --timeout=5m skip-pkg-cache: true @@ -46,7 +46,7 @@ jobs: - name: checkout code uses: actions/checkout@v4 - name: install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.23.x @@ -99,7 +99,7 @@ jobs: steps: - name: Notify slack -- workflow failed id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 with: payload: | { @@ -124,7 +124,7 @@ jobs: steps: - name: Notify slack -- workflow succeeded id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 with: payload: | { diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8b95384f10..e23d8ed647 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -12,7 +12,7 @@ jobs: with: fetch-depth: 0 - name: install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.23.x @@ -33,9 +33,9 @@ jobs: find . -type f -name '*.go' -exec sed -i 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; # on macos: find . -type f -name '*.go' -exec sed -i '' -E 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.54 + version: v1.60 args: -v --timeout=5m skip-pkg-cache: true @@ -53,7 +53,7 @@ jobs: - name: checkout code uses: actions/checkout@v4 - name: install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} @@ -102,7 +102,7 @@ jobs: steps: - name: Notify slack -- workflow failed id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 with: payload: | { @@ -127,7 +127,7 @@ jobs: steps: - name: Notify slack -- workflow succeeded id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 with: payload: | { diff --git a/.golangci.yml b/.golangci.yml index 04ae36669f..e30a16a61e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -8,6 +8,9 @@ linters: - govet - ineffassign - misspell - +linters-settings: + gosec: + excludes: + - G115 # Conversions from int -> uint etc. run: issues-exit-code: 1 \ No newline at end of file From 11b26788db695f5a750f33c2e8114f2f51ea7a70 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 10:09:37 -0500 Subject: [PATCH 6/9] fix previous commit --- .github/workflows/pr.yml | 1 - .github/workflows/push.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 15fac96577..62f16afa4f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,7 +34,6 @@ jobs: with: version: v1.60 args: -v --timeout=5m - skip-pkg-cache: true test: runs-on: ubuntu-latest-128 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e23d8ed647..939f19236f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -37,7 +37,6 @@ jobs: with: version: v1.60 args: -v --timeout=5m - skip-pkg-cache: true test: strategy: From b03a710c6678b4977e21221423bffec3c814511f Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 10:32:07 -0500 Subject: [PATCH 7/9] fix: linter errors --- ecc/bls12-377/g1_test.go | 2 +- ecc/bls12-377/g2_test.go | 2 +- ecc/bls12-377/marshal_test.go | 9 +++-- ecc/bls12-377/multiexp_test.go | 39 ++++++++----------- ecc/bls12-377/twistededwards/point_test.go | 2 +- ecc/bls12-378/g1_test.go | 2 +- ecc/bls12-378/g2_test.go | 2 +- ecc/bls12-378/marshal_test.go | 9 +++-- ecc/bls12-378/multiexp_test.go | 39 ++++++++----------- ecc/bls12-378/twistededwards/point_test.go | 2 +- ecc/bls12-381/bandersnatch/point_test.go | 2 +- ecc/bls12-381/g1_test.go | 2 +- ecc/bls12-381/g2_test.go | 2 +- ecc/bls12-381/marshal_test.go | 9 +++-- ecc/bls12-381/multiexp_test.go | 39 ++++++++----------- ecc/bls12-381/twistededwards/point_test.go | 2 +- ecc/bls24-315/g1_test.go | 2 +- ecc/bls24-315/g2_test.go | 2 +- ecc/bls24-315/marshal_test.go | 9 +++-- ecc/bls24-315/multiexp_test.go | 39 ++++++++----------- ecc/bls24-315/twistededwards/point_test.go | 2 +- ecc/bls24-317/g1_test.go | 2 +- ecc/bls24-317/g2_test.go | 2 +- ecc/bls24-317/marshal_test.go | 9 +++-- ecc/bls24-317/multiexp_test.go | 39 ++++++++----------- ecc/bls24-317/twistededwards/point_test.go | 2 +- ecc/bn254/g1_test.go | 2 +- ecc/bn254/g2_test.go | 2 +- ecc/bn254/marshal_test.go | 5 ++- ecc/bn254/multiexp_test.go | 39 ++++++++----------- ecc/bn254/twistededwards/point_test.go | 2 +- ecc/bw6-633/g1_test.go | 2 +- ecc/bw6-633/g2_test.go | 2 +- ecc/bw6-633/marshal_test.go | 9 +++-- ecc/bw6-633/multiexp_test.go | 39 ++++++++----------- ecc/bw6-633/twistededwards/point_test.go | 2 +- ecc/bw6-756/g1_test.go | 2 +- ecc/bw6-756/g2_test.go | 2 +- ecc/bw6-756/marshal_test.go | 9 +++-- ecc/bw6-756/multiexp_test.go | 39 ++++++++----------- ecc/bw6-756/twistededwards/point_test.go | 2 +- ecc/bw6-761/g1_test.go | 2 +- ecc/bw6-761/g2_test.go | 2 +- ecc/bw6-761/marshal_test.go | 9 +++-- ecc/bw6-761/multiexp_test.go | 39 ++++++++----------- ecc/bw6-761/twistededwards/point_test.go | 2 +- ecc/secp256k1/g1_test.go | 6 ++- ecc/secp256k1/multiexp_test.go | 21 +++++----- ecc/stark-curve/g1.go | 25 ------------ ecc/stark-curve/hash_to_g1.go | 6 --- .../ecc/template/tests/marshal.go.tmpl | 7 ++-- .../ecc/template/tests/multiexp.go.tmpl | 21 +++++----- .../ecc/template/tests/point.go.tmpl | 8 +++- .../edwards/template/tests/point.go.tmpl | 2 +- 54 files changed, 257 insertions(+), 323 deletions(-) diff --git a/ecc/bls12-377/g1_test.go b/ecc/bls12-377/g1_test.go index c2558e677c..d06b56297d 100644 --- a/ecc/bls12-377/g1_test.go +++ b/ecc/bls12-377/g1_test.go @@ -19,7 +19,7 @@ package bls12377 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-377/fp" diff --git a/ecc/bls12-377/g2_test.go b/ecc/bls12-377/g2_test.go index 6e7876ee6a..4bd4b9a82f 100644 --- a/ecc/bls12-377/g2_test.go +++ b/ecc/bls12-377/g2_test.go @@ -19,7 +19,7 @@ package bls12377 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-377/internal/fptower" diff --git a/ecc/bls12-377/marshal_test.go b/ecc/bls12-377/marshal_test.go index ee92ec4fd1..c2fdf2c70a 100644 --- a/ecc/bls12-377/marshal_test.go +++ b/ecc/bls12-377/marshal_test.go @@ -18,9 +18,10 @@ package bls12377 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -518,7 +519,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bls12-377/multiexp_test.go b/ecc/bls12-377/multiexp_test.go index 712b8f7d33..4d387cf87d 100644 --- a/ecc/bls12-377/multiexp_test.go +++ b/ecc/bls12-377/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bls12-377/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bls12-377/twistededwards/point_test.go b/ecc/bls12-377/twistededwards/point_test.go index 8c013f0d9a..451a00d172 100644 --- a/ecc/bls12-377/twistededwards/point_test.go +++ b/ecc/bls12-377/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-377/fr" diff --git a/ecc/bls12-378/g1_test.go b/ecc/bls12-378/g1_test.go index 8fd0e260bc..02e3753ef0 100644 --- a/ecc/bls12-378/g1_test.go +++ b/ecc/bls12-378/g1_test.go @@ -19,7 +19,7 @@ package bls12378 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-378/fp" diff --git a/ecc/bls12-378/g2_test.go b/ecc/bls12-378/g2_test.go index ac43de8601..e28b5e748b 100644 --- a/ecc/bls12-378/g2_test.go +++ b/ecc/bls12-378/g2_test.go @@ -19,7 +19,7 @@ package bls12378 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-378/internal/fptower" diff --git a/ecc/bls12-378/marshal_test.go b/ecc/bls12-378/marshal_test.go index 40da636abf..d3347e5bcd 100644 --- a/ecc/bls12-378/marshal_test.go +++ b/ecc/bls12-378/marshal_test.go @@ -18,9 +18,10 @@ package bls12378 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -518,7 +519,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bls12-378/multiexp_test.go b/ecc/bls12-378/multiexp_test.go index ad7d9474d1..2624ad4311 100644 --- a/ecc/bls12-378/multiexp_test.go +++ b/ecc/bls12-378/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bls12-378/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bls12-378/twistededwards/point_test.go b/ecc/bls12-378/twistededwards/point_test.go index 8d6f7ba79a..78415ebb55 100644 --- a/ecc/bls12-378/twistededwards/point_test.go +++ b/ecc/bls12-378/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-378/fr" diff --git a/ecc/bls12-381/bandersnatch/point_test.go b/ecc/bls12-381/bandersnatch/point_test.go index d15969e2ab..173f6da392 100644 --- a/ecc/bls12-381/bandersnatch/point_test.go +++ b/ecc/bls12-381/bandersnatch/point_test.go @@ -17,8 +17,8 @@ package bandersnatch import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" diff --git a/ecc/bls12-381/g1_test.go b/ecc/bls12-381/g1_test.go index 7f0fab5a19..7dc98ec19b 100644 --- a/ecc/bls12-381/g1_test.go +++ b/ecc/bls12-381/g1_test.go @@ -19,7 +19,7 @@ package bls12381 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-381/fp" diff --git a/ecc/bls12-381/g2_test.go b/ecc/bls12-381/g2_test.go index d414651c6d..122713eb51 100644 --- a/ecc/bls12-381/g2_test.go +++ b/ecc/bls12-381/g2_test.go @@ -19,7 +19,7 @@ package bls12381 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-381/internal/fptower" diff --git a/ecc/bls12-381/marshal_test.go b/ecc/bls12-381/marshal_test.go index e8854899ea..df3db5c919 100644 --- a/ecc/bls12-381/marshal_test.go +++ b/ecc/bls12-381/marshal_test.go @@ -18,9 +18,10 @@ package bls12381 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -518,7 +519,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bls12-381/multiexp_test.go b/ecc/bls12-381/multiexp_test.go index 92dd4c7eb4..367af5148e 100644 --- a/ecc/bls12-381/multiexp_test.go +++ b/ecc/bls12-381/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bls12-381/twistededwards/point_test.go b/ecc/bls12-381/twistededwards/point_test.go index adb988a04c..699a1fe518 100644 --- a/ecc/bls12-381/twistededwards/point_test.go +++ b/ecc/bls12-381/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" diff --git a/ecc/bls24-315/g1_test.go b/ecc/bls24-315/g1_test.go index c2fed674d6..6a1cafa115 100644 --- a/ecc/bls24-315/g1_test.go +++ b/ecc/bls24-315/g1_test.go @@ -19,7 +19,7 @@ package bls24315 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-315/fp" diff --git a/ecc/bls24-315/g2_test.go b/ecc/bls24-315/g2_test.go index 9fb276cc1b..43e953e318 100644 --- a/ecc/bls24-315/g2_test.go +++ b/ecc/bls24-315/g2_test.go @@ -19,7 +19,7 @@ package bls24315 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-315/internal/fptower" diff --git a/ecc/bls24-315/marshal_test.go b/ecc/bls24-315/marshal_test.go index 3331ffccfb..c57d98ed04 100644 --- a/ecc/bls24-315/marshal_test.go +++ b/ecc/bls24-315/marshal_test.go @@ -18,9 +18,10 @@ package bls24315 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -528,7 +529,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bls24-315/multiexp_test.go b/ecc/bls24-315/multiexp_test.go index 7961763cf1..9b091a337e 100644 --- a/ecc/bls24-315/multiexp_test.go +++ b/ecc/bls24-315/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bls24-315/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bls24-315/twistededwards/point_test.go b/ecc/bls24-315/twistededwards/point_test.go index e7bec5f9d3..9d57e542b1 100644 --- a/ecc/bls24-315/twistededwards/point_test.go +++ b/ecc/bls24-315/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-315/fr" diff --git a/ecc/bls24-317/g1_test.go b/ecc/bls24-317/g1_test.go index c4909aa9c3..5c2154b6e1 100644 --- a/ecc/bls24-317/g1_test.go +++ b/ecc/bls24-317/g1_test.go @@ -19,7 +19,7 @@ package bls24317 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-317/fp" diff --git a/ecc/bls24-317/g2_test.go b/ecc/bls24-317/g2_test.go index 8d11b24221..9424bac50e 100644 --- a/ecc/bls24-317/g2_test.go +++ b/ecc/bls24-317/g2_test.go @@ -19,7 +19,7 @@ package bls24317 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-317/internal/fptower" diff --git a/ecc/bls24-317/marshal_test.go b/ecc/bls24-317/marshal_test.go index 73f4c658b2..472d7e947f 100644 --- a/ecc/bls24-317/marshal_test.go +++ b/ecc/bls24-317/marshal_test.go @@ -18,9 +18,10 @@ package bls24317 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -528,7 +529,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bls24-317/multiexp_test.go b/ecc/bls24-317/multiexp_test.go index efd3fb3709..d92cd72816 100644 --- a/ecc/bls24-317/multiexp_test.go +++ b/ecc/bls24-317/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bls24-317/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bls24-317/twistededwards/point_test.go b/ecc/bls24-317/twistededwards/point_test.go index 1cdad6e198..985bf83301 100644 --- a/ecc/bls24-317/twistededwards/point_test.go +++ b/ecc/bls24-317/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bls24-317/fr" diff --git a/ecc/bn254/g1_test.go b/ecc/bn254/g1_test.go index cfbb1ed07b..910bfd499b 100644 --- a/ecc/bn254/g1_test.go +++ b/ecc/bn254/g1_test.go @@ -19,7 +19,7 @@ package bn254 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bn254/fp" diff --git a/ecc/bn254/g2_test.go b/ecc/bn254/g2_test.go index a8de3339ba..c6ee502367 100644 --- a/ecc/bn254/g2_test.go +++ b/ecc/bn254/g2_test.go @@ -19,7 +19,7 @@ package bn254 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bn254/internal/fptower" diff --git a/ecc/bn254/marshal_test.go b/ecc/bn254/marshal_test.go index 3283470da8..34525aebbb 100644 --- a/ecc/bn254/marshal_test.go +++ b/ecc/bn254/marshal_test.go @@ -18,9 +18,10 @@ package bn254 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -478,7 +479,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bn254/multiexp_test.go b/ecc/bn254/multiexp_test.go index e1f848e9f2..89cf9074b2 100644 --- a/ecc/bn254/multiexp_test.go +++ b/ecc/bn254/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bn254/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bn254/twistededwards/point_test.go b/ecc/bn254/twistededwards/point_test.go index 8e5617d08a..5a0f200934 100644 --- a/ecc/bn254/twistededwards/point_test.go +++ b/ecc/bn254/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bn254/fr" diff --git a/ecc/bw6-633/g1_test.go b/ecc/bw6-633/g1_test.go index 37ff9ba14c..e5b93006dc 100644 --- a/ecc/bw6-633/g1_test.go +++ b/ecc/bw6-633/g1_test.go @@ -19,7 +19,7 @@ package bw6633 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-633/fp" diff --git a/ecc/bw6-633/g2_test.go b/ecc/bw6-633/g2_test.go index 271bc6ab02..04a3efe6de 100644 --- a/ecc/bw6-633/g2_test.go +++ b/ecc/bw6-633/g2_test.go @@ -19,7 +19,7 @@ package bw6633 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-633/fp" diff --git a/ecc/bw6-633/marshal_test.go b/ecc/bw6-633/marshal_test.go index dcf6596e78..a5c40468a5 100644 --- a/ecc/bw6-633/marshal_test.go +++ b/ecc/bw6-633/marshal_test.go @@ -18,9 +18,10 @@ package bw6633 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -508,7 +509,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bw6-633/multiexp_test.go b/ecc/bw6-633/multiexp_test.go index 1e45861b77..c6c4e86a9b 100644 --- a/ecc/bw6-633/multiexp_test.go +++ b/ecc/bw6-633/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bw6-633/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bw6-633/twistededwards/point_test.go b/ecc/bw6-633/twistededwards/point_test.go index aedf312465..a898db8ada 100644 --- a/ecc/bw6-633/twistededwards/point_test.go +++ b/ecc/bw6-633/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-633/fr" diff --git a/ecc/bw6-756/g1_test.go b/ecc/bw6-756/g1_test.go index a93bed7b9a..007f6c501a 100644 --- a/ecc/bw6-756/g1_test.go +++ b/ecc/bw6-756/g1_test.go @@ -19,7 +19,7 @@ package bw6756 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-756/fp" diff --git a/ecc/bw6-756/g2_test.go b/ecc/bw6-756/g2_test.go index 723c1d143d..0798ac8cb0 100644 --- a/ecc/bw6-756/g2_test.go +++ b/ecc/bw6-756/g2_test.go @@ -19,7 +19,7 @@ package bw6756 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-756/fp" diff --git a/ecc/bw6-756/marshal_test.go b/ecc/bw6-756/marshal_test.go index 9b9ff619c3..7478bddc4f 100644 --- a/ecc/bw6-756/marshal_test.go +++ b/ecc/bw6-756/marshal_test.go @@ -18,9 +18,10 @@ package bw6756 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -508,7 +509,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bw6-756/multiexp_test.go b/ecc/bw6-756/multiexp_test.go index 64b515445d..78b610a9f4 100644 --- a/ecc/bw6-756/multiexp_test.go +++ b/ecc/bw6-756/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bw6-756/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bw6-756/twistededwards/point_test.go b/ecc/bw6-756/twistededwards/point_test.go index 234ac9c4bf..14163e08c2 100644 --- a/ecc/bw6-756/twistededwards/point_test.go +++ b/ecc/bw6-756/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-756/fr" diff --git a/ecc/bw6-761/g1_test.go b/ecc/bw6-761/g1_test.go index a174050394..c2c47846f9 100644 --- a/ecc/bw6-761/g1_test.go +++ b/ecc/bw6-761/g1_test.go @@ -19,7 +19,7 @@ package bw6761 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-761/fp" diff --git a/ecc/bw6-761/g2_test.go b/ecc/bw6-761/g2_test.go index 89f69def82..18307cbdfa 100644 --- a/ecc/bw6-761/g2_test.go +++ b/ecc/bw6-761/g2_test.go @@ -19,7 +19,7 @@ package bw6761 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-761/fp" diff --git a/ecc/bw6-761/marshal_test.go b/ecc/bw6-761/marshal_test.go index f96ae91944..7505d32266 100644 --- a/ecc/bw6-761/marshal_test.go +++ b/ecc/bw6-761/marshal_test.go @@ -18,9 +18,10 @@ package bw6761 import ( "bytes" + crand "crypto/rand" "io" "math/big" - "math/rand" + "math/rand/v2" "reflect" "testing" @@ -231,7 +232,7 @@ func TestIsCompressed(t *testing.T) { func TestG1AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG1AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G1Affine buf[0] = 0b111 << 5 @@ -344,7 +345,7 @@ func TestG1AffineSerialization(t *testing.T) { func TestG2AffineInvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOfG2AffineCompressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p G2Affine buf[0] = 0b111 << 5 @@ -508,7 +509,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/ecc/bw6-761/multiexp_test.go b/ecc/bw6-761/multiexp_test.go index d98bd688b6..57242a6bd1 100644 --- a/ecc/bw6-761/multiexp_test.go +++ b/ecc/bw6-761/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/bw6-761/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) @@ -474,11 +471,10 @@ func TestMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -657,11 +653,10 @@ func TestCrossMultiExpG2(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/bw6-761/twistededwards/point_test.go b/ecc/bw6-761/twistededwards/point_test.go index 5a1f98fd9a..650c166e0d 100644 --- a/ecc/bw6-761/twistededwards/point_test.go +++ b/ecc/bw6-761/twistededwards/point_test.go @@ -17,8 +17,8 @@ package twistededwards import ( + "crypto/rand" "math/big" - "math/rand" "testing" "github.com/consensys/gnark-crypto/ecc/bw6-761/fr" diff --git a/ecc/secp256k1/g1_test.go b/ecc/secp256k1/g1_test.go index f55a78e7cd..dd31e0ee54 100644 --- a/ecc/secp256k1/g1_test.go +++ b/ecc/secp256k1/g1_test.go @@ -19,9 +19,11 @@ package secp256k1 import ( "fmt" "math/big" - "math/rand" + "math/rand/v2" "testing" + crand "crypto/rand" + "github.com/consensys/gnark-crypto/ecc/secp256k1/fp" "github.com/consensys/gnark-crypto/ecc/secp256k1/fr" @@ -875,7 +877,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) //#nosec G404 weak rng is fine here if err != nil { panic(err) } diff --git a/ecc/secp256k1/multiexp_test.go b/ecc/secp256k1/multiexp_test.go index 87cbd1575c..ebc2c5002b 100644 --- a/ecc/secp256k1/multiexp_test.go +++ b/ecc/secp256k1/multiexp_test.go @@ -20,11 +20,10 @@ import ( "fmt" "math/big" "math/bits" - "math/rand" + "math/rand/v2" "runtime" "sync" "testing" - "time" "github.com/consensys/gnark-crypto/ecc" "github.com/consensys/gnark-crypto/ecc/secp256k1/fr" @@ -58,11 +57,10 @@ func TestMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -243,11 +241,10 @@ func TestCrossMultiExpG1(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element fillBenchScalars(sampleScalars[:]) diff --git a/ecc/stark-curve/g1.go b/ecc/stark-curve/g1.go index 9062618a0d..b7ad98cd1b 100644 --- a/ecc/stark-curve/g1.go +++ b/ecc/stark-curve/g1.go @@ -48,14 +48,6 @@ func (p *G1Affine) Set(a *G1Affine) *G1Affine { return p } -// setInfinity sets p to the infinity point, which is encoded as (0,0). -// N.B.: (0,0) is not on the STARK curve (Y²=X³+X+B). -func (p *G1Affine) setInfinity() *G1Affine { - p.X.SetZero() - p.Y.SetZero() - return p -} - // ScalarMultiplication computes and returns p = [s]a // where p and a are affine points. func (p *G1Affine) ScalarMultiplication(a *G1Affine, s *big.Int) *G1Affine { @@ -580,15 +572,6 @@ func (p *g1JacExtended) Set(a *g1JacExtended) *g1JacExtended { return p } -// setInfinity sets p to the infinity point (1,1,0,0). -func (p *g1JacExtended) setInfinity() *g1JacExtended { - p.X.SetOne() - p.Y.SetOne() - p.ZZ = fp.Element{} - p.ZZZ = fp.Element{} - return p -} - // fromJacExtended converts an extended Jacobian point to an affine point. func (p *G1Affine) fromJacExtended(Q *g1JacExtended) *G1Affine { if Q.ZZ.IsZero() { @@ -613,14 +596,6 @@ func (p *G1Jac) fromJacExtended(Q *g1JacExtended) *G1Jac { return p } -// unsafeFromJacExtended converts an extended Jacobian point, distinct from Infinity, to a Jacobian point. -func (p *G1Jac) unsafeFromJacExtended(Q *g1JacExtended) *G1Jac { - p.X.Square(&Q.ZZ).Mul(&p.X, &Q.X) - p.Y.Square(&Q.ZZZ).Mul(&p.Y, &Q.Y) - p.Z = Q.ZZZ - return p -} - // add sets p to p+q in extended Jacobian coordinates. // // https://www.hyperelliptic.org/EFD/g1p/auto-shortw-xyzz.html#addition-add-2008-s diff --git a/ecc/stark-curve/hash_to_g1.go b/ecc/stark-curve/hash_to_g1.go index 58d319230f..bc8273415d 100644 --- a/ecc/stark-curve/hash_to_g1.go +++ b/ecc/stark-curve/hash_to_g1.go @@ -153,9 +153,3 @@ func HashToG1(msg, dst []byte) (G1Affine, error) { Q1.FromJacobian(&_Q1) return Q1, nil } - -func g1NotZero(x *fp.Element) uint64 { - - return x[0] | x[1] | x[2] | x[3] - -} diff --git a/internal/generator/ecc/template/tests/marshal.go.tmpl b/internal/generator/ecc/template/tests/marshal.go.tmpl index 9860884e97..6a37ac64cc 100644 --- a/internal/generator/ecc/template/tests/marshal.go.tmpl +++ b/internal/generator/ecc/template/tests/marshal.go.tmpl @@ -8,7 +8,8 @@ import ( "testing" - "math/rand" + "math/rand/v2" + crand "crypto/rand" "math/big" "bytes" "io" @@ -239,7 +240,7 @@ func TestIsCompressed(t *testing.T) { func Test{{ $.TAffine }}InvalidBitMask(t *testing.T) { t.Parallel() var buf [SizeOf{{ $.TAffine }}Compressed]byte - rand.Read(buf[:]) //#nosec G404 weak rng is fine here + crand.Read(buf[:]) var p {{ $.TAffine }} buf[0] = 0b111 << 5 @@ -483,7 +484,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) if err != nil { panic(err) } diff --git a/internal/generator/ecc/template/tests/multiexp.go.tmpl b/internal/generator/ecc/template/tests/multiexp.go.tmpl index 3feb22ffe2..fa678fd7f6 100644 --- a/internal/generator/ecc/template/tests/multiexp.go.tmpl +++ b/internal/generator/ecc/template/tests/multiexp.go.tmpl @@ -9,9 +9,8 @@ import ( "fmt" - "time" "runtime" - "math/rand" + "math/rand/v2" "math/big" "testing" "math/bits" @@ -60,11 +59,10 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here // final scalar to use in double and add method (without mixer factor) // n(n+1)(2n+1)/6 (sum of the squares from 1 to n) @@ -259,11 +257,10 @@ func TestCrossMultiExp{{ $.UPointName }}(t *testing.T) { } // sprinkle some points at infinity - rand.Seed(time.Now().UnixNano()) - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here - samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here + samplePoints[rand.N(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here var sampleScalars [nbSamples]fr.Element diff --git a/internal/generator/ecc/template/tests/point.go.tmpl b/internal/generator/ecc/template/tests/point.go.tmpl index 432fec1dc4..275cc15d6f 100644 --- a/internal/generator/ecc/template/tests/point.go.tmpl +++ b/internal/generator/ecc/template/tests/point.go.tmpl @@ -19,7 +19,11 @@ import ( "fmt" "math/big" "testing" - "math/rand" + "math/rand/v2" + + {{if eq .Name "secp256k1"}} + crand "crypto/rand" + {{end}} {{if or (eq .CoordType "fptower.E2") (eq .CoordType "fptower.E4")}} "github.com/consensys/gnark-crypto/ecc/{{.Name}}/internal/fptower" @@ -997,7 +1001,7 @@ func GenBigInt() gopter.Gen { return func(genParams *gopter.GenParameters) *gopter.GenResult { var s big.Int var b [fp.Bytes]byte - _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here + _, err := crand.Read(b[:]) //#nosec G404 weak rng is fine here if err != nil { panic(err) } diff --git a/internal/generator/edwards/template/tests/point.go.tmpl b/internal/generator/edwards/template/tests/point.go.tmpl index b21b1aa252..9598e5c490 100644 --- a/internal/generator/edwards/template/tests/point.go.tmpl +++ b/internal/generator/edwards/template/tests/point.go.tmpl @@ -1,6 +1,6 @@ import ( "math/big" - "math/rand" + "crypto/rand" "testing" "github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr" From b2f2f5c03c42d9793d4d9cdc362995f196326c7d Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 10:56:29 -0500 Subject: [PATCH 8/9] fix: more linter stuff --- ecc/bls12-377/fr/pedersen/pedersen.go | 4 ++-- ecc/bls12-377/fr/polynomial/pool.go | 4 +--- ecc/bls12-378/fr/pedersen/pedersen.go | 4 ++-- ecc/bls12-378/fr/polynomial/pool.go | 4 +--- ecc/bls12-381/fr/pedersen/pedersen.go | 4 ++-- ecc/bls12-381/fr/polynomial/pool.go | 4 +--- ecc/bls24-315/fr/pedersen/pedersen.go | 4 ++-- ecc/bls24-315/fr/polynomial/pool.go | 4 +--- ecc/bls24-317/fr/pedersen/pedersen.go | 4 ++-- ecc/bls24-317/fr/polynomial/pool.go | 4 +--- ecc/bn254/fr/pedersen/pedersen.go | 4 ++-- ecc/bn254/fr/polynomial/pool.go | 4 +--- ecc/bw6-633/fr/pedersen/pedersen.go | 4 ++-- ecc/bw6-633/fr/polynomial/pool.go | 4 +--- ecc/bw6-756/fr/pedersen/pedersen.go | 4 ++-- ecc/bw6-756/fr/polynomial/pool.go | 4 +--- ecc/bw6-761/fr/pedersen/pedersen.go | 4 ++-- ecc/bw6-761/fr/polynomial/pool.go | 4 +--- internal/generator/pedersen/template/pedersen.go.tmpl | 11 +++++------ internal/generator/polynomial/template/pool.go.tmpl | 4 +--- 20 files changed, 33 insertions(+), 54 deletions(-) diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go index bb35613408..f13af0197f 100644 --- a/ecc/bls12-377/fr/pedersen/pedersen.go +++ b/ecc/bls12-377/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bls12-377/fr/polynomial/pool.go b/ecc/bls12-377/fr/polynomial/pool.go index 3c7b83b56d..b083a3a8d7 100644 --- a/ecc/bls12-377/fr/polynomial/pool.go +++ b/ecc/bls12-377/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bls12-377/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go index 8d3091a762..19a85a47e3 100644 --- a/ecc/bls12-378/fr/pedersen/pedersen.go +++ b/ecc/bls12-378/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bls12-378/fr/polynomial/pool.go b/ecc/bls12-378/fr/polynomial/pool.go index 29f050d882..9f0787b387 100644 --- a/ecc/bls12-378/fr/polynomial/pool.go +++ b/ecc/bls12-378/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bls12-378/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go index 553e14f3ad..cd3aad5aa0 100644 --- a/ecc/bls12-381/fr/pedersen/pedersen.go +++ b/ecc/bls12-381/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bls12-381/fr/polynomial/pool.go b/ecc/bls12-381/fr/polynomial/pool.go index 5738925ca6..016ca4265e 100644 --- a/ecc/bls12-381/fr/polynomial/pool.go +++ b/ecc/bls12-381/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go index ab44faa6d1..2889408a17 100644 --- a/ecc/bls24-315/fr/pedersen/pedersen.go +++ b/ecc/bls24-315/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bls24-315/fr/polynomial/pool.go b/ecc/bls24-315/fr/polynomial/pool.go index fee1279a9c..381a611877 100644 --- a/ecc/bls24-315/fr/polynomial/pool.go +++ b/ecc/bls24-315/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bls24-315/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go index 76627f5bae..618468f931 100644 --- a/ecc/bls24-317/fr/pedersen/pedersen.go +++ b/ecc/bls24-317/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bls24-317/fr/polynomial/pool.go b/ecc/bls24-317/fr/polynomial/pool.go index de3ce2f8bd..4839cf863c 100644 --- a/ecc/bls24-317/fr/polynomial/pool.go +++ b/ecc/bls24-317/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bls24-317/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go index 4ab5e0bae5..4d24cbb90d 100644 --- a/ecc/bn254/fr/pedersen/pedersen.go +++ b/ecc/bn254/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bn254/fr/polynomial/pool.go b/ecc/bn254/fr/polynomial/pool.go index 7363652483..763c71e1c5 100644 --- a/ecc/bn254/fr/polynomial/pool.go +++ b/ecc/bn254/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bn254/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go index 8c052e5e24..3e97ecb0ea 100644 --- a/ecc/bw6-633/fr/pedersen/pedersen.go +++ b/ecc/bw6-633/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bw6-633/fr/polynomial/pool.go b/ecc/bw6-633/fr/polynomial/pool.go index 5fc5acd147..bfec9a2066 100644 --- a/ecc/bw6-633/fr/polynomial/pool.go +++ b/ecc/bw6-633/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bw6-633/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go index 13145d17bb..35a37b88d9 100644 --- a/ecc/bw6-756/fr/pedersen/pedersen.go +++ b/ecc/bw6-756/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bw6-756/fr/polynomial/pool.go b/ecc/bw6-756/fr/polynomial/pool.go index 5ab1019313..d054fb2bad 100644 --- a/ecc/bw6-756/fr/polynomial/pool.go +++ b/ecc/bw6-756/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bw6-756/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go index 41ca710157..c0ea687e50 100644 --- a/ecc/bw6-761/fr/pedersen/pedersen.go +++ b/ecc/bw6-761/fr/pedersen/pedersen.go @@ -180,10 +180,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) diff --git a/ecc/bw6-761/fr/polynomial/pool.go b/ecc/bw6-761/fr/polynomial/pool.go index f122d117e4..ef5c934683 100644 --- a/ecc/bw6-761/fr/polynomial/pool.go +++ b/ecc/bw6-761/fr/polynomial/pool.go @@ -20,7 +20,6 @@ import ( "encoding/json" "fmt" "github.com/consensys/gnark-crypto/ecc/bw6-761/fr" - "reflect" "runtime" "sort" "sync" @@ -173,8 +172,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []fr.Element) *fr.Element { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*fr.Element)(unsafe.Pointer(header.Data)) + return (*fr.Element)(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl index f241506c39..af7c21b6fd 100644 --- a/internal/generator/pedersen/template/pedersen.go.tmpl +++ b/internal/generator/pedersen/template/pedersen.go.tmpl @@ -55,7 +55,7 @@ func WithG2Point(g2 curve.G2Affine) SetupOption { // NB! This is a trusted setup process. The randomness during the setup must be discarded. // Failing to do so allows to create proofs without knowing the committed values. func Setup(bases [][]curve.G1Affine, options ...SetupOption) (pk []ProvingKey, vk VerifyingKey, err error) { - var cfg setupConfig + var cfg setupConfig for _, o := range options { o(&cfg) } @@ -64,8 +64,8 @@ func Setup(bases [][]curve.G1Affine, options ...SetupOption) (pk []ProvingKey, v return } } else { - vk.G = *cfg.g2Gen - } + vk.G = *cfg.g2Gen + } var modMinusOne big.Int modMinusOne.Sub(fr.Modulus(), big.NewInt(1)) @@ -162,10 +162,10 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem scaledValues := make([]fr.Element, offset) basis := make([]curve.G1Affine, offset) - copy(basis, pk[0].BasisExpSigma) + copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive copy(scaledValues, values[0]) - offset = len(values[0]) + offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff for i := 1; i < len(pk); i++ { copy(basis[offset:], pk[i].BasisExpSigma) @@ -289,7 +289,6 @@ func BatchVerifyMultiVk(vk []VerifyingKey, commitments []curve.G1Affine, pok []c } pairingG2[len(vk)] = vk[0].G - if isOne, err := curve.PairingCheck(pairingG1, pairingG2); err != nil { return err } else if !isOne { diff --git a/internal/generator/polynomial/template/pool.go.tmpl b/internal/generator/polynomial/template/pool.go.tmpl index 3899d8353f..d3e8acbad1 100644 --- a/internal/generator/polynomial/template/pool.go.tmpl +++ b/internal/generator/polynomial/template/pool.go.tmpl @@ -4,7 +4,6 @@ import ( {{- if not $sham}} "encoding/json" "fmt" - "reflect" "runtime" "sort" "sync" @@ -180,8 +179,7 @@ func (s *poolStats) finalize() { } func getDataPointer(slice []{{.ElementType}}) *{{.ElementType}} { - header := (*reflect.SliceHeader)(unsafe.Pointer(&slice)) - return (*{{.ElementType}})(unsafe.Pointer(header.Data)) + return (*{{.ElementType}})(unsafe.SliceData(slice)) } func (p *Pool) PrintPoolStats() { From 1585e0165666ed323e8db0314076999170f0ca03 Mon Sep 17 00:00:00 2001 From: Gautam Botrel Date: Tue, 27 Aug 2024 11:02:01 -0500 Subject: [PATCH 9/9] fix: more linter stuff --- ecc/bls12-377/fr/pedersen/pedersen.go | 2 +- ecc/bls12-378/fr/pedersen/pedersen.go | 2 +- ecc/bls12-381/fr/pedersen/pedersen.go | 2 +- ecc/bls24-315/fr/pedersen/pedersen.go | 2 +- ecc/bls24-317/fr/pedersen/pedersen.go | 2 +- ecc/bn254/fr/pedersen/pedersen.go | 2 +- ecc/bw6-633/fr/pedersen/pedersen.go | 2 +- ecc/bw6-756/fr/pedersen/pedersen.go | 2 +- ecc/bw6-761/fr/pedersen/pedersen.go | 2 +- internal/generator/pedersen/template/pedersen.go.tmpl | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go index f13af0197f..3c230bb005 100644 --- a/ecc/bls12-377/fr/pedersen/pedersen.go +++ b/ecc/bls12-377/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go index 19a85a47e3..83a48a31d8 100644 --- a/ecc/bls12-378/fr/pedersen/pedersen.go +++ b/ecc/bls12-378/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go index cd3aad5aa0..346c13fb1a 100644 --- a/ecc/bls12-381/fr/pedersen/pedersen.go +++ b/ecc/bls12-381/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go index 2889408a17..9eb53f4e7b 100644 --- a/ecc/bls24-315/fr/pedersen/pedersen.go +++ b/ecc/bls24-315/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go index 618468f931..df91ec7723 100644 --- a/ecc/bls24-317/fr/pedersen/pedersen.go +++ b/ecc/bls24-317/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go index 4d24cbb90d..1f48fffc2c 100644 --- a/ecc/bn254/fr/pedersen/pedersen.go +++ b/ecc/bn254/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go index 3e97ecb0ea..7d7102da97 100644 --- a/ecc/bw6-633/fr/pedersen/pedersen.go +++ b/ecc/bw6-633/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go index 35a37b88d9..8ea95bc323 100644 --- a/ecc/bw6-756/fr/pedersen/pedersen.go +++ b/ecc/bw6-756/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go index c0ea687e50..16bfc09b6b 100644 --- a/ecc/bw6-761/fr/pedersen/pedersen.go +++ b/ecc/bw6-761/fr/pedersen/pedersen.go @@ -181,7 +181,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl index af7c21b6fd..953fd59d2b 100644 --- a/internal/generator/pedersen/template/pedersen.go.tmpl +++ b/internal/generator/pedersen/template/pedersen.go.tmpl @@ -163,7 +163,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, combinationCoeff fr.Elem basis := make([]curve.G1Affine, offset) copy(basis, pk[0].BasisExpSigma) // #nosec G602 false positive - copy(scaledValues, values[0]) + copy(scaledValues, values[0]) // #nosec G602 false positive offset = len(values[0]) // #nosec G602 false positive rI := combinationCoeff