address comments from PR

cmd/ipfs/init.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"crypto/rand"
 	"encoding/base64"
 	"fmt"
 	"os"
@@ -253,7 +252,7 @@ func identityConfig(nbits int) (config.Identity, error) {
 	}
 
 	fmt.Printf("generating key pair...")
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits, rand.Reader)
+	sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits)
 	if err != nil {
 		return ident, err
 	}

cmd/seccat/seccat.go

@@ -115,7 +115,7 @@ func setupPeer(a args) (peer.ID, peer.Peerstore, error) {
 	}
 
 	out("generating key pair...")
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, a.keybits, u.NewTimeSeededRand())
+	sk, pk, err := ci.GenerateKeyPair(ci.RSA, a.keybits)
 	if err != nil {
 		return "", nil, err
 	}

core/mock.go

 package core
 
 import (
-	"crypto/rand"
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
@@ -30,7 +29,7 @@ func NewMockNode() (*IpfsNode, error) {
 	nd := new(IpfsNode)
 
 	// Generate Identity
-	sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024, rand.Reader)
+	sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024)
 	if err != nil {
 		return nil, err
 	}

crypto/key.go

@@ -75,8 +75,12 @@ type PubKey interface {
 // Given a public key, generates the shared key.
 type GenSharedKey func([]byte) ([]byte, error)
 
+func GenerateKeyPair(typ, bits int) (PrivKey, PubKey, error) {
+	return GenerateKeyPairWithReader(typ, bits, rand.Reader)
+}
+
 // Generates a keypair of the given type and bitsize
-func GenerateKeyPair(typ, bits int, src io.Reader) (PrivKey, PubKey, error) {
+func GenerateKeyPairWithReader(typ, bits int, src io.Reader) (PrivKey, PubKey, error) {
 	switch typ {
 	case RSA:
 		priv, err := rsa.GenerateKey(src, bits)

crypto/key_test.go

-package crypto
+package crypto_test
 
 import (
+	. "github.com/jbenet/go-ipfs/crypto"
+
 	"bytes"
-	u "github.com/jbenet/go-ipfs/util"
+	tu "github.com/jbenet/go-ipfs/util/testutil"
 	"testing"
 )
 
 func TestRsaKeys(t *testing.T) {
-	sk, pk, err := GenerateKeyPair(RSA, 512, u.NewTimeSeededRand())
+	sk, pk, err := tu.RandKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -91,7 +93,7 @@ func testKeyEquals(t *testing.T, k Key) {
 		t.Fatal("Key not equal to key with same bytes.")
 	}
 
-	sk, pk, err := GenerateKeyPair(RSA, 512, u.NewTimeSeededRand())
+	sk, pk, err := tu.RandKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}

namesys/resolve_test.go

@@ -3,7 +3,6 @@ package namesys
 import (
 	"testing"
 
-	ci "github.com/jbenet/go-ipfs/crypto"
 	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
 	u "github.com/jbenet/go-ipfs/util"
 	testutil "github.com/jbenet/go-ipfs/util/testutil"
@@ -15,7 +14,7 @@ func TestRoutingResolve(t *testing.T) {
 	resolver := NewRoutingResolver(d)
 	publisher := NewRoutingPublisher(d)
 
-	privk, pubk, err := ci.GenerateKeyPair(ci.RSA, 512, u.NewTimeSeededRand())
+	privk, pubk, err := testutil.RandKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}

peer/peer_test.go

-package peer
+package peer_test
 
 import (
 	"encoding/base64"
@@ -7,7 +7,9 @@ import (
 	"testing"
 
 	ic "github.com/jbenet/go-ipfs/crypto"
+	. "github.com/jbenet/go-ipfs/peer"
 	u "github.com/jbenet/go-ipfs/util"
+	tu "github.com/jbenet/go-ipfs/util/testutil"
 
 	b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
 )
@@ -39,7 +41,7 @@ type keyset struct {
 
 func (ks *keyset) generate() error {
 	var err error
-	ks.sk, ks.pk, err = ic.GenerateKeyPair(ic.RSA, 1024, u.NewTimeSeededRand())
+	ks.sk, ks.pk, err = tu.RandKeyPair(512)
 	if err != nil {
 		return err
 	}

util/testutil/gen.go

@@ -17,11 +17,11 @@ import (
 )
 
 func RandKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
-	return ci.GenerateKeyPair(ci.RSA, bits, crand.Reader)
+	return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
 }
 
 func SeededKeyPair(bits int, seed int64) (ci.PrivKey, ci.PubKey, error) {
-	return ci.GenerateKeyPair(ci.RSA, bits, u.NewSeededRand(seed))
+	return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewSeededRand(seed))
 }
 
 // RandPeerID generates random "valid" peer IDs. it does not NEED to generate
@@ -124,7 +124,7 @@ func RandPeerNetParams() (*PeerNetParams, error) {
 	var p PeerNetParams
 	var err error
 	p.Addr = RandLocalTCPAddress()
-	p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512, u.NewTimeSeededRand())
+	p.PrivKey, p.PubKey, err = RandKeyPair(512)
 	if err != nil {
 		return nil, err
 	}