logos-messaging/noise
1
0
Fork 0
mirror of https://github.com/logos-messaging/noise.git synced 2026-01-08 09:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add default rand.Reader for GenerateKey

Browse Source
This commit is contained in:
Jonathan Rudenberg 2014-07-21 23:21:14 -07:00
parent 36a0b41364
commit 03fb1d0520
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
box/box.go
View File

@ -70,7 +70,7 @@ func (c *Crypter) EncryptBox(dst []byte, ephKey *Key, plaintext []byte, padLen i
c.ChainVar = make([]byte, CVLen)
}
if ephKey == nil {
k, err := c.Cipher.GenerateKey(rand.Reader)
k, err := c.Cipher.GenerateKey(nil)
if err != nil {
return nil, err
}
@ -200,6 +200,9 @@ func (noise255) MACLen() int { return 16 }
func (noise255) GenerateKey(random io.Reader) (Key, error) {
var pubKey, privKey [32]byte
if random == nil {
random = rand.Reader
}
if _, err := io.ReadFull(random, privKey[:]); err != nil {
return Key{}, err
}

5
box/box_test.go
View File

@ -1,7 +1,6 @@
package box
import (
"crypto/rand"
"testing"
. "gopkg.in/check.v1"
@ -38,8 +37,8 @@ func (s *S) TestRoundtrip(c *C) {
}
func newCrypters() (*Crypter, *Crypter) {
recvKey, _ := Noise255.GenerateKey(rand.Reader)
sendKey, _ := Noise255.GenerateKey(rand.Reader)
recvKey, _ := Noise255.GenerateKey(nil)
sendKey, _ := Noise255.GenerateKey(nil)
enc := &Crypter{
Cipher: Noise255,