@cryptotaxi247 / kubo / commits / 075ae67fd

go-ipfs-config: init docs: go generated welcome dir + files

updated sharness hashes

Juan Batiz-Benet committed Jan 19, 2015 at 17:26 UTC 075ae67fdd24f889513849910cdcecf3016d4284
1 file changed +6 -5
config/init.go
+6 -5
@@ -3,19 +3,20 @@ package config
3 import (
4 "encoding/base64"
5 "fmt"
6 + "io"
7
8 ci "github.com/jbenet/go-ipfs/p2p/crypto"
9 peer "github.com/jbenet/go-ipfs/p2p/peer"
10 errors "github.com/jbenet/go-ipfs/util/debugerror"
11 )
12
12 -func Init(nBitsForKeypair int) (*Config, error) {
13 +func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
14 ds, err := datastoreConfig()
15 if err != nil {
16 return nil, err
17 }
18
18 - identity, err := identityConfig(nBitsForKeypair)
19 + identity, err := identityConfig(out, nBitsForKeypair)
20 if err != nil {
21 return nil, err
22 }
@@ -71,19 +72,19 @@ func datastoreConfig() (*Datastore, error) {
72 }
73
74 // identityConfig initializes a new identity.
74 -func identityConfig(nbits int) (Identity, error) {
75 +func identityConfig(out io.Writer, nbits int) (Identity, error) {
76 // TODO guard higher up
77 ident := Identity{}
78 if nbits < 1024 {
79 return ident, errors.New("Bitsize less than 1024 is considered unsafe.")
80 }
81
81 - fmt.Printf("generating %v-bit RSA keypair...", nbits)
82 + out.Write([]byte(fmt.Sprintf("generating %v-bit RSA keypair...", nbits)))
83 sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits)
84 if err != nil {
85 return ident, err
86 }
86 - fmt.Printf("done\n")
87 + out.Write([]byte(fmt.Sprintf("done\n")))
88
89 // currently storing key unencrypted. in the future we need to encrypt it.
90 // TODO(security)