Skip to content

Commit ab15f82

Browse files
armfazharmfazh
committed
Updates golangci-lint to v1.61.0 and fixes code.
1 parent 064a9ba commit ab15f82

File tree

15 files changed

+16
-29
lines changed

15 files changed

+16
-29
lines changed

‎.github/workflows/ci-actions.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
go-version: ${{ matrix.GOVER }}
2424
- name: Linting
25-
uses: golangci/golangci-lint-action@v4
25+
uses: golangci/golangci-lint-action@v6
2626
with:
27-
version: v1.56.2
28-
args: --config=./.etc/golangci.yml ./...
27+
version: v1.61.0
28+
install-mode: goinstall
2929
- name: Check shadowing
3030
run: |
3131
go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest

‎.etc/golangci.yml ‎.golangci.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ linters:
1212
# - structcheck (deprecated since v1.49.0)
1313
# - varcheck (deprecated since v1.49.0)
1414
# - deadcode (deprecated since v1.49.0)
15+
# - exportloopref (deprecated since v1.60.2)
1516
- bodyclose
17+
- copyloopvar
1618
- depguard
1719
- dogsled
1820
- errcheck
19-
- exportloopref
2021
- forbidigo
2122
- funlen
2223
- goconst
@@ -56,15 +57,17 @@ linters-settings:
5657
goconst:
5758
min-occurrences: 4
5859
govet:
59-
check-shadowing: true
60+
enable-all: true
61+
disable:
62+
- fieldalignment
6063
staticcheck:
6164
# TODO: replace deprecated elliptic.Marshal, elliptic.GenerateKey,
6265
# elliptic.Unmarshal, params.ScalarBaseMult before re-enabling SA1019.
6366
checks: ["*", "-SA1019"]
67+
gosec:
68+
excludes:
69+
- G115
6470

6571
issues:
6672
max-issues-per-linter: 0
6773
max-same-issues: 0
68-
69-
output:
70-
format: github-actions

‎abe/cpabe/tkn20/internal/dsl/lexer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dsl
22

33
import (
4+
"errors"
45
"fmt"
56
"strings"
67
)
@@ -58,7 +59,7 @@ func (l *Lexer) scanTokens() error {
5859
}
5960
l.addToken(EOF)
6061
if l.hadError {
61-
return fmt.Errorf(strings.TrimSpace(errMsg))
62+
return errors.New(strings.TrimSpace(errMsg))
6263
}
6364
return nil
6465
}

