From 075ae67fdd24f889513849910cdcecf3016d4284 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Mon, 19 Jan 2015 17:26:58 -0800 Subject: [PATCH] go-ipfs-config: init docs: go generated welcome dir + files updated sharness hashes --- config/init.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config/init.go b/config/init.go index 402139e41..aef5624ec 100644 --- a/config/init.go +++ b/config/init.go @@ -3,19 +3,20 @@ package config import ( "encoding/base64" "fmt" + "io" ci "github.com/jbenet/go-ipfs/p2p/crypto" peer "github.com/jbenet/go-ipfs/p2p/peer" errors "github.com/jbenet/go-ipfs/util/debugerror" ) -func Init(nBitsForKeypair int) (*Config, error) { +func Init(out io.Writer, nBitsForKeypair int) (*Config, error) { ds, err := datastoreConfig() if err != nil { return nil, err } - identity, err := identityConfig(nBitsForKeypair) + identity, err := identityConfig(out, nBitsForKeypair) if err != nil { return nil, err } @@ -71,19 +72,19 @@ func datastoreConfig() (*Datastore, error) { } // identityConfig initializes a new identity. -func identityConfig(nbits int) (Identity, error) { +func identityConfig(out io.Writer, nbits int) (Identity, error) { // TODO guard higher up ident := Identity{} if nbits < 1024 { return ident, errors.New("Bitsize less than 1024 is considered unsafe.") } - fmt.Printf("generating %v-bit RSA keypair...", nbits) + out.Write([]byte(fmt.Sprintf("generating %v-bit RSA keypair...", nbits))) sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits) if err != nil { return ident, err } - fmt.Printf("done\n") + out.Write([]byte(fmt.Sprintf("done\n"))) // currently storing key unencrypted. in the future we need to encrypt it. // TODO(security)