Security fix

bigint.go

@@ -10,15 +10,21 @@ import (
 
 type BigInt []byte
 
+const maxBigIntLen = 1024
+
 func getLen(data []byte) (int, error) {
 	if len(data) < 1 {
 		return 0, fmt.Errorf("(bigint) %w", encoding.ErrBuffer{1, len(data)})
 	}
+	limit := len(data)
+	if limit > maxBigIntLen {
+		limit = maxBigIntLen
+	}
 	i := 0
-	for i < len(data) && data[i]&0x80 != 0 {
+	for i < limit && data[i]&0x80 != 0 {
 		i += 1
 	}
-	if i == len(data) {
+	if i == limit {
 		return 0, fmt.Errorf("(bigint) %w", encoding.ErrBuffer{i, len(data)})
 	}
 	return i + 1, nil

generate.go

@@ -9,9 +9,10 @@ import (
 )
 
 type base58Type struct {
-	Type   string
-	Length string
-	Prefix string
+	Type     string
+	Length   string
+	Prefix   string
+	IsSecret bool // If true, String() returns redacted output to prevent accidental logging
 }
 
 type hexType struct {
@@ -108,44 +109,52 @@ var base58Data = []base58Type{
 		Prefix: "BLS12_381PublicKey",
 	},
 	{
-		Type:   "Ed25519PrivateKey",
-		Length: "Ed25519SeedBytesLen",
-		Prefix: "Ed25519Seed",
+		Type:     "Ed25519PrivateKey",
+		Length:   "Ed25519SeedBytesLen",
+		Prefix:   "Ed25519Seed",
+		IsSecret: true,
 	},
 	{
-		Type:   "Secp256k1PrivateKey",
-		Length: "Secp256k1PrivateKeyBytesLen",
-		Prefix: "Secp256k1SecretKey",
+		Type:     "Secp256k1PrivateKey",
+		Length:   "Secp256k1PrivateKeyBytesLen",
+		Prefix:   "Secp256k1SecretKey",
+		IsSecret: true,
 	},
 	{
-		Type:   "P256PrivateKey",
-		Length: "P256PrivateKeyBytesLen",
-		Prefix: "P256SecretKey",
+		Type:     "P256PrivateKey",
+		Length:   "P256PrivateKeyBytesLen",
+		Prefix:   "P256SecretKey",
+		IsSecret: true,
 	},
 	{
-		Type:   "BLSPrivateKey",
-		Length: "BLSPrivateKeyBytesLen",
-		Prefix: "BLS12_381SecretKey",
+		Type:     "BLSPrivateKey",
+		Length:   "BLSPrivateKeyBytesLen",
+		Prefix:   "BLS12_381SecretKey",
+		IsSecret: true,
 	},
 	{
-		Type:   "Ed25519EncryptedPrivateKey",
-		Length: "Ed25519EncryptedSeedBytesLen",
-		Prefix: "Ed25519EncryptedSeed",
+		Type:     "Ed25519EncryptedPrivateKey",
+		Length:   "Ed25519EncryptedSeedBytesLen",
+		Prefix:   "Ed25519EncryptedSeed",
+		IsSecret: true,
 	},
 	{
-		Type:   "Secp256k1EncryptedPrivateKey",
-		Length: "Secp256k1EncryptedPrivateKeyBytesLen",
-		Prefix: "Secp256k1EncryptedSecretKey",
+		Type:     "Secp256k1EncryptedPrivateKey",
+		Length:   "Secp256k1EncryptedPrivateKeyBytesLen",
+		Prefix:   "Secp256k1EncryptedSecretKey",
+		IsSecret: true,
 	},
 	{
-		Type:   "P256EncryptedPrivateKey",
-		Length: "P256EncryptedPrivateKeyBytesLen",
-		Prefix: "P256EncryptedSecretKey",
+		Type:     "P256EncryptedPrivateKey",
+		Length:   "P256EncryptedPrivateKeyBytesLen",
+		Prefix:   "P256EncryptedSecretKey",
+		IsSecret: true,
 	},
 	{
-		Type:   "BLSEncryptedPrivateKey",
-		Length: "BLSEncryptedPrivateKeyBytesLen",
-		Prefix: "BLS12_381EncryptedSecretKey",
+		Type:     "BLSEncryptedPrivateKey",
+		Length:   "BLSEncryptedPrivateKeyBytesLen",
+		Prefix:   "BLS12_381EncryptedSecretKey",
+		IsSecret: true,
 	},
 	{
 		Type:   "GenericSignature",
@@ -282,7 +291,11 @@ func (self *{{.Type}}) ToBase58() []byte {
 }
 
 func (self {{.Type}}) String() string {
+{{- if .IsSecret}}
+	return "[REDACTED:{{.Type}}]"
+{{- else}}
 	return string(self.ToBase58())
+{{- end}}
 }
 
 func (self {{.Type}}) MarshalText() ([]byte, error) {

go.mod

@@ -1,22 +1,22 @@
 module github.com/ecadlabs/gotez/v2
 
-go 1.23.0
+go 1.24.0
 
 toolchain go1.24.4
 
 require (
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
 	github.com/ecadlabs/goblst v1.1.0
 	github.com/ecadlabs/pretty v0.0.0-20230412124801-f948fc689a04
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.36.0
+	golang.org/x/crypto v0.47.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	golang.org/x/sys v0.40.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/ecadlabs/goblst v1.1.0 h1:U0JzRxIbtv1OsefUqfXNJ1HLzPMSaHY8aOeIQggUe9U=
 github.com/ecadlabs/goblst v1.1.0/go.mod h1:s67gqaOol9o6fguh+evH75X5uQniOhv1HG/EU8xPLPY=
 github.com/ecadlabs/pretty v0.0.0-20230412124801-f948fc689a04 h1:7WdblGykGxtGGtchW4kzTaJJO8Fm+JKhLzhttOOWr9k=
@@ -15,12 +17,18 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

key.go

@@ -119,6 +119,9 @@ func (k *EncodedPublicKeyHash) UnmarshalText(text []byte) error {
 	if err != nil {
 		return err
 	}
+	if len(payload) != PKHBytesLen {
+		return errors.New("gotez: invalid public key hash payload length")
+	}
 	var result PublicKeyHash
 	switch pre {
 	case &prefix.Ed25519PublicKeyHash:
@@ -159,12 +162,9 @@ func (k *EncodedPublicKeyHash) UnmarshalText(text []byte) error {
 	return nil
 }
 
-func (pkh *Ed25519PublicKeyHash) ToComparable() (out EncodedPublicKeyHash) {
-	var (
-		x   PublicKeyHash = pkh
-		buf bytes.Buffer
-	)
-	if err := encoding.Encode(&buf, &x); err != nil {
+func publicKeyHashToComparable(pkh PublicKeyHash) (out EncodedPublicKeyHash) {
+	var buf bytes.Buffer
+	if err := encoding.Encode(&buf, &pkh); err != nil {
 		panic(err)
 	}
 	b := buf.Bytes()
@@ -175,27 +175,19 @@ func (pkh *Ed25519PublicKeyHash) ToComparable() (out EncodedPublicKeyHash) {
 	return
 }
 
+func (pkh *Ed25519PublicKeyHash) ToComparable() EncodedPublicKeyHash {
+	return publicKeyHashToComparable(pkh)
+}
+
 func (pkh *Ed25519PublicKeyHash) Eq(other PublicKeyHash) bool {
 	if b, ok := other.(*Ed25519PublicKeyHash); ok {
 		return bytes.Equal(pkh[:], b[:])
 	}
 	return false
 }
 
-func (pkh *Secp256k1PublicKeyHash) ToComparable() (out EncodedPublicKeyHash) {
-	var (
-		x   PublicKeyHash = pkh
-		buf bytes.Buffer
-	)
-	if err := encoding.Encode(&buf, &x); err != nil {
-		panic(err)
-	}
-	b := buf.Bytes()
-	if len(b) != publicKeyHashComparableKeyLen {
-		panic("invalid public key hash length")
-	}
-	copy(out[:], b)
-	return
+func (pkh *Secp256k1PublicKeyHash) ToComparable() EncodedPublicKeyHash {
+	return publicKeyHashToComparable(pkh)
 }
 
 func (pkh *Secp256k1PublicKeyHash) Eq(other PublicKeyHash) bool {
@@ -205,20 +197,8 @@ func (pkh *Secp256k1PublicKeyHash) Eq(other PublicKeyHash) bool {
 	return false
 }
 
-func (pkh *P256PublicKeyHash) ToComparable() (out EncodedPublicKeyHash) {
-	var (
-		x   PublicKeyHash = pkh
-		buf bytes.Buffer
-	)
-	if err := encoding.Encode(&buf, &x); err != nil {
-		panic(err)
-	}
-	b := buf.Bytes()
-	if len(b) != publicKeyHashComparableKeyLen {
-		panic("invalid public key hash length")
-	}
-	copy(out[:], b)
-	return
+func (pkh *P256PublicKeyHash) ToComparable() EncodedPublicKeyHash {
+	return publicKeyHashToComparable(pkh)
 }
 
 func (pkh *P256PublicKeyHash) Eq(other PublicKeyHash) bool {
@@ -228,20 +208,8 @@ func (pkh *P256PublicKeyHash) Eq(other PublicKeyHash) bool {
 	return false
 }
 
-func (pkh *BLSPublicKeyHash) ToComparable() (out EncodedPublicKeyHash) {
-	var (
-		x   PublicKeyHash = pkh
-		buf bytes.Buffer
-	)
-	if err := encoding.Encode(&buf, &x); err != nil {
-		panic(err)
-	}
-	b := buf.Bytes()
-	if len(b) != publicKeyHashComparableKeyLen {
-		panic("invalid public key hash length")
-	}
-	copy(out[:], b)
-	return
+func (pkh *BLSPublicKeyHash) ToComparable() EncodedPublicKeyHash {
+	return publicKeyHashToComparable(pkh)
 }
 
 func (pkh *BLSPublicKeyHash) Eq(other PublicKeyHash) bool {
@@ -390,6 +358,7 @@ func (pk *Ed25519EncryptedPrivateKey) Decrypt(passCb func() ([]byte, error)) (Pr
 	if err != nil {
 		return nil, err
 	}
+	defer memzero(decrypted)
 	var out Ed25519PrivateKey
 	if len(decrypted) != len(out) {
 		return nil, ErrInvalidDecryptedLen
@@ -403,6 +372,7 @@ func (pk *Secp256k1EncryptedPrivateKey) Decrypt(passCb func() ([]byte, error)) (
 	if err != nil {
 		return nil, err
 	}
+	defer memzero(decrypted)
 	var out Secp256k1PrivateKey
 	if len(decrypted) != len(out) {
 		return nil, ErrInvalidDecryptedLen
@@ -416,6 +386,7 @@ func (pk *P256EncryptedPrivateKey) Decrypt(passCb func() ([]byte, error)) (Priva
 	if err != nil {
 		return nil, err
 	}
+	defer memzero(decrypted)
 	var out P256PrivateKey
 	if len(decrypted) != len(out) {
 		return nil, ErrInvalidDecryptedLen
@@ -429,6 +400,7 @@ func (pk *BLSEncryptedPrivateKey) Decrypt(passCb func() ([]byte, error)) (Privat
 	if err != nil {
 		return nil, err
 	}
+	defer memzero(decrypted)
 	var out BLSPrivateKey
 	if len(decrypted) != len(out) {
 		return nil, ErrInvalidDecryptedLen

signature.go

@@ -35,7 +35,7 @@ func (sig *BLSSignature) Signature() {}
 func NewEd25519Signature(sig []byte) *Ed25519Signature {
 	var out Ed25519Signature
 	if len(sig) != len(out) {
-		panic("gotez: invalid ed25519 signature length length")
+		panic("gotez: invalid Ed25519 signature length")
 	}
 	copy(out[:], sig)
 	return &out
@@ -76,7 +76,7 @@ func (sig *P256Signature) Point() (r, s *big.Int) {
 func NewBLSSignature(compressedPoint []byte) *BLSSignature {
 	var out BLSSignature
 	if len(compressedPoint) != len(out) {
-		panic("gotez: invalid ed25519 signature length length")
+		panic("gotez: invalid BLS signature length")
 	}
 	copy(out[:], compressedPoint)
 	return &out