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 /swarm/api/act.go | |
| parent | 3f421aca54bb5216e0f949966481fa4516c52273 (diff) | |
| parent | 8ec344bf604a56e4bd313660448345708c5aeb51 (diff) | |
| download | dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.gz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.bz2 dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.lz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.xz 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 'swarm/api/act.go')
| -rw-r--r-- | swarm/api/act.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/swarm/api/act.go b/swarm/api/act.go index e54369f9a..9566720b0 100644 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -15,11 +15,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/sctx" "github.com/ethereum/go-ethereum/swarm/storage" "golang.org/x/crypto/scrypt" + "golang.org/x/crypto/sha3" cli "gopkg.in/urfave/cli.v1" ) @@ -336,7 +336,7 @@ func (a *API) doDecrypt(ctx context.Context, credentials string, pk *ecdsa.Priva } func (a *API) getACTDecryptionKey(ctx context.Context, actManifestAddress storage.Address, sessionKey []byte) (found bool, ciphertext, decryptionKey []byte, err error) { - hasher := sha3.NewKeccak256() + hasher := sha3.NewLegacyKeccak256() hasher.Write(append(sessionKey, 0)) lookupKey := hasher.Sum(nil) hasher.Reset() @@ -462,7 +462,7 @@ func DoACT(ctx *cli.Context, privateKey *ecdsa.PrivateKey, salt []byte, grantees return nil, nil, nil, err } - hasher := sha3.NewKeccak256() + hasher := sha3.NewLegacyKeccak256() hasher.Write(append(sessionKey, 0)) lookupKey := hasher.Sum(nil) @@ -484,7 +484,7 @@ func DoACT(ctx *cli.Context, privateKey *ecdsa.PrivateKey, salt []byte, grantees if err != nil { return nil, nil, nil, err } - hasher := sha3.NewKeccak256() + hasher := sha3.NewLegacyKeccak256() hasher.Write(append(sessionKey, 0)) lookupKey := hasher.Sum(nil) |