Skip to content

Commit 4c8d1aa

Browse files
ivokubivokub
committed
refactor: make marshal errors private
1 parent 666b963 commit 4c8d1aa

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎internal/generator/ecdsa/template/ecdsa.test.go.tmpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestNonMalleability(t *testing.T) {
8282
bsig := make([]byte, 2*sizeFr+1)
8383
var sig Signature
8484
_, err := sig.SetBytes(bsig)
85-
if err != ErrWrongSize {
85+
if err != errWrongSize {
8686
t.Fatal("should raise wrong size error")
8787
}
8888
})
@@ -98,7 +98,7 @@ func TestNonMalleability(t *testing.T) {
9898

9999
var sig Signature
100100
_, err := sig.SetBytes(bsig)
101-
if err != ErrRBiggerThanRMod {
101+
if err != errRBiggerThanRMod {
102102
t.Fatal("should raise error r >= r_mod")
103103
}
104104
})
@@ -114,7 +114,7 @@ func TestNonMalleability(t *testing.T) {
114114

115115
var sig Signature
116116
_, err := sig.SetBytes(bsig)
117-
if err != ErrSBiggerThanRMod {
117+
if err != errSBiggerThanRMod {
118118
t.Fatal("should raise error s >= r_mod")
119119
}
120120
})
@@ -130,7 +130,7 @@ func TestNoZeros(t *testing.T) {
130130
bts := sig.Bytes()
131131
var newSig Signature
132132
_, err := newSig.SetBytes(bts)
133-
if err != ErrZero {
133+
if err != errZero {
134134
t.Fatal("expected error for zero R")
135135
}
136136
})
@@ -142,7 +142,7 @@ func TestNoZeros(t *testing.T) {
142142
bts := sig.Bytes()
143143
var newSig Signature
144144
_, err := newSig.SetBytes(bts)
145-
if err != ErrZero {
145+
if err != errZero {
146146
t.Fatal("expected error for zero S")
147147
}
148148
})

‎internal/generator/ecdsa/template/marshal.go.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
{{- end }}
1111
)
1212

13-
var ErrWrongSize = errors.New("wrong size buffer")
14-
var ErrRBiggerThanRMod = errors.New("r >= r_mod")
15-
var ErrSBiggerThanRMod = errors.New("s >= r_mod")
16-
var ErrZero = errors.New("zero value")
13+
var errWrongSize = errors.New("wrong size buffer")
14+
var errRBiggerThanRMod = errors.New("r >= r_mod")
15+
var errSBiggerThanRMod = errors.New("s >= r_mod")
16+
var errZero = errors.New("zero value")
1717

