diff options
| author | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 02:40:27 +0800 |
|---|---|---|
| committer | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 06:34:34 +0800 |
| commit | 436fc8d76a4871d67a61dc86c1a635e20594a0e6 (patch) | |
| tree | 5fad9f69b068f43ca606e2887f5522188e7f9ddd /crypto/key_store_passphrase.go | |
| parent | c20d6e5e4ed8eff6d26cd849f90ca42dd5a7040c (diff) | |
| download | go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.gz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.bz2 go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.lz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.xz go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.zst go-tangerine-436fc8d76a4871d67a61dc86c1a635e20594a0e6.zip | |
all: Rename crypto.Sha3{,Hash}() to crypto.Keccak256{,Hash}()
As we aren't really using the standarized SHA-3
Diffstat (limited to 'crypto/key_store_passphrase.go')
| -rw-r--r-- | crypto/key_store_passphrase.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go index 94411d2f9..b7ae9e1de 100644 --- a/crypto/key_store_passphrase.go +++ b/crypto/key_store_passphrase.go @@ -110,7 +110,7 @@ func (ks keyStorePassphrase) StoreKey(key *Key, auth string) (err error) { return err } - mac := Sha3(derivedKey[16:32], cipherText) + mac := Keccak256(derivedKey[16:32], cipherText) scryptParamsJSON := make(map[string]interface{}, 5) scryptParamsJSON["n"] = ks.scryptN @@ -210,7 +210,7 @@ func decryptKeyV3(keyProtected *encryptedKeyJSONV3, auth string) (keyBytes []byt return nil, nil, err } - calculatedMAC := Sha3(derivedKey[16:32], cipherText) + calculatedMAC := Keccak256(derivedKey[16:32], cipherText) if !bytes.Equal(calculatedMAC, mac) { return nil, nil, errors.New("Decryption failed: MAC mismatch") } @@ -244,12 +244,12 @@ func decryptKeyV1(keyProtected *encryptedKeyJSONV1, auth string) (keyBytes []byt return nil, nil, err } - calculatedMAC := Sha3(derivedKey[16:32], cipherText) + calculatedMAC := Keccak256(derivedKey[16:32], cipherText) if !bytes.Equal(calculatedMAC, mac) { return nil, nil, errors.New("Decryption failed: MAC mismatch") } - plainText, err := aesCBCDecrypt(Sha3(derivedKey[:16])[:16], cipherText, iv) + plainText, err := aesCBCDecrypt(Keccak256(derivedKey[:16])[:16], cipherText, iv) if err != nil { return nil, nil, err } |