diff options
| author | Martin Holst Swende <martin@swende.se> | 2019-05-26 06:07:10 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2019-05-26 06:07:10 +0800 |
| commit | fec3b56f7f440b635787f740b527f15b818c0e1b (patch) | |
| tree | 034c22ce8ce77ce32c77169b44e5e3bf1fa0e036 /p2p | |
| parent | 9efc1a847e53b63847f6f95e0857b1a6300786eb (diff) | |
| download | go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar.gz go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar.bz2 go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar.lz go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar.xz go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.tar.zst go-tangerine-fec3b56f7f440b635787f740b527f15b818c0e1b.zip | |
accounts, p2p, rpc: make CGO_ENABLED=0 build again (#19593)
* p2p: remove direct import of cgo-library
* accounts, rpc: more nocgo alternatives
* rpc: move unix path constant into separate file
* accounts/scwallet: address review concerns, remove copy-pasta
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/discover/node.go | 3 | ||||
| -rw-r--r-- | p2p/rlpx.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 8d4af166b..a7d9ce736 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -25,7 +25,6 @@ import ( "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/p2p/enode" ) @@ -64,7 +63,7 @@ func (e encPubkey) id() enode.ID { // recoverNodeKey computes the public key used to sign the // given hash from the signature. func recoverNodeKey(hash, sig []byte) (key encPubkey, err error) { - pubkey, err := secp256k1.RecoverPubkey(hash, sig) + pubkey, err := crypto.Ecrecover(hash, sig) if err != nil { return key, err } diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 0697ef3b0..0636431f5 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -38,7 +38,6 @@ import ( "github.com/ethereum/go-ethereum/common/bitutil" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" "golang.org/x/crypto/sha3" @@ -400,7 +399,7 @@ func (h *encHandshake) handleAuthMsg(msg *authMsgV4, prv *ecdsa.PrivateKey) erro return err } signedMsg := xor(token, h.initNonce) - remoteRandomPub, err := secp256k1.RecoverPubkey(signedMsg, msg.Signature[:]) + remoteRandomPub, err := crypto.Ecrecover(signedMsg, msg.Signature[:]) if err != nil { return err } |