aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/key_store_passphrase.go
diff options
context:
space:
mode:
authorGustav Simonsson <gustav.simonsson@gmail.com>2015-01-28 12:12:57 +0800
committerGustav Simonsson <gustav.simonsson@gmail.com>2015-01-28 12:12:57 +0800
commit8d9752a557e33341a5fb73239dbae664b2f8aaa0 (patch)
treeb5e6e0f0e39e8915af4bb76ed8386dfb443415c9 /crypto/key_store_passphrase.go
parent512ffa2bf4308b44aa6f43f25238b375b58d7dbc (diff)
downloadgo-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar.gz
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar.bz2
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar.lz
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar.xz
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.tar.zst
go-tangerine-8d9752a557e33341a5fb73239dbae664b2f8aaa0.zip
Address pull request comments
* Use crypto.Sign instead of directly calling secp256k1 lib * Rename UserAccount to Account and Addr to Address (for consistency) * Change AccountManager.Sign to take ptr to Account instead of address byte array * Simplify copying of Accounts in Accounts() * PubkeyToAddress and GetEntropyCSPRNG now exported
Diffstat (limited to 'crypto/key_store_passphrase.go')
-rw-r--r--crypto/key_store_passphrase.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 807a91397..0862b7886 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -116,7 +116,7 @@ func (ks keyStorePassphrase) GetKeyAddresses() (addresses [][]byte, err error) {
func (ks keyStorePassphrase) StoreKey(key *Key, auth string) (err error) {
authArray := []byte(auth)
- salt := getEntropyCSPRNG(32)
+ salt := GetEntropyCSPRNG(32)
derivedKey, err := scrypt.Key(authArray, salt, scryptN, scryptr, scryptp, scryptdkLen)
if err != nil {
return err
@@ -131,7 +131,7 @@ func (ks keyStorePassphrase) StoreKey(key *Key, auth string) (err error) {
return err
}
- iv := getEntropyCSPRNG(aes.BlockSize) // 16
+ iv := GetEntropyCSPRNG(aes.BlockSize) // 16
AES256CBCEncrypter := cipher.NewCBCEncrypter(AES256Block, iv)
cipherText := make([]byte, len(toEncrypt))
AES256CBCEncrypter.CryptBlocks(cipherText, toEncrypt)
@@ -197,7 +197,7 @@ func DecryptKey(ks keyStorePassphrase, keyAddr []byte, auth string) (keyBytes []
return keyBytes, keyId, err
}
-func getEntropyCSPRNG(n int) []byte {
+func GetEntropyCSPRNG(n int) []byte {
mainBuff := make([]byte, n)
_, err := io.ReadFull(crand.Reader, mainBuff)
if err != nil {