Skip to content

Commit fe7f39d

Browse files
committed
build: fix new gosec linter
1 parent c1a1c0b commit fe7f39d

File tree

11 files changed

+32
-26
lines changed

11 files changed

+32
-26
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: golangci-lint
3333
uses: golangci/golangci-lint-action@v3
3434
with:
35-
version: v1.54
35+
version: v1.60
3636
args: -v --timeout=5m
3737
skip-pkg-cache: true
3838

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: golangci-lint
3636
uses: golangci/golangci-lint-action@v3
3737
with:
38-
version: v1.54
38+
version: v1.60
3939
args: -v --timeout=5m
4040
skip-pkg-cache: true
4141

ecc/bls12-377/fr/sis/sis_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) {
404404
}
405405
sum := r.Sum(nil)
406406
var rlen [4]byte
407-
binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes))
407+
binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here
408408
reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum))
409409
var result fr.Vector
410410
_, err := result.ReadFrom(reader)

ecc/bn254/fr/sis/sis_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) {
368368
}
369369
sum := r.Sum(nil)
370370
var rlen [4]byte
371-
binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes))
371+
binary.BigEndian.PutUint32(rlen[:], uint32(len(sum)/fr.Bytes)) // #nosec G115 not overflow territory here
372372
reader := io.MultiReader(bytes.NewReader(rlen[:]), bytes.NewReader(sum))
373373
var result fr.Vector
374374
_, err := result.ReadFrom(reader)

ecc/bn254/fr/tensor-commitment/commitment.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func NewTCParams(codeRate, NbColumns, NbRows int, makeHash func() hash.Hash) (*T
134134
res.Domains[1] = fft.NewDomain(uint64(codeRate * NbColumns))
135135

136136
// size of the matrix
137-
res.NbColumns = int(res.Domains[0].Cardinality)
137+
res.NbColumns = int(res.Domains[0].Cardinality) // #nosec G115 not overflow territory here
138138
res.NbRows = NbRows
139139

140140
// rate
@@ -285,7 +285,8 @@ func (tc *TensorCommitment) Commit() (Digest, error) {
285285
// now we hash each columns of _p
286286
res := make([][]byte, tc.params.Domains[1].Cardinality)
287287

288-
parallel.Execute(int(tc.params.Domains[1].Cardinality), func(start, stop int) {
288+
cardinality := int(tc.params.Domains[1].Cardinality) // #nosec G115 not overflow territory here
289+
parallel.Execute(cardinality, func(start, stop int) {
289290
hasher := tc.params.MakeHash()
290291
for i := start; i < stop; i++ {
291292
hasher.Reset()

ecc/stark-curve/hash_to_g1.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ func MapToCurve1(u *fp.Element) G1Affine {
9393
signsNotEqual := g1Sgn0(u) ^ g1Sgn0(&y) // 34. e3 = sgn0(u) == sgn0(y)
9494

9595
tv1.Neg(&y)
96-
y.Select(int(signsNotEqual), &y, &tv1) // 35. y = CMOV(-y, y, e3) # Select correct sign of y
96+
// 35. y = CMOV(-y, y, e3) # Select correct sign of y
97+
y.Select(int(signsNotEqual), &y, &tv1) // #nosec G115 not overflow territory here
9798
return G1Affine{x, y}
9899
}
99100

ecc/stark-curve/marshal.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func (enc *Encoder) encode(v interface{}) (err error) {
330330
return
331331
case []fr.Element:
332332
// write slice length
333-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
333+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
334334
if err != nil {
335335
return
336336
}
@@ -347,7 +347,7 @@ func (enc *Encoder) encode(v interface{}) (err error) {
347347
return nil
348348
case []fp.Element:
349349
// write slice length
350-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
350+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
351351
if err != nil {
352352
return
353353
}
@@ -365,7 +365,7 @@ func (enc *Encoder) encode(v interface{}) (err error) {
365365

366366
case []G1Affine:
367367
// write slice length
368-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
368+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
369369
if err != nil {
370370
return
371371
}
@@ -420,7 +420,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
420420
return
421421
case []fr.Element:
422422
// write slice length
423-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
423+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
424424
if err != nil {
425425
return
426426
}
@@ -437,7 +437,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
437437
return nil
438438
case []fp.Element:
439439
// write slice length
440-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
440+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
441441
if err != nil {
442442
return
443443
}
@@ -455,7 +455,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
455455

456456
case []G1Affine:
457457
// write slice length
458-
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
458+
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))) // #nosec G115 not overflow territory here
459459
if err != nil {
460460
return
461461
}

field/generator/config/field_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func (f *FieldConfig) WriteElement(element Element) string {
415415
var subElementNames string
416416
if length > 1 {
417417
builder.WriteString("\n")
418-
subElementNames = CoordNameForExtensionDegree(uint8(length))
418+
subElementNames = CoordNameForExtensionDegree(uint8(length)) // #nosec G115 not overflow territory here
419419
}
420420
for i, e := range element {
421421
if length > 1 {

field/hash/hashutils.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) {
1818
if len(dst) > 255 {
1919
return nil, errors.New("invalid domain size (>255 bytes)")
2020
}
21-
sizeDomain := uint8(len(dst))
21+
sizeDomain := uint8(len(dst)) // #nosec G115 not overflow territory here, checked above
2222

2323
// Z_pad = I2OSP(0, r_in_bytes)
2424
// l_i_b_str = I2OSP(len_in_bytes, 2)
@@ -31,7 +31,9 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) {
3131
if _, err := h.Write(msg); err != nil {
3232
return nil, err
3333
}
34-
if _, err := h.Write([]byte{uint8(lenInBytes >> 8), uint8(lenInBytes), uint8(0)}); err != nil {
34+
s := uint8(lenInBytes >> 8) // #nosec G115 not overflow territory here
35+
b := uint8(lenInBytes) // #nosec G115 not overflow territory here
36+
if _, err := h.Write([]byte{s, b, 0}); err != nil {
3537
return nil, err
3638
}
3739
if _, err := h.Write(dst); err != nil {
@@ -71,7 +73,8 @@ func ExpandMsgXmd(msg, dst []byte, lenInBytes int) ([]byte, error) {
7173
if _, err := h.Write(strxor); err != nil {
7274
return nil, err
7375
}
74-
if _, err := h.Write([]byte{uint8(i)}); err != nil {
76+
bi := uint8(i) // #nosec G115 not overflow territory here
77+
if _, err := h.Write([]byte{bi}); err != nil {
7578
return nil, err
7679
}
7780
if _, err := h.Write(dst); err != nil {

internal/generator/config/hash_to_curve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (parameters *HashSuiteSvdw) GetInfo(baseField *field.FieldConfig, g *Point,
7777
func (suite *HashSuiteSswu) GetInfo(baseField *field.FieldConfig, g *Point, name string) HashSuiteInfo {
7878

7979
f := field.NewTower(baseField, g.CoordExtDegree, g.CoordExtRoot)
80-
fieldSizeMod256 := uint8(f.Size.Bits()[0])
80+
fieldSizeMod256 := uint8(f.Size.Bits()[0]) // #nosec G115 false positive
8181

8282
Z := toBigIntSlice(suite.Z)
8383
var c []field.Element

0 commit comments

Comments
 (0)