Formatting code with linter.

.etc/golangci.yml

@@ -14,9 +14,11 @@ linters:
     - dogsled
     - errcheck
     - funlen
+    - gci
     - goconst
     - gocyclo
     - gofmt
+    - gofumpt
     - goimports
     - gosec
     - gosimple

.github/workflows/ci-actions.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Linting
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.42
+          version: v1.44
           args: --config=./.etc/golangci.yml ./...
       - name: Check shadowing
         run: |

blindsign/blindrsa/blindrsa_test.go

@@ -362,7 +362,7 @@ func verifyTestVector(t *testing.T, vector testVector) {
 }
 
 func TestVectors(t *testing.T) {
-	data, err := ioutil.ReadFile("test_vectors.json")
+	data, err := ioutil.ReadFile("testdata/test_vectors.json")
 	if err != nil {
 		t.Fatal("Failed reading test vectors:", err)
 	}

blindsign/blindrsa/rsa.go

@@ -37,8 +37,10 @@ import (
 	"math/big"
 )
 
-var bigZero = big.NewInt(0)
-var bigOne = big.NewInt(1)
+var (
+	bigZero = big.NewInt(0)
+	bigOne  = big.NewInt(1)
+)
 
 // ErrVerification represents a failure to verify a signature.
 // It is deliberately vague to avoid adaptive attacks.

dh/csidh/consts.go

@@ -31,7 +31,8 @@ var (
 		0x0095, 0x0097, 0x009D, 0x00A3, 0x00A7, 0x00AD, 0x00B3, 0x00B5, 0x00BF, 0x00C1, 0x00C5,
 		0x00C7, 0x00D3, 0x00DF, 0x00E3, 0x00E5, 0x00E9, 0x00EF, 0x00F1, 0x00FB, 0x0101, 0x0107,
 		0x010D, 0x010F, 0x0115, 0x0119, 0x011B, 0x0125, 0x0133, 0x0137, 0x0139, 0x013D, 0x014B,
-		0x0151, 0x015B, 0x015D, 0x0161, 0x0167, 0x016F, 0x0175, 0x024B}
+		0x0151, 0x015B, 0x015D, 0x0161, 0x0167, 0x016F, 0x0175, 0x024B,
+	}
 
 	p = fp{
 		0x1B81B90533C6C87B, 0xC2721BF457ACA835,

dh/csidh/csidh.go

@@ -77,7 +77,7 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
 	if (halfR - halfL) == 1 {
 		// base case
 		if !p.z.isZero() {
-			var tmp = fp{primes[halfL]}
+			tmp := fp{primes[halfL]}
 			xMul(p, p, a, &tmp)
 
 			if !p.z.isZero() {
@@ -96,7 +96,7 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
 
 	// perform another recursive step
 	mid := halfL + ((halfR - halfL + 1) / 2)
-	var mulL, mulR = fp{1}, fp{1}
+	mulL, mulR := fp{1}, fp{1}
 	// compute u = primes_1 * ... * primes_m
 	for i := halfL; i < mid; i++ {
 		mul512(&mulR, &mulR, primes[i])
@@ -121,8 +121,8 @@ func cofactorMul(p *point, a *coeff, halfL, halfR int, order *fp) (bool, bool) {
 func groupAction(pub *PublicKey, prv *PrivateKey, rng io.Reader) {
 	var k [2]fp
 	var e [2][primeCount]uint8
-	var done = [2]bool{false, false}
-	var A = coeff{a: pub.a, c: one}
+	done := [2]bool{false, false}
+	A := coeff{a: pub.a, c: one}
 
 	k[0][0] = 4
 	k[1][0] = 4
@@ -162,7 +162,7 @@ func groupAction(pub *PublicKey, prv *PrivateKey, rng io.Reader) {
 
 		for i, v := range primes {
 			if e[sign][i] != 0 {
-				var cof = fp{1}
+				cof := fp{1}
 				var K point
 
 				for j := i + 1; j < len(primes); j++ {
@@ -299,7 +299,7 @@ func Validate(pub *PublicKey, rng io.Reader) bool {
 	// Check if pub represents a supersingular curve.
 	for {
 		var P point
-		var A = point{pub.a, one}
+		A := point{pub.a, one}
 
 		// Randomly chosen P must have big enough order to check
 		// supersingularity. Probability of random P having big

dh/csidh/csidh_test.go

@@ -46,8 +46,8 @@ type TestVectors struct {
 
 func TestCompare64(t *testing.T) {
 	const s uint64 = 0xFFFFFFFFFFFFFFFF
-	var val1 = fp{0, 2, 3, 4, 5, 6, 7, 8}
-	var val2 = fp{s, s, s, s, s, s, s, s}
+	val1 := fp{0, 2, 3, 4, 5, 6, 7, 8}
+	val2 := fp{s, s, s, s, s, s, s, s}
 	var zero fp
 
 	if !zero.isZero() {
@@ -273,8 +273,10 @@ func TestKAT(t *testing.T) {
 	}
 }
 
-var prv1, prv2 PrivateKey
-var pub1, pub2 PublicKey
+var (
+	prv1, prv2 PrivateKey
+	pub1, pub2 PublicKey
+)
 
 // Private key generation.
 func BenchmarkGeneratePrivate(b *testing.B) {

dh/csidh/curve.go

@@ -88,8 +88,8 @@ func xMul(kP, P *point, co *coeff, k *fp) {
 	var A24 coeff
 	var Q point
 	var j uint
-	var A = point{x: co.a, z: co.c}
-	var R = *P
+	A := point{x: co.a, z: co.c}
+	R := *P
 
 	// Precompyte A24 = (A+2C:4C) => (A24.x = A.x+2A.z; A24.z = 4*A.z)
 	addRdc(&A24.a, &co.c, &co.c)
@@ -130,7 +130,7 @@ func xIso(img *point, co *coeff, kern *point, kernOrder uint64) {
 	var t0, t1, t2, S, D fp
 	var Q, prod point
 	var coEd coeff
-	var M = [3]point{*kern}
+	M := [3]point{*kern}
 
 	// Compute twisted Edwards coefficients
 	// coEd.a = co.a + 2*co.c

dh/csidh/curve_test.go

@@ -244,23 +244,28 @@ func TestXMul(t *testing.T) {
 }
 
 func TestMappointHardcoded3(t *testing.T) {
-	var P = point{
+	P := point{
 		x: fp{0xca1a2fdec38c669b, 0xf2fe3678ebeb978b, 0xfda3e9a6f0c719d, 0x6f7bffa41772570b, 0x3d90cdd6283dc150, 0x21b55b738eb1ded9, 0x209515d0a9f41dd6, 0x5275cf397d154a12},
-		z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306}}
-	var A = coeff{
+		z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306},
+	}
+	A := coeff{
 		a: fp{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
-		c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80}}
-	var K = point{
+		c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80},
+	}
+	K := point{
 		x: fp{0x597616608e291c6f, 0xd14230b008736798, 0xa63099b1ace67e6e, 0xe37c13afd768bcfa, 0xc6ef718894f08135, 0x53a4fd09091f3522, 0xc9a1f9f670645fe1, 0x628c4a8efd83e5f0},
-		z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e}}
+		z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e},
+	}
 	var k uint64 = 3
 
-	var expA = coeff{
+	expA := coeff{
 		a: fp{0x6fa92a66e77cfc1, 0x9efbfb7118f1832c, 0x441894cc5d1d24ae, 0x5a2f0fafa26761de, 0x8095c36d3a20a78a, 0xb22be0023612a135, 0x5eb844d06ef0f430, 0x52e53309d1c90cf8},
-		c: fp{0x98173d5664a23e5c, 0xd8fe1c6306bbc11a, 0xa774fbc502648059, 0x766a0d839aa62c83, 0x4b074f9b93d1633d, 0xf306019dbf87f505, 0x77c720ca059234b0, 0x3d47ab65269c5908}}
-	var expP = point{
+		c: fp{0x98173d5664a23e5c, 0xd8fe1c6306bbc11a, 0xa774fbc502648059, 0x766a0d839aa62c83, 0x4b074f9b93d1633d, 0xf306019dbf87f505, 0x77c720ca059234b0, 0x3d47ab65269c5908},
+	}
+	expP := point{
 		x: fp{0x91aba9b39f280495, 0xfbd8ea69d2990aeb, 0xb03e1b8ed7fe3dba, 0x3d30a41499f08998, 0xb15a42630de9c606, 0xa7dd487fef16f5c8, 0x8673948afed8e968, 0x57ecc8710004cd4d},
-		z: fp{0xce8819869a942526, 0xb98ca2ff79ef8969, 0xd49c9703743a1812, 0x21dbb090f9152e03, 0xbabdcac831b1adea, 0x8cee90762baa2ddd, 0xa0dd2ddcef809d96, 0x1de2a8887a32f19b}}
+		z: fp{0xce8819869a942526, 0xb98ca2ff79ef8969, 0xd49c9703743a1812, 0x21dbb090f9152e03, 0xbabdcac831b1adea, 0x8cee90762baa2ddd, 0xa0dd2ddcef809d96, 0x1de2a8887a32f19b},
+	}
 	xIso(&P, &A, &K, k)
 	if !eqFp(&P.x, &expP.x) || !eqFp(&P.z, &expP.z) {
 		normP := toNormX(&P)
@@ -273,23 +278,28 @@ func TestMappointHardcoded3(t *testing.T) {
 }
 
 func TestMappointHardcoded5(t *testing.T) {
-	var P = point{
+	P := point{
 		x: fp{0xca1a2fdec38c669b, 0xf2fe3678ebeb978b, 0xfda3e9a6f0c719d, 0x6f7bffa41772570b, 0x3d90cdd6283dc150, 0x21b55b738eb1ded9, 0x209515d0a9f41dd6, 0x5275cf397d154a12},
-		z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306}}
-	var A = coeff{
+		z: fp{0x1fff8309761576e, 0xef239cbeda7c2ba1, 0x6136ae2d76e95873, 0x1f8f6ac909570cec, 0x780fdf0cc7d676d8, 0x548098fe92ed04e1, 0xb39da564701ef35d, 0x5fec19626df41306},
+	}
+	A := coeff{
 		a: fp{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
-		c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80}}
-	var K = point{
+		c: fp{0xc8fc8df598726f0a, 0x7b1bc81750a6af95, 0x5d319e67c1e961b4, 0xb0aa7275301955f1, 0x4a080672d9ba6c64, 0x97a5ef8a246ee77b, 0x6ea9e5d4383676a, 0x3496e2e117e0ec80},
+	}
+	K := point{
 		x: fp{0x597616608e291c6f, 0xd14230b008736798, 0xa63099b1ace67e6e, 0xe37c13afd768bcfa, 0xc6ef718894f08135, 0x53a4fd09091f3522, 0xc9a1f9f670645fe1, 0x628c4a8efd83e5f0},
-		z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e}}
+		z: fp{0x8f18a654312ac1ad, 0xbc20a9b2472785c9, 0xdaf97c29bbf9e492, 0xf91a8c799e2f6119, 0xc8dc675cc8e528e6, 0x9a7b2c2f0df95171, 0x85629cd38cdd9fdb, 0x656d5253d3fd1a6e},
+	}
 	var k uint64 = 5
 
-	var expA = coeff{
+	expA := coeff{
 		a: fp{0x32076f58298ed474, 0x5094a1fc8696d307, 0x82e510594157944a, 0xb60ce760f88c83a9, 0xae8a28c325186983, 0xe31d2446a4ad2f18, 0xb266c612b5f141c1, 0x64283e618db5a705},
-		c: fp{0x4472b49b65272190, 0x2bd5919309778f56, 0x6132753691fe016c, 0x8f654849c09e6d34, 0xfa208dd9aea1ef12, 0xf7df0dd10071411a, 0x75afb7860500922c, 0x52fb7d34b129fb65}}
-	var expP = point{
+		c: fp{0x4472b49b65272190, 0x2bd5919309778f56, 0x6132753691fe016c, 0x8f654849c09e6d34, 0xfa208dd9aea1ef12, 0xf7df0dd10071411a, 0x75afb7860500922c, 0x52fb7d34b129fb65},
+	}
+	expP := point{
 		x: fp{0x3b75fc94b2a6df2d, 0x96d53dc9b0e867a0, 0x22e87202421d274e, 0x30a361440697ee1a, 0x8b52ee078bdbddcd, 0x64425d500e6b934d, 0xf47d1f568f6df391, 0x5d9d3607431395ab},
-		z: fp{0x746e02dafa040976, 0xcd408f2cddbf3a8e, 0xf643354e0e13a93f, 0x7c39ed96ce9a5e29, 0xfcdf26f1a1a550ca, 0x2fc8aafc4ca0a559, 0x5d204a2b14cf19ba, 0xbd2c3406762f05d}}
+		z: fp{0x746e02dafa040976, 0xcd408f2cddbf3a8e, 0xf643354e0e13a93f, 0x7c39ed96ce9a5e29, 0xfcdf26f1a1a550ca, 0x2fc8aafc4ca0a559, 0x5d204a2b14cf19ba, 0xbd2c3406762f05d},
+	}
 
 	xIso(&P, &A, &K, k)
 	if !eqFp(&P.x, &expP.x) || !eqFp(&P.z, &expP.z) {
@@ -355,7 +365,7 @@ func BenchmarkIsom(b *testing.B) {
 	var P, kern point
 	var expPhiP big.Int
 	var co coeff
-	var k = uint64(2)
+	k := uint64(2)
 
 	expPhiP.SetString("0x5FEBD68F795F9AEB732ECF0D1507904922F2B0736704E0751EF242B4E191E6F630D83778B5E5681161FD071CDEF7DF4C3A41D0ECEB30E90B119C5BF86C5AB51A", 0)
 	P.x = toFp("0x5FD8D226C228FD6AA3CCDCAB931C5D3AA000A46B47041F59D9724E517594F696D38F2CB45C987ACF68BB1057D8D518F926D8F55171F337D05354E0022BC66B23")

dh/csidh/fp511.go

@@ -59,7 +59,7 @@ func addRdc(r, x, y *fp) {
 	t[6], c = bits.Sub64(r[6], p[6], c)
 	t[7], c = bits.Sub64(r[7], p[7], c)
 
-	var w = 0 - c
+	w := 0 - c
 	r[0] = ctPick64(w, r[0], t[0])
 	r[1] = ctPick64(w, r[1], t[1])
 	r[2] = ctPick64(w, r[2], t[2])
@@ -100,7 +100,7 @@ func subRdc(r, x, y *fp) {
 	r[7], c = bits.Sub64(x[7], y[7], c)
 
 	// if x<y => r=x-y+p
-	var w = 0 - c
+	w := 0 - c
 	r[0], c = bits.Add64(r[0], ctPick64(w, p[0], 0), 0)
 	r[1], c = bits.Add64(r[1], ctPick64(w, p[1], 0), c)
 	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) {
 	t[6], c = bits.Sub64(r[6], p[6], c)
 	t[7], c = bits.Sub64(r[7], p[7], c)
 
-	var w = 0 - c
+	w := 0 - c
 	r[0] = ctPick64(w, r[0], t[0])
 	r[1] = ctPick64(w, r[1], t[1])
 	r[2] = ctPick64(w, r[2], t[2])

dh/csidh/fp511_amd64.go

@@ -53,7 +53,7 @@ func mulRdcAmd64(r, x, y *fp) {
 	t[6], c = bits.Sub64(r[6], p[6], c)
 	t[7], c = bits.Sub64(r[7], p[7], c)
 
-	var w = 0 - c
+	w := 0 - c
 	r[0] = ctPick64(w, r[0], t[0])
 	r[1] = ctPick64(w, r[1], t[1])
 	r[2] = ctPick64(w, r[2], t[2])

dh/csidh/fp511_test.go

@@ -124,12 +124,14 @@ func TestFp512Sub3_DoesntReturnCarry(t *testing.T) {
 		0xFFFFFFFFFFFFFFFF, 1,
 		0, 0,
 		0, 0,
-		0, 0}
+		0, 0,
+	}
 	c := fp{
 		0xFFFFFFFFFFFFFFFF, 2,
 		0, 0,
 		0, 0,
-		0, 0}
+		0, 0,
+	}
 
 	if sub512(&a, &b, &c) != 1 {
 		t.Error("Carry not returned")
@@ -142,12 +144,14 @@ func TestFp512Sub3_ReturnsCarry(t *testing.T) {
 		0xFFFFFFFFFFFFFFFF, 2,
 		0, 0,
 		0, 0,
-		0, 0}
+		0, 0,
+	}
 	c := fp{
 		0xFFFFFFFFFFFFFFFF, 1,
 		0, 0,
 		0, 0,
-		0, 0}
+		0, 0,
+	}
 
 	if sub512(&a, &b, &c) != 0 {
 		t.Error("Carry not returned")
@@ -220,24 +224,28 @@ func TestSubRdc(t *testing.T) {
 
 func testMulRdc(t *testing.T, f func(*fp, *fp, *fp)) {
 	var res fp
-	var m1 = fp{
+	m1 := fp{
 		0x85E2579C786882D0, 0x4E3433657E18DA95,
-		0x850AE5507965A0B3, 0xA15BC4E676475964}
-	var m2 = fp{
+		0x850AE5507965A0B3, 0xA15BC4E676475964,
+	}
+	m2 := fp{
 		0x85E2579C786882CF, 0x4E3433657E18DA95,
-		0x850AE5507965A0B3, 0xA15BC4E676475964}
+		0x850AE5507965A0B3, 0xA15BC4E676475964,
+	}
 
 	// Expected
-	var m1m1 = fp{
+	m1m1 := fp{
 		0xAEBF46E92C88A4B4, 0xCFE857977B946347,
 		0xD3B264FF08493901, 0x6EEB3D23746B6C7C,
 		0xC0CA874A349D64B4, 0x7AD4A38B406F8504,
-		0x38B6B6CEB82472FB, 0x1587015FD7DDFC7D}
-	var m1m2 = fp{
+		0x38B6B6CEB82472FB, 0x1587015FD7DDFC7D,
+	}
+	m1m2 := fp{
 		0x51534771258C4624, 0x2BFEDE86504E2160,
 		0xE8127D5E9329670B, 0x0C84DBD584491D75,
 		0x656C73C68B16E38C, 0x01C0DA470B30B8DE,
-		0x2532E3903EAA950B, 0x3F2C28EA97FE6FEC}
+		0x2532E3903EAA950B, 0x3F2C28EA97FE6FEC,
+	}
 
 	// 0*0
 	tmp := zeroFp512
@@ -335,7 +343,7 @@ func TestIsNonQuadRes(t *testing.T) {
 
 func TestCheckSmaller(t *testing.T) {
 	// p-1
-	var pMin1 = p
+	pMin1 := p
 	pMin1[0]--
 
 	// p-1 < p => 1

dh/sidh/internal/common/utils.go

@@ -7,7 +7,7 @@ import "encoding/binary"
 // if pick == 0 (out = in2)
 // else out is undefined.
 func Cpick(pick int, out, in1, in2 []byte) {
-	var which = byte((int8(pick << 7)) >> 7)
+	which := byte((int8(pick << 7)) >> 7)
 	for i := range out {
 		out[i] = (in1[i] & which) | (in2[i] & ^which)
 	}