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/encrypt.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/encrypt.go')
| -rw-r--r-- | swarm/api/encrypt.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index ffe6c16d2..0d516b3d5 100644 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "golang.org/x/crypto/sha3" ) type RefEncryption struct { @@ -39,12 +39,12 @@ func NewRefEncryption(refSize int) *RefEncryption { } func (re *RefEncryption) Encrypt(ref []byte, key []byte) ([]byte, error) { - spanEncryption := encryption.New(key, 0, uint32(re.refSize/32), sha3.NewKeccak256) + spanEncryption := encryption.New(key, 0, uint32(re.refSize/32), sha3.NewLegacyKeccak256) encryptedSpan, err := spanEncryption.Encrypt(re.span) if err != nil { return nil, err } - dataEncryption := encryption.New(key, re.refSize, 0, sha3.NewKeccak256) + dataEncryption := encryption.New(key, re.refSize, 0, sha3.NewLegacyKeccak256) encryptedData, err := dataEncryption.Encrypt(ref) if err != nil { return nil, err @@ -57,7 +57,7 @@ func (re *RefEncryption) Encrypt(ref []byte, key []byte) ([]byte, error) { } func (re *RefEncryption) Decrypt(ref []byte, key []byte) ([]byte, error) { - spanEncryption := encryption.New(key, 0, uint32(re.refSize/32), sha3.NewKeccak256) + spanEncryption := encryption.New(key, 0, uint32(re.refSize/32), sha3.NewLegacyKeccak256) decryptedSpan, err := spanEncryption.Decrypt(ref[:8]) if err != nil { return nil, err @@ -68,7 +68,7 @@ func (re *RefEncryption) Decrypt(ref []byte, key []byte) ([]byte, error) { return nil, errors.New("invalid span in encrypted reference") } - dataEncryption := encryption.New(key, re.refSize, 0, sha3.NewKeccak256) + dataEncryption := encryption.New(key, re.refSize, 0, sha3.NewLegacyKeccak256) decryptedRef, err := dataEncryption.Decrypt(ref[8:]) if err != nil { return nil, err |