address comments from PR
Jeromy committed
Dec 29, 2014 at 02:29 UTC
14fc4188be4a98be5526b9254e46cf5806caf834
8 files changed
+22
-17
cmd/ipfs/init.go
+1
-2
@@ -2,7 +2,6 @@ package main
2
3
import (
4
"bytes"
5
- "crypto/rand"
5
"encoding/base64"
6
"fmt"
7
"os"
@@ -253,7 +252,7 @@ func identityConfig(nbits int) (config.Identity, error) {
252
}
253
254
fmt.Printf("generating key pair...")
256
- sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits, rand.Reader)
255
+ sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits)
256
if err != nil {
257
return ident, err
258
}
cmd/seccat/seccat.go
+1
-1
@@ -115,7 +115,7 @@ func setupPeer(a args) (peer.ID, peer.Peerstore, error) {
115
}
116
117
out("generating key pair...")
118
- sk, pk, err := ci.GenerateKeyPair(ci.RSA, a.keybits, u.NewTimeSeededRand())
118
+ sk, pk, err := ci.GenerateKeyPair(ci.RSA, a.keybits)
119
if err != nil {
120
return "", nil, err
121
}
core/mock.go
+1
-2
@@ -1,7 +1,6 @@
1
package core
2
3
import (
4
- "crypto/rand"
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
@@ -30,7 +29,7 @@ func NewMockNode() (*IpfsNode, error) {
29
nd := new(IpfsNode)
30
31
// Generate Identity
33
- sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024, rand.Reader)
32
+ sk, pk, err := ci.GenerateKeyPair(ci.RSA, 1024)
33
if err != nil {
34
return nil, err
35
}
crypto/key.go
+5
-1
@@ -75,8 +75,12 @@ type PubKey interface {
75
// Given a public key, generates the shared key.
76
type GenSharedKey func([]byte) ([]byte, error)
77
78
+func GenerateKeyPair(typ, bits int) (PrivKey, PubKey, error) {
79
+ return GenerateKeyPairWithReader(typ, bits, rand.Reader)
80
+}
81
+
82
// Generates a keypair of the given type and bitsize
79
-func GenerateKeyPair(typ, bits int, src io.Reader) (PrivKey, PubKey, error) {
83
+func GenerateKeyPairWithReader(typ, bits int, src io.Reader) (PrivKey, PubKey, error) {
84
switch typ {
85
case RSA:
86
priv, err := rsa.GenerateKey(src, bits)
crypto/key_test.go
+6
-4
@@ -1,13 +1,15 @@
1
-package crypto
1
+package crypto_test
2
3
import (
4
+ . "github.com/jbenet/go-ipfs/crypto"
5
+
6
"bytes"
5
- u "github.com/jbenet/go-ipfs/util"
7
+ tu "github.com/jbenet/go-ipfs/util/testutil"
8
"testing"
9
)
10
11
func TestRsaKeys(t *testing.T) {
10
- sk, pk, err := GenerateKeyPair(RSA, 512, u.NewTimeSeededRand())
12
+ sk, pk, err := tu.RandKeyPair(512)
13
if err != nil {
14
t.Fatal(err)
15
}
@@ -91,7 +93,7 @@ func testKeyEquals(t *testing.T, k Key) {
93
t.Fatal("Key not equal to key with same bytes.")
94
}
95
94
- sk, pk, err := GenerateKeyPair(RSA, 512, u.NewTimeSeededRand())
96
+ sk, pk, err := tu.RandKeyPair(512)
97
if err != nil {
98
t.Fatal(err)
99
}
namesys/resolve_test.go
+1
-2
@@ -3,7 +3,6 @@ package namesys
3
import (
4
"testing"
5
6
- ci "github.com/jbenet/go-ipfs/crypto"
6
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
7
u "github.com/jbenet/go-ipfs/util"
8
testutil "github.com/jbenet/go-ipfs/util/testutil"
@@ -15,7 +14,7 @@ func TestRoutingResolve(t *testing.T) {
14
resolver := NewRoutingResolver(d)
15
publisher := NewRoutingPublisher(d)
16
18
- privk, pubk, err := ci.GenerateKeyPair(ci.RSA, 512, u.NewTimeSeededRand())
17
+ privk, pubk, err := testutil.RandKeyPair(512)
18
if err != nil {
19
t.Fatal(err)
20
}
peer/peer_test.go
+4
-2
@@ -1,4 +1,4 @@
1
-package peer
1
+package peer_test
2
3
import (
4
"encoding/base64"
@@ -7,7 +7,9 @@ import (
7
"testing"
8
9
ic "github.com/jbenet/go-ipfs/crypto"
10
+ . "github.com/jbenet/go-ipfs/peer"
11
u "github.com/jbenet/go-ipfs/util"
12
+ tu "github.com/jbenet/go-ipfs/util/testutil"
13
14
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
15
)
@@ -39,7 +41,7 @@ type keyset struct {
41
42
func (ks *keyset) generate() error {
43
var err error
42
- ks.sk, ks.pk, err = ic.GenerateKeyPair(ic.RSA, 1024, u.NewTimeSeededRand())
44
+ ks.sk, ks.pk, err = tu.RandKeyPair(512)
45
if err != nil {
46
return err
47
}
util/testutil/gen.go
+3
-3
@@ -17,11 +17,11 @@ import (
17
)
18
19
func RandKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
20
- return ci.GenerateKeyPair(ci.RSA, bits, crand.Reader)
20
+ return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
21
}
22
23
func SeededKeyPair(bits int, seed int64) (ci.PrivKey, ci.PubKey, error) {
24
- return ci.GenerateKeyPair(ci.RSA, bits, u.NewSeededRand(seed))
24
+ return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewSeededRand(seed))
25
}
26
27
// RandPeerID generates random "valid" peer IDs. it does not NEED to generate
@@ -124,7 +124,7 @@ func RandPeerNetParams() (*PeerNetParams, error) {
124
var p PeerNetParams
125
var err error
126
p.Addr = RandLocalTCPAddress()
127
- p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512, u.NewTimeSeededRand())
127
+ p.PrivKey, p.PubKey, err = RandKeyPair(512)
128
if err != nil {
129
return nil, err
130
}