‎group/group_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ var allGroups = []group.Group{
2020
func TestGroup(t *testing.T) {
2121
const testTimes = 1 << 7
2222
for _, g := range allGroups {
23-
g := g
2423
n := g.(fmt.Stringer).String()
2524
t.Run(n+"/Add", func(tt *testing.T) { testAdd(tt, testTimes, g) })
2625
t.Run(n+"/Neg", func(tt *testing.T) { testNeg(tt, testTimes, g) })

‎group/hash_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ type vector struct {
115115

116116
func BenchmarkHash(b *testing.B) {
117117
for _, g := range allGroups {
118-
g := g
119118
name := g.(fmt.Stringer).String()
120119
b.Run(name+"/HashToElement", func(b *testing.B) {
121120
for i := 0; i < b.N; i++ {

‎internal/test/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func ReportError(t testing.TB, got, want interface{}, inputs ...interface{}) {
1616
}
1717
fmt.Fprintf(b, "got: %v\nwant: %v", got, want)
1818
t.Helper()
19-
t.Fatalf(b.String())
19+
t.Fatal(b.String())
2020
}
2121

2222
// CheckOk fails the test if result == false.

‎kem/frodo/kat_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func TestPQCgenKATKem(t *testing.T) {
2323
{"FrodoKEM-640-SHAKE", "604a10cfc871dfaed9cb5b057c644ab03b16852cea7f39bc7f9831513b5b1cfa"},
2424
}
2525
for _, kat := range kats {
26-
kat := kat
2726
t.Run(kat.name, func(t *testing.T) {
2827
testPQCgenKATKem(t, kat.name, kat.want)
2928
})

‎kem/kyber/kat_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func TestPQCgenKATKem(t *testing.T) {
3131
{"ML-KEM-1024", "3fba7327d0320cb6134badf2a1bcb963a5b3c0026c7dece8f00d6a6155e47b33"},
3232
}
3333
for _, kat := range kats {
34-
kat := kat
3534
t.Run(kat.name, func(t *testing.T) {
3635
testPQCgenKATKem(t, kat.name, kat.want)
3736
})

‎kem/schemes/schemes_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ func TestCaseSensitivity(t *testing.T) {
1717
func BenchmarkGenerateKeyPair(b *testing.B) {
1818
allSchemes := schemes.All()
1919
for _, scheme := range allSchemes {
20-
scheme := scheme
2120
b.Run(scheme.Name(), func(b *testing.B) {
2221
for i := 0; i < b.N; i++ {
2322
_, _, _ = scheme.GenerateKeyPair()
@@ -29,7 +28,6 @@ func BenchmarkGenerateKeyPair(b *testing.B) {
2928
func BenchmarkEncapsulate(b *testing.B) {
3029
allSchemes := schemes.All()
3130
for _, scheme := range allSchemes {
32-
scheme := scheme
3331
pk, _, _ := scheme.GenerateKeyPair()
3432
b.Run(scheme.Name(), func(b *testing.B) {
3533
for i := 0; i < b.N; i++ {
@@ -42,7 +40,6 @@ func BenchmarkEncapsulate(b *testing.B) {
4240
func BenchmarkDecapsulate(b *testing.B) {
4341
allSchemes := schemes.All()
4442
for _, scheme := range allSchemes {
45-
scheme := scheme
4643
pk, sk, _ := scheme.GenerateKeyPair()
4744
ct, _, _ := scheme.Encapsulate(pk)
4845
b.Run(scheme.Name(), func(b *testing.B) {
@@ -56,7 +53,6 @@ func BenchmarkDecapsulate(b *testing.B) {
5653
func TestApi(t *testing.T) {
5754
allSchemes := schemes.All()
5855
for _, scheme := range allSchemes {
59-
scheme := scheme
6056
t.Run(scheme.Name(), func(t *testing.T) {
6157
if scheme == nil {
6258
t.Fatal()

‎math/wnaf_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ func BenchmarkOmegaNAF(b *testing.B) {
6363
Two128.Lsh(Two128, 128)
6464

6565
for w := uint(2); w < 6; w++ {
66-
w := w // pin variable
6766
b.Run(fmt.Sprintf("%v", w), func(b *testing.B) {
6867
x, _ := rand.Int(rand.Reader, Two128)
6968
b.ResetTimer()
@@ -79,7 +78,6 @@ func BenchmarkOmegaNAFRegular(b *testing.B) {
7978
Two128.Lsh(Two128, 128)
8079

8180
for w := uint(2); w < 6; w++ {
82-
w := w // pin variable
8381
b.Run(fmt.Sprintf("%v", w), func(b *testing.B) {
8482
x, _ := rand.Int(rand.Reader, Two128)
8583
x.SetBit(x, 0, uint(1)) // odd-numbers

‎oprf/vectors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func TestVectors(t *testing.T) {
245245
for i := range v {
246246
suite, err := GetSuite(v[i].Identifier)
247247
if err != nil {
248-
t.Logf(v[i].Identifier + " not supported yet")
248+
t.Log(v[i].Identifier + " not supported yet")
249249
continue
250250
}
251251
t.Run(fmt.Sprintf("%v/Mode%v", suite, v[i].Mode), v[i].test)

‎pke/kyber/internal/common/poly_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func TestDecompressMessage(t *testing.T) {
4444

4545
func TestCompress(t *testing.T) {
4646
for _, d := range []int{4, 5, 10, 11} {
47-
d := d
4847
t.Run(fmt.Sprintf("d=%d", d), func(t *testing.T) {
4948
var p, q Poly
5049
bound := (Q + (1 << uint(d))) >> uint(d+1)
@@ -351,7 +350,6 @@ func (p *Poly) OldCompressTo(m []byte, d int) {
351350

352351
func TestCompressFullInputFirstCoeff(t *testing.T) {
353352
for _, d := range []int{4, 5, 10, 11} {
354-
d := d
355353
t.Run(fmt.Sprintf("d=%d", d), func(t *testing.T) {
356354
var p, q Poly
357355
bound := (Q + (1 << uint(d))) >> uint(d+1)

‎pki/pki_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
func TestPEM(t *testing.T) {
1111
for _, scheme := range schemes.All() {
12-
scheme := scheme
1312
t.Run(scheme.Name(), func(t *testing.T) {
1413
if scheme == nil {
1514
t.Fatal()

‎sign/ed448/ed448.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func newKeyFromSeed(privateKey, seed []byte) {
206206

207207
func signAll(signature []byte, privateKey PrivateKey, message, ctx []byte, preHash bool) {
208208
if len(ctx) > ContextMaxSize {
209-
panic(fmt.Errorf("ed448: bad context length: " + strconv.Itoa(len(ctx))))
209+
panic(fmt.Errorf("ed448: bad context length: %v", len(ctx)))
210210
}
211211

212212
H := sha3.NewShake256()

‎sign/schemes/schemes_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ func TestCaseSensitivity(t *testing.T) {
1717
func TestApi(t *testing.T) {
1818
allSchemes := schemes.All()
1919
for _, scheme := range allSchemes {
20-
scheme := scheme
2120
t.Run(scheme.Name(), func(t *testing.T) {
2221
if scheme == nil {
2322
t.Fatal()
@@ -122,7 +121,6 @@ func Example() {
122121
func BenchmarkGenerateKeyPair(b *testing.B) {
123122
allSchemes := schemes.All()
124123
for _, scheme := range allSchemes {
125-
scheme := scheme
126124
b.Run(scheme.Name(), func(b *testing.B) {
127125
for i := 0; i < b.N; i++ {
128126
_, _, _ = scheme.GenerateKey()
@@ -136,7 +134,6 @@ func BenchmarkSign(b *testing.B) {
136134
opts := &sign.SignatureOpts{}
137135
for _, scheme := range allSchemes {
138136
msg := []byte(fmt.Sprintf("Signing with %s", scheme.Name()))
139-
scheme := scheme
140137
_, sk, _ := scheme.GenerateKey()
141138
b.Run(scheme.Name(), func(b *testing.B) {
142139
for i := 0; i < b.N; i++ {
@@ -151,7 +148,6 @@ func BenchmarkVerify(b *testing.B) {
151148
opts := &sign.SignatureOpts{}
152149
for _, scheme := range allSchemes {
153150
msg := []byte(fmt.Sprintf("Signing with %s", scheme.Name()))
154-
scheme := scheme
155151
pk, sk, _ := scheme.GenerateKey()
156152
sig := scheme.Sign(sk, msg, opts)
157153
b.Run(scheme.Name(), func(b *testing.B) {

0 commit comments

Comments
 (0)