Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit cde7354

Browse files
authored
Update modules (#291)
* Update modules * Panic if edwards25519 setters return errors
1 parent a40645f commit cde7354

File tree

3 files changed

+78
-33
lines changed

3 files changed

+78
-33
lines changed

ed25519/ed25519.go

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ func newKeyFromSeed(privateKey, seed []byte) {
121121

122122
digest := sha512.Sum512(seed)
123123

124-
s := new(edwards25519.Scalar).SetBytesWithClamping(digest[:32])
124+
s, err := new(edwards25519.Scalar).SetBytesWithClamping(digest[:32])
125+
if err != nil {
126+
panic(err)
127+
}
125128
A := new(edwards25519.Point).ScalarBaseMult(s)
126129

127130
copy(privateKey, seed)
@@ -148,14 +151,20 @@ func sign(signature, privateKey, message []byte) {
148151
var digest1, messageDigest, hramDigest [64]byte
149152
h.Sum(digest1[:0])
150153

151-
s := new(edwards25519.Scalar).SetBytesWithClamping(digest1[:32])
154+
s, err := new(edwards25519.Scalar).SetBytesWithClamping(digest1[:32])
155+
if err != nil {
156+
panic(err)
157+
}
152158

153159
h.Reset()
154160
h.Write(digest1[32:])
155161
h.Write(message)
156162
h.Sum(messageDigest[:0])
157163

158-
rReduced := new(edwards25519.Scalar).SetUniformBytes(messageDigest[:])
164+
rReduced, err := new(edwards25519.Scalar).SetUniformBytes(messageDigest[:])
165+
if err != nil {
166+
panic(err)
167+
}
159168
R := new(edwards25519.Point).ScalarBaseMult(rReduced)
160169

161170
encodedR := R.Bytes()
@@ -166,7 +175,10 @@ func sign(signature, privateKey, message []byte) {
166175
h.Write(message)
167176
h.Sum(hramDigest[:0])
168177

169-
kReduced := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:])
178+
kReduced, err := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:])
179+
if err != nil {
180+
panic(err)
181+
}
170182
S := new(edwards25519.Scalar).MultiplyAdd(kReduced, s, rReduced)
171183

172184
copy(signature[:], encodedR[:])
@@ -197,7 +209,10 @@ func Verify(publicKey PublicKey, message, sig []byte) bool {
197209
var digest [64]byte
198210
h.Sum(digest[:0])
199211

200-
hReduced := new(edwards25519.Scalar).SetUniformBytes(digest[:])
212+
hReduced, err := new(edwards25519.Scalar).SetUniformBytes(digest[:])
213+
if err != nil {
214+
panic(err)
215+
}
201216

202217
// ZIP215: this works because SetBytes does not check that encodings are canonical
203218
checkR, err := new(edwards25519.Point).SetBytes(sig[:32])

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/iotaledger/iota.go/v2
22

3-
go 1.15
3+
go 1.16
44

55
require (
6-
filippo.io/edwards25519 v1.0.0-beta.2
7-
github.com/eclipse/paho.mqtt.golang v1.3.2
8-
github.com/iotaledger/iota.go v1.0.0-beta.15.0.20210406071024-a52cf8c2c21e
6+
filippo.io/edwards25519 v1.0.0-rc.1
7+
github.com/eclipse/paho.mqtt.golang v1.3.5
8+
github.com/iotaledger/iota.go v1.0.0
99
github.com/pkg/errors v0.9.1 // indirect
10-
github.com/stretchr/testify v1.6.1
11-
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
12-
google.golang.org/grpc v1.33.1
13-
google.golang.org/protobuf v1.25.0
14-
gopkg.in/h2non/gock.v1 v1.0.15
10+
github.com/stretchr/testify v1.7.0
11+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
12+
google.golang.org/grpc v1.40.0
13+
google.golang.org/protobuf v1.27.1
14+
gopkg.in/h2non/gock.v1 v1.1.2
1515
)

0 commit comments

Comments
 (0)