diff --git a/.golangci.yml b/.golangci.yml index 2c2ef626e..bf818a8b7 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -276,11 +276,6 @@ issues: - path: "group/edwards25519/scalar.go" linters: - ineffassign - - path: "pairing|group" - linters: - - revive - - stylecheck - text: "var-naming: don't use an underscore in package name|ST1003: should not use underscores in package names" - path: "pairing/(circl_bls12381|bn254)/." linters: - errcheck #TODO: proper error handling diff --git a/encrypt/ecies/ecies_test.go b/encrypt/ecies/ecies_test.go index dcdb77bfb..8576cd5ec 100644 --- a/encrypt/ecies/ecies_test.go +++ b/encrypt/ecies/ecies_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "go.dedis.ch/kyber/v4" "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/group/edwards25519vartime" "go.dedis.ch/kyber/v4/group/p256" - "go.dedis.ch/kyber/v4/group/var_ed25519" "go.dedis.ch/kyber/v4/util/random" ) @@ -54,8 +54,8 @@ func BenchmarkECIES(b *testing.B) { kyber.Group }{ {edwards25519.NewBlakeSHA256Ed25519()}, - {var_ed25519.NewBlakeSHA256Ed25519(false)}, - {var_ed25519.NewBlakeSHA256Ed25519(true)}, + {edwards25519vartime.NewBlakeSHA256Ed25519(false)}, + {edwards25519vartime.NewBlakeSHA256Ed25519(true)}, {p256.NewBlakeSHA256P256()}, {p256.NewBlakeSHA256QR512()}, } diff --git a/group/var_ed25519/basic.go b/group/edwards25519vartime/basic.go similarity index 99% rename from group/var_ed25519/basic.go rename to group/edwards25519vartime/basic.go index b823c5bac..10df0a55d 100644 --- a/group/var_ed25519/basic.go +++ b/group/edwards25519vartime/basic.go @@ -1,7 +1,7 @@ //go:build experimental // +build experimental -package var_ed25519 +package edwards25519vartime import ( "crypto/cipher" diff --git a/group/var_ed25519/basic_test.go b/group/edwards25519vartime/basic_test.go similarity index 98% rename from group/var_ed25519/basic_test.go rename to group/edwards25519vartime/basic_test.go index 2e8b11628..60af4de4e 100644 --- a/group/var_ed25519/basic_test.go +++ b/group/edwards25519vartime/basic_test.go @@ -1,7 +1,7 @@ //go:build experimental // +build experimental -package var_ed25519 +package edwards25519vartime import ( "testing" diff --git a/group/var_ed25519/curve.go b/group/edwards25519vartime/curve.go similarity index 99% rename from group/var_ed25519/curve.go rename to group/edwards25519vartime/curve.go index 357ddd4bf..59b39c7e0 100644 --- a/group/var_ed25519/curve.go +++ b/group/edwards25519vartime/curve.go @@ -1,4 +1,4 @@ -package var_ed25519 +package edwards25519vartime import ( "crypto/cipher" diff --git a/group/var_ed25519/curve_test.go b/group/edwards25519vartime/curve_test.go similarity index 99% rename from group/var_ed25519/curve_test.go rename to group/edwards25519vartime/curve_test.go index 702a3f9cd..7affa642e 100644 --- a/group/var_ed25519/curve_test.go +++ b/group/edwards25519vartime/curve_test.go @@ -1,4 +1,4 @@ -package var_ed25519 +package edwards25519vartime import ( "testing" diff --git a/group/var_ed25519/ext.go b/group/edwards25519vartime/ext.go similarity index 99% rename from group/var_ed25519/ext.go rename to group/edwards25519vartime/ext.go index 4fcf5d202..8a7690a7c 100644 --- a/group/var_ed25519/ext.go +++ b/group/edwards25519vartime/ext.go @@ -1,4 +1,4 @@ -package var_ed25519 +package edwards25519vartime import ( "crypto/cipher" diff --git a/group/var_ed25519/param.go b/group/edwards25519vartime/param.go similarity index 97% rename from group/var_ed25519/param.go rename to group/edwards25519vartime/param.go index a5deffe24..f7543fde1 100644 --- a/group/var_ed25519/param.go +++ b/group/edwards25519vartime/param.go @@ -1,4 +1,4 @@ -// Package var_ed25519 contains several implementations of Twisted Edwards Curves, +// Package edwards25519vartime contains several implementations of Twisted Edwards Curves, // from general and unoptimized to highly specialized and optimized. // // Twisted Edwards curves are elliptic curves satisfying the equation: @@ -10,7 +10,7 @@ // are isomorphic to curves having c == 1. // // For details see Bernstein et al, "Twisted Edwards Curves", http://eprint.iacr.org/2008/013.pdf -package var_ed25519 +package edwards25519vartime import ( "math/big" @@ -74,7 +74,7 @@ func Param1174() *Param { func ParamEd25519() *Param { var p Param var qs big.Int - p.Name = "var_ed25519" + p.Name = "edwards25519vartime" p.P.SetBit(zero, 255, 1).Sub(&p.P, big.NewInt(19)) qs.SetString("27742317777372353535851937790883648493", 10) p.Q.SetBit(zero, 252, 1).Add(&p.Q, &qs) diff --git a/group/var_ed25519/proj.go b/group/edwards25519vartime/proj.go similarity index 99% rename from group/var_ed25519/proj.go rename to group/edwards25519vartime/proj.go index b4a54b970..2117106c4 100644 --- a/group/var_ed25519/proj.go +++ b/group/edwards25519vartime/proj.go @@ -1,4 +1,4 @@ -package var_ed25519 +package edwards25519vartime import ( "crypto/cipher" diff --git a/group/var_ed25519/suite.go b/group/edwards25519vartime/suite.go similarity index 98% rename from group/var_ed25519/suite.go rename to group/edwards25519vartime/suite.go index d0e82e263..cfffbbc12 100644 --- a/group/var_ed25519/suite.go +++ b/group/edwards25519vartime/suite.go @@ -1,4 +1,4 @@ -package var_ed25519 +package edwards25519vartime import ( "crypto/cipher" diff --git a/proof/proof_test.go b/proof/proof_test.go index 68e56872d..a7bb759e1 100644 --- a/proof/proof_test.go +++ b/proof/proof_test.go @@ -8,8 +8,8 @@ import ( "go.dedis.ch/kyber/v4" "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/group/edwards25519vartime" "go.dedis.ch/kyber/v4/group/p256" - "go.dedis.ch/kyber/v4/group/var_ed25519" "go.dedis.ch/kyber/v4/xof/blake2xb" ) @@ -256,8 +256,8 @@ func BenchmarkProof(b *testing.B) { Suite }{ {edwards25519.NewBlakeSHA256Ed25519()}, - {var_ed25519.NewBlakeSHA256Ed25519(false)}, - {var_ed25519.NewBlakeSHA256Ed25519(true)}, + {edwards25519vartime.NewBlakeSHA256Ed25519(false)}, + {edwards25519vartime.NewBlakeSHA256Ed25519(true)}, {p256.NewBlakeSHA256P256()}, {p256.NewBlakeSHA256QR512()}, }