Skip to content

Commit 8f6adda

Browse files
armfazharmfazh
committed
Formatting code with linter.
1 parent b38981c commit 8f6adda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+456
-254
lines changed

‎.etc/golangci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ linters:
1414
- dogsled
1515
- errcheck
1616
- funlen
17+
- gci
1718
- goconst
1819
- gocyclo
1920
- gofmt
21+
- gofumpt
2022
- goimports
2123
- gosec
2224
- gosimple

‎.github/workflows/ci-actions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Linting
2020
uses: golangci/golangci-lint-action@v2
2121
with:
22-
version: v1.42
22+
version: v1.44
2323
args: --config=./.etc/golangci.yml ./...
2424
- name: Check shadowing
2525
run: |

‎blindsign/blindrsa/blindrsa_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func verifyTestVector(t *testing.T, vector testVector) {
362362
}
363363

364364
func TestVectors(t *testing.T) {
365-
data, err := ioutil.ReadFile("test_vectors.json")
365+
data, err := ioutil.ReadFile("testdata/test_vectors.json")
366366
if err != nil {
367367
t.Fatal("Failed reading test vectors:", err)
368368
}

‎blindsign/blindrsa/rsa.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ import (
3737
"math/big"
3838
)
3939

40-
var bigZero = big.NewInt(0)
41-
var bigOne = big.NewInt(1)
40+
var (
41+
bigZero = big.NewInt(0)
42+
bigOne = big.NewInt(1)
43+
)
4244

4345
// ErrVerification represents a failure to verify a signature.
4446
// It is deliberately vague to avoid adaptive attacks.

‎blindsign/blindrsa/test_vectors.json renamed to ‎blindsign/blindrsa/testdata/test_vectors.json

File renamed without changes.

‎dh/csidh/consts.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ var (
3131
0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5,
3232
0x00C7, 0x00D3, 0x00DF, 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107,
3333
0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, 0x0139, 0x013D, 0x014B,
34-
0x0151, 0x015B, 0x015D, 0x0161, 0x0167, 0x016F, 0x0175, 0x024B}
34+
0x0151, 0x015B, 0x015D, 0x0161, 0x0167, 0x016F, 0x0175, 0x024B,
35+
}
3536