1818
// Bytes returns the binary representation of the public key
1919
// follows https://tools.ietf.org/html/rfc8032#section-3.1
@@ -130,7 +130,7 @@ func (sig *Signature) Bytes() []byte {
130130
func (sig *Signature) SetBytes(buf []byte) (int, error) {
131131
n := 0
132132
if len(buf) != sizeSignature {
133-
return n, ErrWrongSize
133+
return n, errWrongSize
134134
}
135135

136136
// S, R < R_mod (to avoid malleability)
@@ -139,17 +139,17 @@ func (sig *Signature) SetBytes(buf []byte) (int, error) {
139139
bufBigInt := new(big.Int)
140140
bufBigInt.SetBytes(buf[:sizeFr])
141141
if bufBigInt.Cmp(zero) == 0 {
142-
return 0, ErrZero
142+
return 0, errZero
143143
}
144144
if bufBigInt.Cmp(frMod) != -1 {
145-
return 0, ErrRBiggerThanRMod
145+
return 0, errRBiggerThanRMod
146146
}
147147
bufBigInt.SetBytes(buf[sizeFr : 2*sizeFr])
148148
if bufBigInt.Cmp(zero) == 0 {
149-
return 0, ErrZero
149+
return 0, errZero
150150
}
151151
if bufBigInt.Cmp(frMod) != -1 {
152-
return 0, ErrSBiggerThanRMod
152+
return 0, errSBiggerThanRMod
153153
}
154154

155155
subtle.ConstantTimeCopy(1, sig.R[:], buf[:sizeFr])

‎internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestNonMalleability(t *testing.T) {
4848
bsig := make([]byte, 2*sizeFr+1)
4949
var sig Signature
5050
_, err := sig.SetBytes(bsig)
51-
if err != ErrWrongSize {
51+
if err != errWrongSize {
5252
t.Fatal("should raise wrong size error")
5353
}
5454
})
@@ -66,7 +66,7 @@ func TestNonMalleability(t *testing.T) {
6666

6767
var sig Signature
6868
_, err := sig.SetBytes(bsig)
69-
if err != ErrRBiggerThanPMod {
69+
if err != errRBiggerThanPMod {
7070
t.Fatal("should raise error r >= p_mod")
7171
}
7272
})
@@ -82,7 +82,7 @@ func TestNonMalleability(t *testing.T) {
8282

8383
var sig Signature
8484
_, err := sig.SetBytes(bsig)
85-
if err != ErrSBiggerThanRMod {
85+
if err != errSBiggerThanRMod {
8686
t.Fatal("should raise error s >= r_mod")
8787
}
8888
})
@@ -100,7 +100,7 @@ func TestNoZeros(t *testing.T) {
100100
bts := sig.Bytes()
101101
var newSig Signature
102102
_, err := newSig.SetBytes(bts)
103-
if err != ErrZero {
103+
if err != errZero {
104104
t.Fatal("expected error for zero R.Y")
105105
}
106106
})
@@ -114,7 +114,7 @@ func TestNoZeros(t *testing.T) {
114114
bts := sig.Bytes()
115115
var newSig Signature
116116
_, err := newSig.SetBytes(bts)
117-
if err != ErrZero {
117+
if err != errZero {
118118
t.Fatal("expected error for zero S")
119119
}
120120
})

‎internal/generator/edwards/eddsa/template/marshal.go.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
// cf point.go (ugly copy)
1111
const mUnmask = 0x7f
1212

13-
var ErrWrongSize = errors.New("wrong size buffer")
14-
var ErrSBiggerThanRMod = errors.New("s >= r_mod")
15-
var ErrRBiggerThanPMod = errors.New("r >= p_mod")
16-
var ErrZero = errors.New("zero value")
13+
var errWrongSize = errors.New("wrong size buffer")
14+
var errSBiggerThanRMod = errors.New("s >= r_mod")
15+
var errRBiggerThanPMod = errors.New("r >= p_mod")
16+
var errZero = errors.New("zero value")
1717

1818
// Bytes returns the binary representation of the public key
1919
// follows https://tools.ietf.org/html/rfc8032#section-3.1
@@ -112,7 +112,7 @@ func (sig *Signature) Bytes() []byte {
112112
func (sig *Signature) SetBytes(buf []byte) (int, error) {
113113
n := 0
114114
if len(buf) != sizeSignature {
115-
return n, ErrWrongSize
115+
return n, errWrongSize
116116
}
117117

118118
// R < P_mod (to avoid malleability)
@@ -127,21 +127,21 @@ func (sig *Signature) SetBytes(buf []byte) (int, error) {
127127
bufCopy[0] &= mUnmask
128128
bufBigInt.SetBytes(bufCopy)
129129
if bufBigInt.Cmp(zero) == 0 {
130-
return 0, ErrZero
130+
return 0, errZero
131131
}
132132
if bufBigInt.Cmp(fpMod) != -1 {
133-
return 0, ErrRBiggerThanPMod
133+
return 0, errRBiggerThanPMod
134134
}
135135

136136
// S < R_mod (to avoid malleability)
137137
// R_mod is the relevant group size of the twisted Edwards NOT the fr snark field so it's supposedly smaller
138138
bufBigInt.SetBytes(buf[sizeFr : 2*sizeFr])
139139
if bufBigInt.Cmp(zero) == 0 {
140-
return 0, ErrZero
140+
return 0, errZero
141141
}
142142
cp := twistededwards.GetEdwardsCurve()
143143
if bufBigInt.Cmp(&cp.Order) != -1 {
144-
return 0, ErrSBiggerThanRMod
144+
return 0, errSBiggerThanRMod
145145
}
146146

147147
// deserialisation

0 commit comments

Comments
 (0)