diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-01-04 15:51:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 15:51:12 +0800 |
| commit | 391d4cb9b53eb9f71862cbb8a6cca332d5a76f94 (patch) | |
| tree | 7697f49be5353066df0968ff8af4169dfda2cdb1 /crypto/crypto.go | |
| parent | 3f421aca54bb5216e0f949966481fa4516c52273 (diff) | |
| parent | 8ec344bf604a56e4bd313660448345708c5aeb51 (diff) | |
| download | dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.gz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.zst dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.zip | |
Merge pull request #18390 from realdave/remove-sha3-pkg
vendor, crypto, swarm: switch over to upstream sha3 package
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 9b3e76d40..4567fafc7 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/rlp" + "golang.org/x/crypto/sha3" ) var ( @@ -43,7 +43,7 @@ var errInvalidPubkey = errors.New("invalid secp256k1 public key") // Keccak256 calculates and returns the Keccak256 hash of the input data. func Keccak256(data ...[]byte) []byte { - d := sha3.NewKeccak256() + d := sha3.NewLegacyKeccak256() for _, b := range data { d.Write(b) } @@ -53,7 +53,7 @@ func Keccak256(data ...[]byte) []byte { // Keccak256Hash calculates and returns the Keccak256 hash of the input data, // converting it to an internal Hash data structure. func Keccak256Hash(data ...[]byte) (h common.Hash) { - d := sha3.NewKeccak256() + d := sha3.NewLegacyKeccak256() for _, b := range data { d.Write(b) } @@ -63,7 +63,7 @@ func Keccak256Hash(data ...[]byte) (h common.Hash) { // Keccak512 calculates and returns the Keccak512 hash of the input data. func Keccak512(data ...[]byte) []byte { - d := sha3.NewKeccak512() + d := sha3.NewLegacyKeccak512() for _, b := range data { d.Write(b) } |