forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/enr: use SizeLimit const instead of hardcoded 300 bytes.

Browse source
This commit is contained in:
Anton Evangelatov 2017-12-06 13:56:28 +01:00 committed by Felix Lange
parent 3b304ff8bf
commit 86acc5d914
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
p2p/enr/enr.go
View file

@ -33,6 +33,10 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
const (
SizeLimit = 300
)
var ( var (
errNoID = errors.New("unknown or unspecified identity scheme") errNoID = errors.New("unknown or unspecified identity scheme")
errInvalidSigsize = errors.New("invalid signature size") errInvalidSigsize = errors.New("invalid signature size")
@ -40,7 +44,7 @@ var (
errNotSorted = errors.New("record key/value pairs are not sorted by key") errNotSorted = errors.New("record key/value pairs are not sorted by key")
errDuplicateKey = errors.New("record contains duplicate key") errDuplicateKey = errors.New("record contains duplicate key")
errIncompletePair = errors.New("record contains incomplete k/v pair") errIncompletePair = errors.New("record contains incomplete k/v pair")
errTooBig = errors.New("record bigger than 300 bytes") errTooBig = fmt.Errorf("record bigger than %d bytes", SizeLimit)
) )
// Key is implemented by known node record key types. // Key is implemented by known node record key types.
@ -201,7 +205,7 @@ func (r *Record) NodeAddr() ([]byte, error) {
// Sign signs the record with the provided private key. // Sign signs the record with the provided private key.
// It updates record's identity scheme and public key. // It updates record's identity scheme and public key.
// It returns an error if signed record is bigger than 300 bytes. // It returns an error if signed record is bigger than SizeLimit bytes.
func (r *Record) Sign(privkey *ecdsa.PrivateKey) error { func (r *Record) Sign(privkey *ecdsa.PrivateKey) error {
pk := (*btcec.PublicKey)(&privkey.PublicKey) pk := (*btcec.PublicKey)(&privkey.PublicKey)
r.seq = r.seq + 1 r.seq = r.seq + 1
@ -239,7 +243,7 @@ func (r *Record) signAndEncode(privkey *ecdsa.PrivateKey) error {
return err return err
} }
if len(r.raw) > 300 { if len(r.raw) > SizeLimit {
return errTooBig return errTooBig
} }

2
p2p/enr/enr_test.go
View file

@ -281,7 +281,7 @@ func TestPythonInterop(t *testing.T) {
} }
} }
// TestRecordTooBig tests that records bigger than 300 bytes cannot be signed. // TestRecordTooBig tests that records bigger than SizeLimit bytes cannot be signed.
func TestRecordTooBig(t *testing.T) { func TestRecordTooBig(t *testing.T) {
privkey, err := crypto.HexToECDSA(privkeyHex) privkey, err := crypto.HexToECDSA(privkeyHex)
if err != nil { if err != nil {