roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Unexport randEntropy type and use exported Reader instead

Browse Source
This commit is contained in:
Gustav Simonsson 2015-02-13 15:38:18 +01:00
parent 8c056aebe1
commit 39434e383b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/key_store_test.go
View File

@ -9,7 +9,7 @@ import (
func TestKeyStorePlain(t *testing.T) { func TestKeyStorePlain(t *testing.T) {
ks := NewKeyStorePlain(DefaultDataDir()) ks := NewKeyStorePlain(DefaultDataDir())
pass := "" // not used but required by API pass := "" // not used but required by API
k1, err := ks.GenerateNewKey(new(randentropy.RandEntropy), pass) k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -37,7 +37,7 @@ func TestKeyStorePlain(t *testing.T) {
func TestKeyStorePassphrase(t *testing.T) { func TestKeyStorePassphrase(t *testing.T) {
ks := NewKeyStorePassphrase(DefaultDataDir()) ks := NewKeyStorePassphrase(DefaultDataDir())
pass := "foo" pass := "foo"
k1, err := ks.GenerateNewKey(new(randentropy.RandEntropy), pass) k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -63,7 +63,7 @@ func TestKeyStorePassphrase(t *testing.T) {
func TestKeyStorePassphraseDecryptionFail(t *testing.T) { func TestKeyStorePassphraseDecryptionFail(t *testing.T) {
ks := NewKeyStorePassphrase(DefaultDataDir()) ks := NewKeyStorePassphrase(DefaultDataDir())
pass := "foo" pass := "foo"
k1, err := ks.GenerateNewKey(new(randentropy.RandEntropy), pass) k1, err := ks.GenerateNewKey(randentropy.Reader, pass)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

6
crypto/randentropy/rand_entropy.go
View File

@ -10,10 +10,12 @@ import (
"time" "time"
) )
type RandEntropy struct { var Reader io.Reader = &randEntropy{}
type randEntropy struct {
} }
func (*RandEntropy) Read(bytes []byte) (n int, err error) { func (*randEntropy) Read(bytes []byte) (n int, err error) {
readBytes := GetEntropyMixed(len(bytes)) readBytes := GetEntropyMixed(len(bytes))
copy(bytes, readBytes) copy(bytes, readBytes)
return len(bytes), nil return len(bytes), nil