diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2018-06-12 21:26:08 +0800 |
|---|---|---|
| committer | Guillaume Ballet <gballet@gmail.com> | 2018-06-12 21:26:08 +0800 |
| commit | 0255951587ef0eada5d162f3404bc481f70a2ce2 (patch) | |
| tree | 6aa0c1c9405df6a88f4cbeb72e170e6e19cf55d5 /internal | |
| parent | 85cd64df0e3331e46f41ec86a647f1b8ff306eda (diff) | |
| download | go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar.gz go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar.bz2 go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar.lz go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar.xz go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.tar.zst go-tangerine-0255951587ef0eada5d162f3404bc481f70a2ce2.zip | |
crypto: replace ToECDSAPub with error-checking func UnmarshalPubkey (#16932)
ToECDSAPub was unsafe because it returned a non-nil key with nil X, Y in
case of invalid input. This change replaces ToECDSAPub with
UnmarshalPubkey across the codebase.
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/ethapi/api.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index f5753da22..a465a5904 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -461,13 +461,11 @@ func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Byt } sig[64] -= 27 // Transform yellow paper V from 27/28 to 0/1 - rpk, err := crypto.Ecrecover(signHash(data), sig) + rpk, err := crypto.SigToPub(signHash(data), sig) if err != nil { return common.Address{}, err } - pubKey := crypto.ToECDSAPub(rpk) - recoveredAddr := crypto.PubkeyToAddress(*pubKey) - return recoveredAddr, nil + return crypto.PubkeyToAddress(*rpk), nil } // SignAndSendTransaction was renamed to SendTransaction. This method is deprecated |