Skip to content

Commit 434c405

Browse files
K1li4nLK1li4nL
committed
Fix lint issues sign
1 parent fc031d7 commit 434c405

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎sign/bdn/bdn_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestBDN_HashPointToR_BN256(t *testing.T) {
3131
require.Equal(t, "933f6013eb3f654f9489d6d45ad04eaf", coefs[2].String())
3232
require.Equal(t, 16, coefs[0].MarshalSize())
3333

34-
mask, _ := sign.NewMask(suite, []kyber.Point{p1, p2, p3}, nil)
34+
mask, _ := sign.NewMask([]kyber.Point{p1, p2, p3}, nil)
3535
mask.SetBit(0, true)
3636
mask.SetBit(1, true)
3737
mask.SetBit(2, true)
@@ -55,7 +55,7 @@ func TestBDN_AggregateSignatures(t *testing.T) {
5555
sig2, err := Sign(suite, private2, msg)
5656
require.NoError(t, err)
5757

58-
mask, _ := sign.NewMask(suite, []kyber.Point{public1, public2}, nil)
58+
mask, _ := sign.NewMask([]kyber.Point{public1, public2}, nil)
5959
mask.SetBit(0, true)
6060
mask.SetBit(1, true)
6161

@@ -66,6 +66,7 @@ func TestBDN_AggregateSignatures(t *testing.T) {
6666
require.NoError(t, err)
6767

6868
aggregatedKey, err := AggregatePublicKeys(suite, mask)
69+
require.NoError(t, err)
6970

7071
sig, err := aggregatedSig.MarshalBinary()
7172
require.NoError(t, err)
@@ -75,6 +76,7 @@ func TestBDN_AggregateSignatures(t *testing.T) {
7576

7677
mask.SetBit(1, false)
7778
aggregatedKey, err = AggregatePublicKeys(suite, mask)
79+
require.NoError(t, err)
7880

7981
err = Verify(suite, aggregatedKey, msg, sig)
8082
require.Error(t, err)
@@ -91,14 +93,15 @@ func TestBDN_SubsetSignature(t *testing.T) {
9193
sig2, err := Sign(suite, private2, msg)
9294
require.NoError(t, err)
9395

94-
mask, _ := sign.NewMask(suite, []kyber.Point{public1, public3, public2}, nil)
96+
mask, _ := sign.NewMask([]kyber.Point{public1, public3, public2}, nil)
9597
mask.SetBit(0, true)
9698
mask.SetBit(2, true)
9799

98100
aggregatedSig, err := AggregateSignatures(suite, [][]byte{sig1, sig2}, mask)
99101
require.NoError(t, err)
100102

101103
aggregatedKey, err := AggregatePublicKeys(suite, mask)
104+
require.NoError(t, err)
102105

103106
sig, err := aggregatedSig.MarshalBinary()
104107
require.NoError(t, err)
@@ -128,7 +131,7 @@ func TestBDN_RogueAttack(t *testing.T) {
128131
require.NoError(t, bls.Verify(suite, agg, msg, sig))
129132

130133
// New scheme that should detect
131-
mask, _ := sign.NewMask(suite, pubs, nil)
134+
mask, _ := sign.NewMask(pubs, nil)
132135
mask.SetBit(0, true)
133136
mask.SetBit(1, true)
134137
agg, err = AggregatePublicKeys(suite, mask)
@@ -146,7 +149,7 @@ func Benchmark_BDN_AggregateSigs(b *testing.B) {
146149
sig2, err := Sign(suite, private2, msg)
147150
require.Nil(b, err)
148151

149-
mask, _ := sign.NewMask(suite, []kyber.Point{public1, public2}, nil)
152+
mask, _ := sign.NewMask([]kyber.Point{public1, public2}, nil)
150153
mask.SetBit(0, true)
151154
mask.SetBit(1, false)
152155

‎sign/dss/dss_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ var partSec []kyber.Scalar
2424
var longterms []*dkg.DistKeyShare
2525
var randoms []*dkg.DistKeyShare
2626

27-
var dss []*DSS
28-
2927
func init() {
3028
partPubs = make([]kyber.Point, nbParticipants)
3129
partSec = make([]kyber.Scalar, nbParticipants)
@@ -220,6 +218,6 @@ func genPair() (kyber.Scalar, kyber.Point) {
220218

221219
func randomBytes(n int) []byte {
222220
var buff = make([]byte, n)
223-
_, _ = rand.Read(buff[:])
221+
_, _ = rand.Read(buff)
224222
return buff
225223
}

‎sign/eddsa/eddsa.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func VerifyWithChecks(pub, msg, sig []byte) error {
192192
func Verify(public kyber.Point, msg, sig []byte) error {
193193
PBuf, err := public.MarshalBinary()
194194
if err != nil {
195-
return fmt.Errorf("error unmarshalling public key: %s", err)
195+
return fmt.Errorf("error unmarshalling public key: %w", err)
196196
}
197197
return VerifyWithChecks(PBuf, msg, sig)
198198
}

‎sign/mask.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77

88
"go.dedis.ch/kyber/v3"
9-
"go.dedis.ch/kyber/v3/pairing"
109
)
1110

1211
// Mask is a bitmask of the participation to a collective signature.
@@ -17,7 +16,7 @@ type Mask struct {
1716

1817
// NewMask creates a new mask from a list of public keys. If a key is provided, it
1918
// will set the bit of the key to 1 or return an error if it is not found.
20-
func NewMask(suite pairing.Suite, publics []kyber.Point, myKey kyber.Point) (*Mask, error) {
19+
func NewMask(publics []kyber.Point, myKey kyber.Point) (*Mask, error) {
2120
m := &Mask{
2221
publics: publics,
2322
}
@@ -26,8 +25,8 @@ func NewMask(suite pairing.Suite, publics []kyber.Point, myKey kyber.Point) (*Ma
2625
if myKey != nil {
2726
for i, key := range publics {
2827
if key.Equal(myKey) {
29-
m.SetBit(i, true)
30-
return m, nil
28+
err := m.SetBit(i, true)
29+
return m, err
3130
}
3231
}
3332

@@ -40,7 +39,7 @@ func NewMask(suite pairing.Suite, publics []kyber.Point, myKey kyber.Point) (*Ma
4039
// Mask returns the bitmask as a byte array.
4140
func (m *Mask) Mask() []byte {
4241
clone := make([]byte, len(m.mask))
43-
copy(clone[:], m.mask)
42+
copy(clone, m.mask)
4443
return clone
4544
}
4645

‎sign/mask_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func init() {
2525
}
2626

2727
func TestMask_CreateMask(t *testing.T) {
28-
mask, err := NewMask(suite, publics, nil)
28+
mask, err := NewMask(publics, nil)
2929
require.NoError(t, err)
3030

3131
require.Equal(t, len(publics), len(mask.Publics()))
@@ -34,19 +34,19 @@ func TestMask_CreateMask(t *testing.T) {
3434
require.Equal(t, n/8+1, mask.Len())
3535
require.Equal(t, uint8(0), mask.Mask()[0])
3636

37-
mask, err = NewMask(suite, publics, publics[2])
37+
mask, err = NewMask(publics, publics[2])
3838
require.NoError(t, err)
3939

4040
require.Equal(t, len(publics), len(mask.Publics()))
4141
require.Equal(t, 1, mask.CountEnabled())
4242
require.Equal(t, uint8(0x4), mask.Mask()[0])
4343

44-
mask, err = NewMask(suite, publics, suite.G1().Point())
44+
_, err = NewMask(publics, suite.G1().Point())
4545
require.Error(t, err)
4646
}
4747

4848
func TestMask_SetBit(t *testing.T) {
49-
mask, err := NewMask(suite, publics, publics[2])
49+
mask, err := NewMask(publics, publics[2])
5050
require.NoError(t, err)
5151

5252
err = mask.SetBit(1, true)
@@ -72,7 +72,7 @@ func TestMask_SetBit(t *testing.T) {
7272
}
7373

7474
func TestMask_SetAndMerge(t *testing.T) {
75-
mask, err := NewMask(suite, publics, publics[2])
75+
mask, err := NewMask(publics, publics[2])
7676
require.NoError(t, err)
7777

7878
err = mask.SetMask([]byte{})
@@ -90,7 +90,7 @@ func TestMask_SetAndMerge(t *testing.T) {
9090
}
9191

9292
func TestMask_PositionalQueries(t *testing.T) {
93-
mask, err := NewMask(suite, publics, publics[2])
93+
mask, err := NewMask(publics, publics[2])
9494
require.NoError(t, err)
9595

9696
for i := 0; i < 10000; i++ {

‎sign/schnorr/schnorr.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@ func VerifyWithChecks(g kyber.Group, pub, msg, sig []byte) error {
7272
IsCanonical(b []byte) bool
7373
}
7474

75-
R := g.Point()
75+
r := g.Point()
7676
s := g.Scalar()
77-
pointSize := R.MarshalSize()
77+
pointSize := r.MarshalSize()
7878
scalarSize := s.MarshalSize()
7979
sigSize := scalarSize + pointSize
8080
if len(sig) != sigSize {
8181
return fmt.Errorf("schnorr: signature of invalid length %d instead of %d", len(sig), sigSize)
8282
}
83-
if err := R.UnmarshalBinary(sig[:pointSize]); err != nil {
83+
if err := r.UnmarshalBinary(sig[:pointSize]); err != nil {
8484
return err
8585
}
86-
if p, ok := R.(pointCanCheckCanonicalAndSmallOrder); ok {
86+
if p, ok := r.(pointCanCheckCanonicalAndSmallOrder); ok {
8787
if !p.IsCanonical(sig[:pointSize]) {
88-
return fmt.Errorf("R is not canonical")
88+
return fmt.Errorf("r is not canonical")
8989
}
9090
if p.HasSmallOrder() {
91-
return fmt.Errorf("R has small order")
91+
return fmt.Errorf("r has small order")
9292
}
9393
}
9494
if s, ok := g.Scalar().(scalarCanCheckCanonical); ok && !s.IsCanonical(sig[pointSize:]) {
@@ -111,17 +111,17 @@ func VerifyWithChecks(g kyber.Group, pub, msg, sig []byte) error {
111111
return fmt.Errorf("public key has small order")
112112
}
113113
}
114-
// recompute hash(public || R || msg)
115-
h, err := hash(g, public, R, msg)
114+
// recompute hash(public || r || msg)
115+
h, err := hash(g, public, r, msg)
116116
if err != nil {
117117
return err
118118
}
119119

120120
// compute S = g^s
121121
S := g.Point().Mul(s, nil)
122-
// compute RAh = R + A^h
122+
// compute RAh = r + A^h
123123
Ah := g.Point().Mul(h, public)
124-
RAs := g.Point().Add(R, Ah)
124+
RAs := g.Point().Add(r, Ah)
125125

126126
if !S.Equal(RAs) {
127127
return errors.New("schnorr: invalid signature")
@@ -136,7 +136,7 @@ func VerifyWithChecks(g kyber.Group, pub, msg, sig []byte) error {
136136
func Verify(g kyber.Group, public kyber.Point, msg, sig []byte) error {
137137
PBuf, err := public.MarshalBinary()
138138
if err != nil {
139-
return fmt.Errorf("error unmarshalling public key: %s", err)
139+
return fmt.Errorf("error unmarshalling public key: %w", err)
140140
}
141141
return VerifyWithChecks(g, PBuf, msg, sig)
142142
}

‎sign/schnorr/schnorr_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ type quickstream struct {
7171
rand *rand.Rand
7272
}
7373

74-
func (s *quickstream) XORKeyStream(dst, src []byte) {
74+
func (s *quickstream) XORKeyStream(dst, _ []byte) {
7575
s.rand.Read(dst)
7676
}
7777

78-
func (s *quickstream) Generate(rand *rand.Rand, size int) reflect.Value {
78+
func (s *quickstream) Generate(rand *rand.Rand, _ int) reflect.Value {
7979
return reflect.ValueOf(&quickstream{rand: rand})
8080
}
8181

@@ -99,10 +99,10 @@ func TestQuickSchnorrSignature(t *testing.T) {
9999

100100
func TestSchnorrMalleability(t *testing.T) {
101101
/* l = 2^252+27742317777372353535851937790883648493, prime order of the base point */
102-
var L []uint16 = []uint16{0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7,
102+
L := []uint16{0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7,
103103
0xa2, 0xde, 0xf9, 0xde, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
104104
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10}
105-
var c uint16 = 0
105+
var c uint16
106106

107107
msg := []byte("Hello Schnorr")
108108
suite := edwards25519.NewBlakeSHA256Ed25519()

0 commit comments

Comments
 (0)