3637
p = fp{
3738
0x1B81B90533C6C87B, 0xC2721BF457ACA835,

‎dh/csidh/csidh.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
7777
if (halfR - halfL) == 1 {
7878
// base case
7979
if !p.z.isZero() {
80-
var tmp = fp{primes[halfL]}
80+
tmp := fp{primes[halfL]}
8181
xMul(p, p, a, &tmp)
8282

8383
if !p.z.isZero() {
@@ -96,7 +96,7 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
9696

9797
// perform another recursive step
9898
mid := halfL + ((halfR - halfL + 1) / 2)
99-
var mulL, mulR = fp{1}, fp{1}
99+
mulL, mulR := fp{1}, fp{1}
100100
// compute u = primes_1 * ... * primes_m
101101
for i := halfL; i < mid; i++ {
102102
mul512(&mulR, &mulR, primes[i])
@@ -121,8 +121,8 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
121121
func groupAction(pub *PublicKey, prv *PrivateKey, rng io.Reader) {
122122
var k [2]fp
123123
var e [2][primeCount]uint8
124-
var done = [2]bool{false, false}
125-
var A = coeff{a: pub.a, c: one}
124+
done := [2]bool{false, false}
125+
A := coeff{a: pub.a, c: one}
126126

127127
k[0][0] = 4
128128
k[1][0] = 4
@@ -162,7 +162,7 @@ func groupAction(pub *PublicKey, prv *PrivateKey, rng io.Reader) {
162162

163163
for i, v := range primes {
164164
if e[sign][i] != 0 {
165-
var cof = fp{1}
165+
cof := fp{1}
166166
var K point
167167

168168
for j := i + 1; j < len(primes); j++ {
@@ -299,7 +299,7 @@ func Validate(pub *PublicKey, rng io.Reader) bool {
299299
// Check if pub represents a supersingular curve.
300300
for {
301301
var P point
302-
var A = point{pub.a, one}
302+
A := point{pub.a, one}
303303

304304
// Randomly chosen P must have big enough order to check
305305
// supersingularity. Probability of random P having big

‎dh/csidh/csidh_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ type TestVectors struct {
4646

4747
func TestCompare64(t *testing.T) {
4848
const s uint64 = 0xFFFFFFFFFFFFFFFF
49-
var val1 = fp{0, 2, 3, 4, 5, 6, 7, 8}
50-
var val2 = fp{s, s, s, s, s, s, s, s}
49+
val1 := fp{0, 2, 3, 4, 5, 6, 7, 8}
50+
val2 := fp{s, s, s, s, s, s, s, s}
5151
var zero fp
5252

5353
if !zero.isZero() {
@@ -273,8 +273,10 @@ func TestKAT(t *testing.T) {
273273
}
274274
}
275275

276-
var prv1, prv2 PrivateKey
277-
var pub1, pub2 PublicKey
276+
var (
277+
prv1, prv2 PrivateKey
278+
pub1, pub2 PublicKey
279+
)
278280

279281
// Private key generation.
280282
func BenchmarkGeneratePrivate(b *testing.B) {

‎dh/csidh/curve.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ func xMul(kP, P *point, co *coeff, k *fp) {
8888
var A24 coeff
8989
var Q point
9090
var j uint
91-
var A = point{x: co.a, z: co.c}
92-
var R = *P
91+
A := point{x: co.a, z: co.c}
92+
R := *P
9393

9494
// Precompyte A24 = (A+2C:4C) => (A24.x = A.x+2A.z; A24.z = 4*A.z)
9595
addRdc(&A24.a, &co.c, &co.c)
@@ -130,7 +130,7 @@ func xIso(img *point, co *coeff, kern *point, kernOrder uint64) {
130130
var t0, t1, t2, S, D fp
131131
var Q, prod point
132132
var coEd coeff
133-
var M = [3]point{*kern}
133+
M := [3]point{*kern}
134134

135135
// Compute twisted Edwards coefficients
136136
// coEd.a = co.a + 2*co.c

‎dh/csidh/curve_test.go

+31-21
Original file line numberDiff line numberDiff line change
@@ -244,23 +244,28 @@ func TestXMul(t *testing.T) {
244244
}
245245

246246
func TestMappointHardcoded3(t *testing.T) {
247-
var P = point{
247+
P := point{
248248
x: fp{0xca1a2fdec38c669b, 0xf2fe3678ebeb978b, 0xfda3e9a6f0c719d, 0x6f7bffa41772570b, 0x3d90cdd6283dc150, 0x21b55b738eb1ded9, 0x209515d0a9f41dd6, 0x5275cf397d154a12},
249-
z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306}}
250-
var A = coeff{
249+
z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306},
250+
}
251+
A := coeff{
251252
a: fp{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
252-
c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80}}
253-
var K = point{
253+
c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80},
254+
}
255+
K := point{
254256
x: fp{0x597616608e291c6f, 0xd14230b008736798, 0xa63099b1ace67e6e, 0xe37c13afd768bcfa, 0xc6ef718894f08135, 0x53a4fd09091f3522, 0xc9a1f9f670645fe1, 0x628c4a8efd83e5f0},
255-
z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e}}
257+
z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e},
258+
}
256259
var k uint64 = 3
257260

258-
var expA = coeff{
261+
expA := coeff{
259262
a: fp{0x6fa92a66e77cfc1, 0x9efbfb7118f1832c, 0x441894cc5d1d24ae, 0x5a2f0fafa26761de, 0x8095c36d3a20a78a, 0xb22be0023612a135, 0x5eb844d06ef0f430, 0x52e53309d1c90cf8},
260-
c: fp{0x98173d5664a23e5c, 0xd8fe1c6306bbc11a, 0xa774fbc502648059, 0x766a0d839aa62c83, 0x4b074f9b93d1633d, 0xf306019dbf87f505, 0x77c720ca059234b0, 0x3d47ab65269c5908}}
261-
var expP = point{
263+
c: fp{0x98173d5664a23e5c, 0xd8fe1c6306bbc11a, 0xa774fbc502648059, 0x766a0d839aa62c83, 0x4b074f9b93d1633d, 0xf306019dbf87f505, 0x77c720ca059234b0, 0x3d47ab65269c5908},
264+
}
265+
expP := point{
262266
x: fp{0x91aba9b39f280495, 0xfbd8ea69d2990aeb, 0xb03e1b8ed7fe3dba, 0x3d30a41499f08998, 0xb15a42630de9c606, 0xa7dd487fef16f5c8, 0x8673948afed8e968, 0x57ecc8710004cd4d},
263-
z: fp{0xce8819869a942526, 0xb98ca2ff79ef8969, 0xd49c9703743a1812, 0x21dbb090f9152e03, 0xbabdcac831b1adea, 0x8cee90762baa2ddd, 0xa0dd2ddcef809d96, 0x1de2a8887a32f19b}}
267+
z: fp{0xce8819869a942526, 0xb98ca2ff79ef8969, 0xd49c9703743a1812, 0x21dbb090f9152e03, 0xbabdcac831b1adea, 0x8cee90762baa2ddd, 0xa0dd2ddcef809d96, 0x1de2a8887a32f19b},
268+
}
264269
xIso(&P, &A, &K, k)
265270
if !eqFp(&P.x, &expP.x) || !eqFp(&P.z, &expP.z) {
266271
normP := toNormX(&P)
@@ -273,23 +278,28 @@ func TestMappointHardcoded3(t *testing.T) {
273278
}
274279

275280
func TestMappointHardcoded5(t *testing.T) {
276-
var P = point{
281+
P := point{
277282
x: fp{0xca1a2fdec38c669b, 0xf2fe3678ebeb978b, 0xfda3e9a6f0c719d, 0x6f7bffa41772570b, 0x3d90cdd6283dc150, 0x21b55b738eb1ded9, 0x209515d0a9f41dd6, 0x5275cf397d154a12},
278-
z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306}}
279-
var A = coeff{
283+
z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306},
284+
}
285+
A := coeff{
280286
a: fp{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
281-
c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80}}
282-
var K = point{
287+
c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80},
288+
}
289+
K := point{
283290
x: fp{0x597616608e291c6f, 0xd14230b008736798, 0xa63099b1ace67e6e, 0xe37c13afd768bcfa, 0xc6ef718894f08135, 0x53a4fd09091f3522, 0xc9a1f9f670645fe1, 0x628c4a8efd83e5f0},
284-
z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e}}
291+
z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e},
292+
}
285293
var k uint64 = 5
286294

287-
var expA = coeff{
295+
expA := coeff{
288296
a: fp{0x32076f58298ed474, 0x5094a1fc8696d307, 0x82e510594157944a, 0xb60ce760f88c83a9, 0xae8a28c325186983, 0xe31d2446a4ad2f18, 0xb266c612b5f141c1, 0x64283e618db5a705},
289-
c: fp{0x4472b49b65272190, 0x2bd5919309778f56, 0x6132753691fe016c, 0x8f654849c09e6d34, 0xfa208dd9aea1ef12, 0xf7df0dd10071411a, 0x75afb7860500922c, 0x52fb7d34b129fb65}}
290-
var expP = point{
297+
c: fp{0x4472b49b65272190, 0x2bd5919309778f56, 0x6132753691fe016c, 0x8f654849c09e6d34, 0xfa208dd9aea1ef12, 0xf7df0dd10071411a, 0x75afb7860500922c, 0x52fb7d34b129fb65},
298+
}
299+
expP := point{
291300
x: fp{0x3b75fc94b2a6df2d, 0x96d53dc9b0e867a0, 0x22e87202421d274e, 0x30a361440697ee1a, 0x8b52ee078bdbddcd, 0x64425d500e6b934d, 0xf47d1f568f6df391, 0x5d9d3607431395ab},
292-
z: fp{0x746e02dafa040976, 0xcd408f2cddbf3a8e, 0xf643354e0e13a93f, 0x7c39ed96ce9a5e29, 0xfcdf26f1a1a550ca, 0x2fc8aafc4ca0a559, 0x5d204a2b14cf19ba, 0xbd2c3406762f05d}}
301+
z: fp{0x746e02dafa040976, 0xcd408f2cddbf3a8e, 0xf643354e0e13a93f, 0x7c39ed96ce9a5e29, 0xfcdf26f1a1a550ca, 0x2fc8aafc4ca0a559, 0x5d204a2b14cf19ba, 0xbd2c3406762f05d},
302+
}
293303

294304
xIso(&P, &A, &K, k)
295305
if !eqFp(&P.x, &expP.x) || !eqFp(&P.z, &expP.z) {
@@ -355,7 +365,7 @@ func BenchmarkIsom(b *testing.B) {
355365
var P, kern point
356366
var expPhiP big.Int
357367
var co coeff
358-
var k = uint64(2)
368+
k := uint64(2)
359369

360370
expPhiP.SetString("0x5FEBD68F795F9AEB732ECF0D1507904922F2B0736704E0751EF242B4E191E6F630D83778B5E5681161FD071CDEF7DF4C3A41D0ECEB30E90B119C5BF86C5AB51A", 0)
361371
P.x = toFp("0x5FD8D226C228FD6AA3CCDCAB931C5D3AA000A46B47041F59D9724E517594F696D38F2CB45C987ACF68BB1057D8D518F926D8F55171F337D05354E0022BC66B23")

‎dh/csidh/fp511.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func addRdc(r, x, y *fp) {
5959
t[6], c = bits.Sub64(r[6], p[6], c)
6060
t[7], c = bits.Sub64(r[7], p[7], c)
6161

62-
var w = 0 - c
62+
w := 0 - c
6363
r[0] = ctPick64(w, r[0], t[0])
6464
r[1] = ctPick64(w, r[1], t[1])
6565
r[2] = ctPick64(w, r[2], t[2])
@@ -100,7 +100,7 @@ func subRdc(r, x, y *fp) {
100100
r[7], c = bits.Sub64(x[7], y[7], c)
101101

102102
// if x<y => r=x-y+p
103-
var w = 0 - c
103+
w := 0 - c
104104
r[0], c = bits.Add64(r[0], ctPick64(w, p[0], 0), 0)
105105
r[1], c = bits.Add64(r[1], ctPick64(w, p[1], 0), c)
106106
r[2], c = bits.Add64(r[2], ctPick64(w, p[2], 0), c)
@@ -152,7 +152,7 @@ func modExpRdcCommon(r, b, e *fp, fpBitLen int) {
152152
t[6], c = bits.Sub64(r[6], p[6], c)
153153
t[7], c = bits.Sub64(r[7], p[7], c)
154154

155-
var w = 0 - c
155+
w := 0 - c
156156
r[0] = ctPick64(w, r[0], t[0])
157157
r[1] = ctPick64(w, r[1], t[1])
158158
r[2] = ctPick64(w, r[2], t[2])

‎dh/csidh/fp511_amd64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func mulRdcAmd64(r, x, y *fp) {
5353
t[6], c = bits.Sub64(r[6], p[6], c)
5454
t[7], c = bits.Sub64(r[7], p[7], c)
5555

56-
var w = 0 - c
56+
w := 0 - c
5757
r[0] = ctPick64(w, r[0], t[0])
5858
r[1] = ctPick64(w, r[1], t[1])
5959
r[2] = ctPick64(w, r[2], t[2])

‎dh/csidh/fp511_test.go

+21-13
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,14 @@ func TestFp512Sub3_DoesntReturnCarry(t *testing.T) {
124124
0xFFFFFFFFFFFFFFFF, 1,
125125
0, 0,
126126
0, 0,
127-
0, 0}
127+
0, 0,
128+
}
128129
c := fp{
129130
0xFFFFFFFFFFFFFFFF, 2,
130131
0, 0,
131132
0, 0,
132-
0, 0}
133+
0, 0,
134+
}
133135

134136
if sub512(&a, &b, &c) != 1 {
135137
t.Error("Carry not returned")
@@ -142,12 +144,14 @@ func TestFp512Sub3_ReturnsCarry(t *testing.T) {
142144
0xFFFFFFFFFFFFFFFF, 2,
143145
0, 0,
144146
0, 0,
145-
0, 0}
147+
0, 0,
148+
}
146149
c := fp{
147150
0xFFFFFFFFFFFFFFFF, 1,
148151
0, 0,
149152
0, 0,
150-
0, 0}
153+
0, 0,
154+
}
151155

152156
if sub512(&a, &b, &c) != 0 {
153157
t.Error("Carry not returned")
@@ -220,24 +224,28 @@ func TestSubRdc(t *testing.T) {
220224

221225
func testMulRdc(t *testing.T, f func(*fp, *fp, *fp)) {
222226
var res fp
223-
var m1 = fp{
227+
m1 := fp{
224228
0x85E2579C786882D0, 0x4E3433657E18DA95,
225-
0x850AE5507965A0B3, 0xA15BC4E676475964}
226-
var m2 = fp{
229+
0x850AE5507965A0B3, 0xA15BC4E676475964,
230+
}
231+
m2 := fp{
227232
0x85E2579C786882CF, 0x4E3433657E18DA95,
228-
0x850AE5507965A0B3, 0xA15BC4E676475964}
233+
0x850AE5507965A0B3, 0xA15BC4E676475964,
234+
}
229235

230236
// Expected
231-
var m1m1 = fp{
237+
m1m1 := fp{
232238
0xAEBF46E92C88A4B4, 0xCFE857977B946347,
233239
0xD3B264FF08493901, 0x6EEB3D23746B6C7C,
234240
0xC0CA874A349D64B4, 0x7AD4A38B406F8504,
235-
0x38B6B6CEB82472FB, 0x1587015FD7DDFC7D}
236-
var m1m2 = fp{
241+
0x38B6B6CEB82472FB, 0x1587015FD7DDFC7D,
242+
}
243+
m1m2 := fp{
237244
0x51534771258C4624, 0x2BFEDE86504E2160,
238245
0xE8127D5E9329670B, 0x0C84DBD584491D75,
239246
0x656C73C68B16E38C, 0x01C0DA470B30B8DE,
240-
0x2532E3903EAA950B, 0x3F2C28EA97FE6FEC}
247+
0x2532E3903EAA950B, 0x3F2C28EA97FE6FEC,
248+
}
241249

242250
// 0*0
243251
tmp := zeroFp512
@@ -335,7 +343,7 @@ func TestIsNonQuadRes(t *testing.T) {
335343

336344
func TestCheckSmaller(t *testing.T) {
337345
// p-1
338-
var pMin1 = p
346+
pMin1 := p
339347
pMin1[0]--
340348

341349
// p-1 < p => 1

‎dh/sidh/internal/common/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import "encoding/binary"
77
// if pick == 0 (out = in2)
88
// else out is undefined.
99
func Cpick(pick int, out, in1, in2 []byte) {
10-
var which = byte((int8(pick << 7)) >> 7)
10+
which := byte((int8(pick << 7)) >> 7)
1111
for i := range out {
1212
out[i] = (in1[i] & which) | (in2[i] & ^which)
1313
}

0 commit comments

Comments
 (0)