tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into rpcfrontier

Browse Source
This commit is contained in:
obscuren 2015-03-11 01:11:20 +01:00
commit 074ee19fe5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/key.go
View File

@ -26,7 +26,6 @@ package crypto
import ( import (
"bytes" "bytes"
"crypto/ecdsa" "crypto/ecdsa"
"crypto/elliptic"
"encoding/json" "encoding/json"
"io" "io"
@ -87,18 +86,16 @@ func (k *Key) UnmarshalJSON(j []byte) (err error) {
} }
func NewKey(rand io.Reader) *Key { func NewKey(rand io.Reader) *Key {
randBytes := make([]byte, 32) randBytes := make([]byte, 64)
_, err := rand.Read(randBytes) _, err := rand.Read(randBytes)
if err != nil { if err != nil {
panic("key generation: could not read from random source: " + err.Error()) panic("key generation: could not read from random source: " + err.Error())
} }
reader := bytes.NewReader(randBytes) reader := bytes.NewReader(randBytes)
_, x, y, err := elliptic.GenerateKey(S256(), reader) privateKeyECDSA, err := ecdsa.GenerateKey(S256(), reader)
if err != nil { if err != nil {
panic("key generation: elliptic.GenerateKey failed: " + err.Error()) panic("key generation: ecdsa.GenerateKey failed: " + err.Error())
} }
privateKeyMarshalled := elliptic.Marshal(S256(), x, y)
privateKeyECDSA := ToECDSA(privateKeyMarshalled)
id := uuid.NewRandom() id := uuid.NewRandom()
key := &Key{ key := &Key{