Address pull request comments

* Allocate with composite literal instead of new
* Remove check of number of bytes read from rand
This commit is contained in:
Gustav Simonsson 2015-01-19 20:24:30 +01:00
parent 9caf32befe
commit 3cf038f300
2 changed files with 8 additions and 10 deletions

@ -87,13 +87,9 @@ func (k *Key) UnmarshalJSON(j []byte) (err error) {
func NewKey(rand io.Reader) *Key {
randBytes := make([]byte, 32)
n, err := rand.Read(randBytes)
_, err := rand.Read(randBytes)
if err != nil {
panic("key generation: could not read from random source: " + err.Error())
} else {
if n != 32 {
panic("key generation: read less than required bytes from random source: " + err.Error())
}
}
reader := bytes.NewReader(randBytes)
_, x, y, err := elliptic.GenerateKey(S256(), reader)

@ -89,8 +89,9 @@ type keyStorePassphrase struct {
}
func NewKeyStorePassphrase(path string) KeyStore2 {
ks := new(keyStorePassphrase)
ks.keysDirPath = path
ks := &keyStorePassphrase{
keysDirPath : path,
}
return ks
}
@ -103,9 +104,10 @@ func (ks keyStorePassphrase) GetKey(keyId *uuid.UUID, auth string) (key *Key, er
if err != nil {
return nil, err
}
key = new(Key)
key.Id = keyId
key.PrivateKey = ToECDSA(keyBytes)
key = &Key{
Id : keyId,
PrivateKey : ToECDSA(keyBytes),
}
return key, err
}