From 317ca2f86541b117ea3738dcf2dc228c98a20448 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sun, 26 Oct 2014 08:01:33 +0000
Subject: [PATCH 01/20] benchmark secure channel

---
 blockservice/blockservice.go  |   1 +
 crypto/spipe/handshake.go     |  17 ++--
 crypto/spipe/spipe_test.go    | 161 ++++++++++++++++++++++++++++++++++
 exchange/bitswap/bitswap.go   |   8 +-
 importer/importer.go          |   1 +
 routing/kbucket/table_test.go |  34 ++++---
 6 files changed, 196 insertions(+), 26 deletions(-)
 create mode 100644 crypto/spipe/spipe_test.go

diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index edfaa11fa..3fe0465df 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -37,6 +37,7 @@ func NewBlockService(d ds.Datastore, rem exchange.Interface) (*BlockService, err
 // AddBlock adds a particular block to the service, Putting it into the datastore.
 func (s *BlockService) AddBlock(b *blocks.Block) (u.Key, error) {
 	k := b.Key()
+	log.Debugf("blockservice: storing [%s] in datastore", k)
 	// TODO(brian): define a block datastore with a Put method which accepts a
 	// block parameter
 
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 7a88665ef..052d4619c 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -275,6 +275,7 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 
 	myMac, macSize := makeMac(hashType, mMKey)
 
+	basebuf := make([]byte, 1<<22)
 	for {
 		var data []byte
 		ok := true
@@ -294,19 +295,23 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 			continue
 		}
 
-		buff := make([]byte, len(data)+macSize)
+		buff := basebuf[:len(data)+macSize]
 
-		myCipher.XORKeyStream(buff, data)
-
-		myMac.Write(buff[0:len(data)])
-		copy(buff[len(data):], myMac.Sum(nil))
-		myMac.Reset()
+		encData(data, buff, myCipher, myMac)
 
 		// log.Debug("[peer %s] secure out [to = %s] %d", s.local, s.remote, len(buff))
 		s.insecure.Out <- buff
 	}
 }
 
+func encData(data, buff []byte, ciph cipher.Stream, mac hash.Hash) {
+	ciph.XORKeyStream(buff, data)
+
+	mac.Write(buff[0:len(data)])
+	copy(buff[len(data):], mac.Sum(nil))
+	mac.Reset()
+}
+
 // Determines which algorithm to use.  Note:  f(a, b) = f(b, a)
 func selectBest(myPrefs, theirPrefs string) (string, error) {
 	// Person with greatest hash gets first choice.
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
new file mode 100644
index 000000000..51866baf8
--- /dev/null
+++ b/crypto/spipe/spipe_test.go
@@ -0,0 +1,161 @@
+package spipe
+
+import (
+	"testing"
+
+	"code.google.com/p/go.net/context"
+
+	ci "github.com/jbenet/go-ipfs/crypto"
+	"github.com/jbenet/go-ipfs/peer"
+	"github.com/jbenet/go-ipfs/util"
+)
+
+func getPeer(tb testing.TB) peer.Peer {
+	privk, pubk, err := ci.GenerateKeyPair(ci.RSA, 1024)
+	if err != nil {
+		tb.Fatal(err)
+	}
+
+	p, err := peer.WithKeyPair(privk, pubk)
+	if err != nil {
+		tb.Fatal(err)
+	}
+
+	return p
+}
+
+func bindDuplexNoCopy(a, b Duplex) {
+	go func() {
+		for m := range b.Out {
+			a.In <- m
+		}
+	}()
+	for m := range a.Out {
+		b.In <- m
+	}
+}
+
+func bindDuplexWithCopy(a, b Duplex) {
+	dup := func(byt []byte) []byte {
+		n := make([]byte, len(byt))
+		copy(n, byt)
+		return n
+	}
+	go func() {
+		for m := range b.Out {
+			a.In <- dup(m)
+		}
+	}()
+	for m := range a.Out {
+		b.In <- dup(m)
+	}
+}
+
+func BenchmarkDataEncryptDefault(b *testing.B) {
+	SupportedExchanges = "P-256,P-224,P-384,P-521"
+	SupportedCiphers = "AES-256,AES-128"
+	SupportedHashes = "SHA256,SHA512,SHA1"
+
+	runEncryptBenchmark(b)
+}
+
+func BenchmarkDataEncryptLite(b *testing.B) {
+	SupportedExchanges = "P-256"
+	SupportedCiphers = "AES-128"
+	SupportedHashes = "SHA1"
+
+	runEncryptBenchmark(b)
+}
+
+func runEncryptBenchmark(b *testing.B) {
+	pstore := peer.NewPeerstore()
+	ctx := context.TODO()
+	bufsize := 1024 * 1024
+
+	pa := getPeer(b)
+	pb := getPeer(b)
+	duplexa := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+	duplexb := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+
+	go bindDuplexNoCopy(duplexa, duplexb)
+
+	var spb *SecurePipe
+	done := make(chan struct{})
+	go func() {
+		var err error
+		spb, err = NewSecurePipe(ctx, bufsize, pb, pstore, duplexb)
+		if err != nil {
+			b.Fatal(err)
+		}
+		done <- struct{}{}
+	}()
+
+	spa, err := NewSecurePipe(ctx, bufsize, pa, pstore, duplexa)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	<-done
+
+	go func() {
+		for _ = range spa.In {
+			// Throw it all away,
+			// all of your hopes and dreams
+			// piped out to /dev/null...
+			done <- struct{}{}
+		}
+	}()
+
+	data := make([]byte, 1024*512)
+	util.NewFastRand().Read(data)
+	// Begin actual benchmarking
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		b.SetBytes(int64(len(data)))
+		spb.Out <- data
+		<-done
+	}
+
+}
+
+func BenchmarkDataTransfer(b *testing.B) {
+	duplexa := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+	duplexb := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+
+	go bindDuplexWithCopy(duplexa, duplexb)
+
+	done := make(chan struct{})
+	go func() {
+		for _ = range duplexa.In {
+			// Throw it all away,
+			// all of your hopes and dreams
+			// piped out to /dev/null...
+			done <- struct{}{}
+		}
+	}()
+
+	data := make([]byte, 1024*512)
+	util.NewFastRand().Read(data)
+	// Begin actual benchmarking
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		b.SetBytes(int64(len(data)))
+		duplexb.Out <- data
+		<-done
+	}
+
+}
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index a785b15dc..c8a53ec2b 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -1,6 +1,8 @@
 package bitswap
 
 import (
+	"time"
+
 	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"
 
@@ -67,6 +69,10 @@ type bitswap struct {
 // TODO ensure only one active request per key
 func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error) {
 	log.Debugf("Get Block %v", k)
+	now := time.Now()
+	defer func() {
+		log.Errorf("GetBlock took %f secs", time.Now().Sub(now).Seconds())
+	}()
 
 	ctx, cancelFunc := context.WithCancel(parent)
 	bs.wantlist.Add(k)
@@ -160,7 +166,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.Peer, incoming bsm
 		go func(block blocks.Block) {
 			err := bs.HasBlock(ctx, block) // FIXME err ignored
 			if err != nil {
-				log.Errorf("HasBlock errored: %s", err)
+				log.Warningf("HasBlock errored: %s", err)
 			}
 		}(block)
 	}
diff --git a/importer/importer.go b/importer/importer.go
index 774b16942..a24baed0b 100644
--- a/importer/importer.go
+++ b/importer/importer.go
@@ -36,6 +36,7 @@ func NewDagFromReaderWithSplitter(r io.Reader, spl chunk.BlockSplitter) (*dag.No
 
 	mbf := new(ft.MultiBlock)
 	for blk := range blkChan {
+		log.Debugf("created block, size %d", len(blk))
 		mbf.AddBlockSize(uint64(len(blk)))
 		child := &dag.Node{Data: ft.WrapData(blk)}
 		err := root.AddNodeLink("", child)
diff --git a/routing/kbucket/table_test.go b/routing/kbucket/table_test.go
index 2b45d1572..cda69064a 100644
--- a/routing/kbucket/table_test.go
+++ b/routing/kbucket/table_test.go
@@ -7,16 +7,12 @@ import (
 	"testing"
 	"time"
 
+	tu "github.com/jbenet/go-ipfs/util/testutil"
+
 	peer "github.com/jbenet/go-ipfs/peer"
 )
 
-func _randPeer() peer.Peer {
-	id := make(peer.ID, 16)
-	crand.Read(id)
-	return peer.WithID(id)
-}
-
-func _randID() ID {
+func RandID() ID {
 	buf := make([]byte, 16)
 	crand.Read(buf)
 
@@ -30,11 +26,11 @@ func TestBucket(t *testing.T) {
 
 	peers := make([]peer.Peer, 100)
 	for i := 0; i < 100; i++ {
-		peers[i] = _randPeer()
+		peers[i] = tu.RandPeer()
 		b.pushFront(peers[i])
 	}
 
-	local := _randPeer()
+	local := tu.RandPeer()
 	localID := ConvertPeerID(local.ID())
 
 	i := rand.Intn(len(peers))
@@ -65,12 +61,12 @@ func TestBucket(t *testing.T) {
 
 // Right now, this just makes sure that it doesnt hang or crash
 func TestTableUpdate(t *testing.T) {
-	local := _randPeer()
+	local := tu.RandPeer()
 	rt := NewRoutingTable(10, ConvertPeerID(local.ID()), time.Hour)
 
 	peers := make([]peer.Peer, 100)
 	for i := 0; i < 100; i++ {
-		peers[i] = _randPeer()
+		peers[i] = tu.RandPeer()
 	}
 
 	// Testing Update
@@ -82,7 +78,7 @@ func TestTableUpdate(t *testing.T) {
 	}
 
 	for i := 0; i < 100; i++ {
-		id := _randID()
+		id := RandID()
 		ret := rt.NearestPeers(id, 5)
 		if len(ret) == 0 {
 			t.Fatal("Failed to find node near ID.")
@@ -91,12 +87,12 @@ func TestTableUpdate(t *testing.T) {
 }
 
 func TestTableFind(t *testing.T) {
-	local := _randPeer()
+	local := tu.RandPeer()
 	rt := NewRoutingTable(10, ConvertPeerID(local.ID()), time.Hour)
 
 	peers := make([]peer.Peer, 100)
 	for i := 0; i < 5; i++ {
-		peers[i] = _randPeer()
+		peers[i] = tu.RandPeer()
 		rt.Update(peers[i])
 	}
 
@@ -108,12 +104,12 @@ func TestTableFind(t *testing.T) {
 }
 
 func TestTableFindMultiple(t *testing.T) {
-	local := _randPeer()
+	local := tu.RandPeer()
 	rt := NewRoutingTable(20, ConvertPeerID(local.ID()), time.Hour)
 
 	peers := make([]peer.Peer, 100)
 	for i := 0; i < 18; i++ {
-		peers[i] = _randPeer()
+		peers[i] = tu.RandPeer()
 		rt.Update(peers[i])
 	}
 
@@ -132,7 +128,7 @@ func TestTableMultithreaded(t *testing.T) {
 	tab := NewRoutingTable(20, ConvertPeerID(local), time.Hour)
 	var peers []peer.Peer
 	for i := 0; i < 500; i++ {
-		peers = append(peers, _randPeer())
+		peers = append(peers, tu.RandPeer())
 	}
 
 	done := make(chan struct{})
@@ -171,7 +167,7 @@ func BenchmarkUpdates(b *testing.B) {
 
 	var peers []peer.Peer
 	for i := 0; i < b.N; i++ {
-		peers = append(peers, _randPeer())
+		peers = append(peers, tu.RandPeer())
 	}
 
 	b.StartTimer()
@@ -187,7 +183,7 @@ func BenchmarkFinds(b *testing.B) {
 
 	var peers []peer.Peer
 	for i := 0; i < b.N; i++ {
-		peers = append(peers, _randPeer())
+		peers = append(peers, tu.RandPeer())
 		tab.Update(peers[i])
 	}
 

From 3994762ca6583c8f96f0fb2182405a9b37f5a40d Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sun, 26 Oct 2014 08:38:05 +0000
Subject: [PATCH 02/20] fix bug

---
 crypto/spipe/handshake.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 052d4619c..7a88665ef 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -275,7 +275,6 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 
 	myMac, macSize := makeMac(hashType, mMKey)
 
-	basebuf := make([]byte, 1<<22)
 	for {
 		var data []byte
 		ok := true
@@ -295,23 +294,19 @@ func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte)
 			continue
 		}
 
-		buff := basebuf[:len(data)+macSize]
+		buff := make([]byte, len(data)+macSize)
 
-		encData(data, buff, myCipher, myMac)
+		myCipher.XORKeyStream(buff, data)
+
+		myMac.Write(buff[0:len(data)])
+		copy(buff[len(data):], myMac.Sum(nil))
+		myMac.Reset()
 
 		// log.Debug("[peer %s] secure out [to = %s] %d", s.local, s.remote, len(buff))
 		s.insecure.Out <- buff
 	}
 }
 
-func encData(data, buff []byte, ciph cipher.Stream, mac hash.Hash) {
-	ciph.XORKeyStream(buff, data)
-
-	mac.Write(buff[0:len(data)])
-	copy(buff[len(data):], mac.Sum(nil))
-	mac.Reset()
-}
-
 // Determines which algorithm to use.  Note:  f(a, b) = f(b, a)
 func selectBest(myPrefs, theirPrefs string) (string, error) {
 	// Person with greatest hash gets first choice.

From 01c0c6e169aba8f5f8d52db27a32987bfd446100 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sun, 26 Oct 2014 21:44:09 +0000
Subject: [PATCH 03/20] implement signed pipe and add blowfish cipher to
 supported suites

---
 crypto/key.go                        |  14 +-
 crypto/rsa.go                        |   8 ++
 crypto/spipe/handshake.go            |  36 ++++-
 crypto/spipe/internal/pb/spipe.pb.go |  29 +++-
 crypto/spipe/internal/pb/spipe.proto |   5 +
 crypto/spipe/signedpipe.go           | 201 +++++++++++++++++++++++++++
 crypto/spipe/spipe_test.go           |  68 ++++++++-
 7 files changed, 350 insertions(+), 11 deletions(-)
 create mode 100644 crypto/spipe/signedpipe.go

diff --git a/crypto/key.go b/crypto/key.go
index 1c6bba926..856866aaa 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -50,6 +50,8 @@ type PrivKey interface {
 
 	// Generate a secret string of bytes
 	GenSecret() []byte
+
+	Unencrypt(b []byte) ([]byte, error)
 }
 
 type PubKey interface {
@@ -57,6 +59,8 @@ type PubKey interface {
 
 	// Verify that 'sig' is the signed hash of 'data'
 	Verify(data []byte, sig []byte) (bool, error)
+
+	Encrypt(data []byte) ([]byte, error)
 }
 
 // Given a public key, generates the shared key.
@@ -126,14 +130,20 @@ func GenerateEKeyPair(curveName string) ([]byte, GenSharedKey, error) {
 // (myIV, theirIV, myCipherKey, theirCipherKey, myMACKey, theirMACKey)
 func KeyStretcher(cmp int, cipherType string, hashType string, secret []byte) ([]byte, []byte, []byte, []byte, []byte, []byte) {
 	var cipherKeySize int
+	var ivSize int
 	switch cipherType {
 	case "AES-128":
+		ivSize = 16
 		cipherKeySize = 16
 	case "AES-256":
+		ivSize = 16
+		cipherKeySize = 32
+	case "Blowfish":
+		ivSize = 8
+		// Note: 24 arbitrarily selected, needs more thought
 		cipherKeySize = 32
 	}
 
-	ivSize := 16
 	hmacKeySize := 20
 
 	seed := []byte("key expansion")
@@ -149,6 +159,8 @@ func KeyStretcher(cmp int, cipherType string, hashType string, secret []byte) ([
 		h = sha256.New
 	case "SHA512":
 		h = sha512.New
+	default:
+		panic("Unrecognized hash function, programmer error?")
 	}
 
 	m := hmac.New(h, secret)
diff --git a/crypto/rsa.go b/crypto/rsa.go
index f76df125e..bb131e06a 100644
--- a/crypto/rsa.go
+++ b/crypto/rsa.go
@@ -43,6 +43,10 @@ func (pk *RsaPublicKey) Bytes() ([]byte, error) {
 	return proto.Marshal(pbmes)
 }
 
+func (pk *RsaPublicKey) Encrypt(b []byte) ([]byte, error) {
+	return rsa.EncryptPKCS1v15(rand.Reader, pk.k, b)
+}
+
 // Equals checks whether this key is equal to another
 func (pk *RsaPublicKey) Equals(k Key) bool {
 	return KeyEqual(pk, k)
@@ -67,6 +71,10 @@ func (sk *RsaPrivateKey) GetPublic() PubKey {
 	return &RsaPublicKey{&sk.k.PublicKey}
 }
 
+func (sk *RsaPrivateKey) Unencrypt(b []byte) ([]byte, error) {
+	return rsa.DecryptPKCS1v15(rand.Reader, sk.k, b)
+}
+
 func (sk *RsaPrivateKey) Bytes() ([]byte, error) {
 	b := x509.MarshalPKCS1PrivateKey(sk.k)
 	pbmes := new(pb.PrivateKey)
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 7a88665ef..c7c8e575e 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"strings"
 
+	bfish "code.google.com/p/go.crypto/blowfish"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hmac"
@@ -31,7 +32,7 @@ var log = u.Logger("handshake")
 var SupportedExchanges = "P-256,P-224,P-384,P-521"
 
 // List of supported Ciphers
-var SupportedCiphers = "AES-256,AES-128"
+var SupportedCiphers = "AES-256,AES-128,Blowfish"
 
 // List of supported Hashes
 var SupportedHashes = "SHA256,SHA512,SHA1"
@@ -185,8 +186,8 @@ func (s *SecurePipe) handshake() error {
 	cmp := bytes.Compare(myPubKey, proposeResp.GetPubkey())
 	mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-	go s.handleSecureIn(hashType, tIV, tCKey, tMKey)
-	go s.handleSecureOut(hashType, mIV, mCKey, mMKey)
+	go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
+	go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
 
 	finished := []byte("Finished")
 
@@ -224,8 +225,24 @@ func makeMac(hashType string, key []byte) (hash.Hash, int) {
 	}
 }
 
-func (s *SecurePipe) handleSecureIn(hashType string, tIV, tCKey, tMKey []byte) {
-	theirBlock, _ := aes.NewCipher(tCKey)
+func makeCipher(cipherType string, CKey []byte) (cipher.Block, error) {
+	switch cipherType {
+	case "AES-128", "AES-256":
+		return aes.NewCipher(CKey)
+	case "Blowfish":
+		return bfish.NewCipher(CKey)
+	default:
+		return nil, fmt.Errorf("Unrecognized cipher string: %s", cipherType)
+	}
+}
+
+func (s *SecurePipe) handleSecureIn(hashType, cipherType string, tIV, tCKey, tMKey []byte) {
+	theirBlock, err := makeCipher(cipherType, tCKey)
+	if err != nil {
+		log.Criticalf("Invalid Cipher: %s", err)
+		s.cancel()
+		return
+	}
 	theirCipher := cipher.NewCTR(theirBlock, tIV)
 
 	theirMac, macSize := makeMac(hashType, tMKey)
@@ -269,8 +286,13 @@ func (s *SecurePipe) handleSecureIn(hashType string, tIV, tCKey, tMKey []byte) {
 	}
 }
 
-func (s *SecurePipe) handleSecureOut(hashType string, mIV, mCKey, mMKey []byte) {
-	myBlock, _ := aes.NewCipher(mCKey)
+func (s *SecurePipe) handleSecureOut(hashType, cipherType string, mIV, mCKey, mMKey []byte) {
+	myBlock, err := makeCipher(cipherType, mCKey)
+	if err != nil {
+		log.Criticalf("Invalid Cipher: %s", err)
+		s.cancel()
+		return
+	}
 	myCipher := cipher.NewCTR(myBlock, mIV)
 
 	myMac, macSize := makeMac(hashType, mMKey)
diff --git a/crypto/spipe/internal/pb/spipe.pb.go b/crypto/spipe/internal/pb/spipe.pb.go
index b1373bab0..5f1b34c2b 100644
--- a/crypto/spipe/internal/pb/spipe.pb.go
+++ b/crypto/spipe/internal/pb/spipe.pb.go
@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go.
 // source: spipe.proto
 // DO NOT EDIT!
 
@@ -11,10 +11,11 @@ It is generated from these files:
 It has these top-level messages:
 	Propose
 	Exchange
+	DataSig
 */
 package spipe_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -93,5 +94,29 @@ func (m *Exchange) GetSignature() []byte {
 	return nil
 }
 
+type DataSig struct {
+	Data             []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Sig              []byte `protobuf:"bytes,2,opt,name=sig" json:"sig,omitempty"`
+	XXX_unrecognized []byte `json:"-"`
+}
+
+func (m *DataSig) Reset()         { *m = DataSig{} }
+func (m *DataSig) String() string { return proto.CompactTextString(m) }
+func (*DataSig) ProtoMessage()    {}
+
+func (m *DataSig) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *DataSig) GetSig() []byte {
+	if m != nil {
+		return m.Sig
+	}
+	return nil
+}
+
 func init() {
 }
diff --git a/crypto/spipe/internal/pb/spipe.proto b/crypto/spipe/internal/pb/spipe.proto
index a7a467737..699821b07 100644
--- a/crypto/spipe/internal/pb/spipe.proto
+++ b/crypto/spipe/internal/pb/spipe.proto
@@ -12,3 +12,8 @@ message Exchange {
 	optional bytes epubkey = 1;
 	optional bytes signature = 2;
 }
+
+message DataSig {
+	optional bytes data = 1;
+	optional bytes sig = 2;
+}
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
new file mode 100644
index 000000000..a663abade
--- /dev/null
+++ b/crypto/spipe/signedpipe.go
@@ -0,0 +1,201 @@
+package spipe
+
+import (
+	"bytes"
+	"crypto/rand"
+	"errors"
+
+	"code.google.com/p/goprotobuf/proto"
+
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
+	ci "github.com/jbenet/go-ipfs/crypto"
+	pb "github.com/jbenet/go-ipfs/crypto/spipe/internal/pb"
+	"github.com/jbenet/go-ipfs/peer"
+)
+
+type SignedPipe struct {
+	Duplex
+	insecure Duplex
+
+	local  peer.Peer
+	remote peer.Peer
+	peers  peer.Peerstore
+
+	ctx    context.Context
+	cancel context.CancelFunc
+}
+
+func NewSignedPipe(parctx context.Context, bufsize int, local peer.Peer,
+	peers peer.Peerstore, insecure Duplex) (*SignedPipe, error) {
+
+	ctx, cancel := context.WithCancel(parctx)
+
+	sp := &SignedPipe{
+		Duplex: Duplex{
+			In:  make(chan []byte, bufsize),
+			Out: make(chan []byte, bufsize),
+		},
+		local:    local,
+		peers:    peers,
+		insecure: insecure,
+
+		ctx:    ctx,
+		cancel: cancel,
+	}
+
+	if err := sp.handshake(); err != nil {
+		sp.Close()
+		return nil, err
+	}
+	return sp, nil
+}
+
+func (sp *SignedPipe) handshake() error {
+	// Send them our public key
+	pubk := sp.local.PubKey()
+	pkb, err := pubk.Bytes()
+	if err != nil {
+		return err
+	}
+
+	sp.insecure.Out <- pkb
+	theirPkb := <-sp.insecure.In
+
+	theirPubKey, err := ci.UnmarshalPublicKey(theirPkb)
+	if err != nil {
+		return err
+	}
+
+	challenge := make([]byte, 32)
+	rand.Read(challenge)
+
+	enc, err := theirPubKey.Encrypt(challenge)
+	if err != nil {
+		return err
+	}
+
+	sp.insecure.Out <- enc
+	theirEnc := <-sp.insecure.In
+
+	unenc, err := sp.local.PrivKey().Unencrypt(theirEnc)
+	if err != nil {
+		return err
+	}
+
+	sig, err := sp.local.PrivKey().Sign(unenc)
+	if err != nil {
+		return err
+	}
+
+	sp.insecure.Out <- unenc
+	theirUnenc := <-sp.insecure.In
+	sp.insecure.Out <- sig
+	theirSig := <-sp.insecure.In
+
+	if !bytes.Equal(theirUnenc, challenge) {
+		return errors.New("received bad challenge response")
+	}
+
+	correct, err := theirPubKey.Verify(theirUnenc, theirSig)
+	if err != nil {
+		return err
+	}
+
+	if !correct {
+		return errors.New("Incorrect signature on challenge")
+	}
+
+	go sp.handleIn(theirPubKey)
+	go sp.handleOut()
+
+	finished := []byte("finished")
+	sp.Out <- finished
+	resp := <-sp.In
+	if !bytes.Equal(resp, finished) {
+		return errors.New("Handshake failed!")
+	}
+
+	return nil
+}
+
+func (sp *SignedPipe) handleOut() {
+	for {
+		var data []byte
+		var ok bool
+		select {
+		case <-sp.ctx.Done():
+			return
+		case data, ok = <-sp.Out:
+			if !ok {
+				log.Warning("pipe closed!")
+				return
+			}
+		}
+
+		sdata := new(pb.DataSig)
+
+		sig, err := sp.local.PrivKey().Sign(data)
+		if err != nil {
+			log.Error("Error signing outgoing data: %s", err)
+			continue
+		}
+
+		sdata.Data = data
+		sdata.Sig = sig
+		b, err := proto.Marshal(sdata)
+		if err != nil {
+			log.Error("Error marshaling signed data object: %s", err)
+			continue
+		}
+
+		select {
+		case sp.insecure.Out <- b:
+		case <-sp.ctx.Done():
+			log.Debug("Context finished before send could occur")
+			return
+		}
+	}
+}
+
+func (sp *SignedPipe) handleIn(theirPubkey ci.PubKey) {
+	for {
+		var data []byte
+		var ok bool
+		select {
+		case <-sp.ctx.Done():
+			return
+		case data, ok = <-sp.insecure.In:
+			if !ok {
+				log.Debug("Signed pipe closed")
+				return
+			}
+		}
+
+		sdata := new(pb.DataSig)
+		err := proto.Unmarshal(data, sdata)
+		if err != nil {
+			log.Error("Failed to unmarshal sigdata object")
+			continue
+		}
+		correct, err := theirPubkey.Verify(sdata.GetData(), sdata.GetSig())
+		if err != nil {
+			log.Error(err)
+			continue
+		}
+		if !correct {
+			log.Error("Received data with invalid signature!")
+			continue
+		}
+
+		select {
+		case <-sp.ctx.Done():
+			return
+		case sp.In <- sdata.GetData():
+		}
+	}
+}
+
+func (sp *SignedPipe) Close() error {
+	sp.cancel()
+	return nil
+}
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index 51866baf8..6df63e0b3 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -3,7 +3,7 @@ package spipe
 import (
 	"testing"
 
-	"code.google.com/p/go.net/context"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	"github.com/jbenet/go-ipfs/peer"
@@ -67,6 +67,14 @@ func BenchmarkDataEncryptLite(b *testing.B) {
 	runEncryptBenchmark(b)
 }
 
+func BenchmarkDataEncryptBlowfish(b *testing.B) {
+	SupportedExchanges = "P-256"
+	SupportedCiphers = "Blowfish"
+	SupportedHashes = "SHA1"
+
+	runEncryptBenchmark(b)
+}
+
 func runEncryptBenchmark(b *testing.B) {
 	pstore := peer.NewPeerstore()
 	ctx := context.TODO()
@@ -125,6 +133,64 @@ func runEncryptBenchmark(b *testing.B) {
 
 }
 
+func BenchmarkSignedChannel(b *testing.B) {
+	pstore := peer.NewPeerstore()
+	ctx := context.TODO()
+	bufsize := 1024 * 1024
+
+	pa := getPeer(b)
+	pb := getPeer(b)
+	duplexa := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+	duplexb := Duplex{
+		In:  make(chan []byte),
+		Out: make(chan []byte),
+	}
+
+	go bindDuplexNoCopy(duplexa, duplexb)
+
+	var spb *SignedPipe
+	done := make(chan struct{})
+	go func() {
+		var err error
+		spb, err = NewSignedPipe(ctx, bufsize, pb, pstore, duplexb)
+		if err != nil {
+			b.Fatal(err)
+		}
+		done <- struct{}{}
+	}()
+
+	spa, err := NewSignedPipe(ctx, bufsize, pa, pstore, duplexa)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	<-done
+
+	go func() {
+		for _ = range spa.In {
+			// Throw it all away,
+			// all of your hopes and dreams
+			// piped out to /dev/null...
+			done <- struct{}{}
+		}
+	}()
+
+	data := make([]byte, 1024*512)
+	util.NewFastRand().Read(data)
+	// Begin actual benchmarking
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		b.SetBytes(int64(len(data)))
+		spb.Out <- data
+		<-done
+	}
+
+}
+
 func BenchmarkDataTransfer(b *testing.B) {
 	duplexa := Duplex{
 		In:  make(chan []byte),

From ffc59fff1b1473976ea21161c06ae52becfd2888 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Mon, 27 Oct 2014 03:16:30 +0000
Subject: [PATCH 04/20] add blowfish code and refactor pipes and duplex a
 little

---
 Godeps/Godeps.json                            |   5 +
 .../p/go.crypto/blowfish/block.go             | 159 ++++++++++
 .../p/go.crypto/blowfish/blowfish_test.go     | 274 ++++++++++++++++++
 .../p/go.crypto/blowfish/cipher.go            |  91 ++++++
 .../p/go.crypto/blowfish/const.go             | 199 +++++++++++++
 blockstore/blockstore.go                      |   8 +-
 crypto/spipe/handshake.go                     |  10 +-
 crypto/spipe/pipe.go                          |  16 +-
 crypto/spipe/signedpipe.go                    |  11 +-
 crypto/spipe/spipe_test.go                    |  35 +--
 net/conn/secure_conn.go                       |   3 +-
 pipes/duplex.go                               |  14 +
 util/testutil/gen.go                          |   9 +
 13 files changed, 786 insertions(+), 48 deletions(-)
 create mode 100644 Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/block.go
 create mode 100644 Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/blowfish_test.go
 create mode 100644 Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/cipher.go
 create mode 100644 Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/const.go
 create mode 100644 pipes/duplex.go

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9b5342910..d8a6595ea 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -19,6 +19,11 @@
 			"Comment": "null-12",
 			"Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9"
 		},
+		{
+			"ImportPath": "code.google.com/p/go.crypto/blowfish",
+			"Comment": "null-219",
+			"Rev": "00a7d3b31bbab5795b4a51933c04fc2768242970"
+		},
 		{
 			"ImportPath": "code.google.com/p/go.crypto/sha3",
 			"Comment": "null-219",
diff --git a/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/block.go b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/block.go
new file mode 100644
index 000000000..9d80f1952
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/block.go
@@ -0,0 +1,159 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package blowfish
+
+// getNextWord returns the next big-endian uint32 value from the byte slice
+// at the given position in a circular manner, updating the position.
+func getNextWord(b []byte, pos *int) uint32 {
+	var w uint32
+	j := *pos
+	for i := 0; i < 4; i++ {
+		w = w<<8 | uint32(b[j])
+		j++
+		if j >= len(b) {
+			j = 0
+		}
+	}
+	*pos = j
+	return w
+}
+
+// ExpandKey performs a key expansion on the given *Cipher. Specifically, it
+// performs the Blowfish algorithm's key schedule which sets up the *Cipher's
+// pi and substitution tables for calls to Encrypt. This is used, primarily,
+// by the bcrypt package to reuse the Blowfish key schedule during its
+// set up. It's unlikely that you need to use this directly.
+func ExpandKey(key []byte, c *Cipher) {
+	j := 0
+	for i := 0; i < 18; i++ {
+		// Using inlined getNextWord for performance.
+		var d uint32
+		for k := 0; k < 4; k++ {
+			d = d<<8 | uint32(key[j])
+			j++
+			if j >= len(key) {
+				j = 0
+			}
+		}
+		c.p[i] ^= d
+	}
+
+	var l, r uint32
+	for i := 0; i < 18; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.p[i], c.p[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s0[i], c.s0[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s1[i], c.s1[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s2[i], c.s2[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s3[i], c.s3[i+1] = l, r
+	}
+}
+
+// This is similar to ExpandKey, but folds the salt during the key
+// schedule. While ExpandKey is essentially expandKeyWithSalt with an all-zero
+// salt passed in, reusing ExpandKey turns out to be a place of inefficiency
+// and specializing it here is useful.
+func expandKeyWithSalt(key []byte, salt []byte, c *Cipher) {
+	j := 0
+	for i := 0; i < 18; i++ {
+		c.p[i] ^= getNextWord(key, &j)
+	}
+
+	j = 0
+	var l, r uint32
+	for i := 0; i < 18; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.p[i], c.p[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s0[i], c.s0[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s1[i], c.s1[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s2[i], c.s2[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s3[i], c.s3[i+1] = l, r
+	}
+}
+
+func encryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
+	xl, xr := l, r
+	xl ^= c.p[0]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[1]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[2]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[3]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[4]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[5]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[6]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[7]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[8]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[9]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[10]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[11]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[12]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[13]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[14]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[15]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[16]
+	xr ^= c.p[17]
+	return xr, xl
+}
+
+func decryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
+	xl, xr := l, r
+	xl ^= c.p[17]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[16]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[15]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[14]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[13]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[12]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[11]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[10]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[9]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[8]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[7]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[6]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[5]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[4]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[3]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[2]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[1]
+	xr ^= c.p[0]
+	return xr, xl
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/blowfish_test.go b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/blowfish_test.go
new file mode 100644
index 000000000..7afa1fdf3
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/blowfish_test.go
@@ -0,0 +1,274 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package blowfish
+
+import "testing"
+
+type CryptTest struct {
+	key []byte
+	in  []byte
+	out []byte
+}
+
+// Test vector values are from http://www.schneier.com/code/vectors.txt.
+var encryptTests = []CryptTest{
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
+	{
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A}},
+	{
+		[]byte{0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+		[]byte{0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2}},
+	{
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D}},
+
+	{
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96}},
+	{
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7}},
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
+	{
+		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D}},
+	{
+		[]byte{0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
+		[]byte{0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
+		[]byte{0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B}},
+	{
+		[]byte{0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
+		[]byte{0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
+		[]byte{0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0}},
+	{
+		[]byte{0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
+		[]byte{0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
+		[]byte{0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4}},
+	{
+		[]byte{0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
+		[]byte{0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
+		[]byte{0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB}},
+	{
+		[]byte{0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
+		[]byte{0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
+		[]byte{0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A}},
+	{
+		[]byte{0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
+		[]byte{0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
+		[]byte{0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18}},
+	{
+		[]byte{0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
+		[]byte{0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
+		[]byte{0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98}},
+	{
+		[]byte{0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
+		[]byte{0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
+		[]byte{0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5}},
+	{
+		[]byte{0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
+		[]byte{0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
+		[]byte{0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79}},
+	{
+		[]byte{0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
+		[]byte{0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
+		[]byte{0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3}},
+	{
+		[]byte{0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
+		[]byte{0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
+		[]byte{0x5F, 0x99, 0xD0, 0x4F, 0x5B, 0x16, 0x39, 0x69}},
+	{
+		[]byte{0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
+		[]byte{0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
+		[]byte{0x4A, 0x05, 0x7A, 0x3B, 0x24, 0xD3, 0x97, 0x7B}},
+	{
+		[]byte{0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
+		[]byte{0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
+		[]byte{0x45, 0x20, 0x31, 0xC1, 0xE4, 0xFA, 0xDA, 0x8E}},
+	{
+		[]byte{0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
+		[]byte{0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
+		[]byte{0x75, 0x55, 0xAE, 0x39, 0xF5, 0x9B, 0x87, 0xBD}},
+	{
+		[]byte{0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
+		[]byte{0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
+		[]byte{0x53, 0xC5, 0x5F, 0x9C, 0xB4, 0x9F, 0xC0, 0x19}},
+	{
+		[]byte{0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
+		[]byte{0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
+		[]byte{0x7A, 0x8E, 0x7B, 0xFA, 0x93, 0x7E, 0x89, 0xA3}},
+	{
+		[]byte{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
+		[]byte{0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
+		[]byte{0xCF, 0x9C, 0x5D, 0x7A, 0x49, 0x86, 0xAD, 0xB5}},
+	{
+		[]byte{0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
+		[]byte{0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
+		[]byte{0xD1, 0xAB, 0xB2, 0x90, 0x65, 0x8B, 0xC7, 0x78}},
+	{
+		[]byte{0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
+		[]byte{0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
+		[]byte{0x55, 0xCB, 0x37, 0x74, 0xD1, 0x3E, 0xF2, 0x01}},
+	{
+		[]byte{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xFA, 0x34, 0xEC, 0x48, 0x47, 0xB2, 0x68, 0xB2}},
+	{
+		[]byte{0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE}},
+	{
+		[]byte{0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xC3, 0x9E, 0x07, 0x2D, 0x9F, 0xAC, 0x63, 0x1D}},
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x01, 0x49, 0x33, 0xE0, 0xCD, 0xAF, 0xF6, 0xE4}},
+	{
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0xF2, 0x1E, 0x9A, 0x77, 0xB7, 0x1C, 0x49, 0xBC}},
+	{
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9A}},
+	{
+		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x6B, 0x5C, 0x5A, 0x9C, 0x5D, 0x9E, 0x0A, 0x5A}},
+}
+
+func TestCipherEncrypt(t *testing.T) {
+	for i, tt := range encryptTests {
+		c, err := NewCipher(tt.key)
+		if err != nil {
+			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
+			continue
+		}
+		ct := make([]byte, len(tt.out))
+		c.Encrypt(ct, tt.in)
+		for j, v := range ct {
+			if v != tt.out[j] {
+				t.Errorf("Cipher.Encrypt, test vector #%d: cipher-text[%d] = %#x, expected %#x", i, j, v, tt.out[j])
+				break
+			}
+		}
+	}
+}
+
+func TestCipherDecrypt(t *testing.T) {
+	for i, tt := range encryptTests {
+		c, err := NewCipher(tt.key)
+		if err != nil {
+			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
+			continue
+		}
+		pt := make([]byte, len(tt.in))
+		c.Decrypt(pt, tt.out)
+		for j, v := range pt {
+			if v != tt.in[j] {
+				t.Errorf("Cipher.Decrypt, test vector #%d: plain-text[%d] = %#x, expected %#x", i, j, v, tt.in[j])
+				break
+			}
+		}
+	}
+}
+
+func TestSaltedCipherKeyLength(t *testing.T) {
+	if _, err := NewSaltedCipher(nil, []byte{'a'}); err != KeySizeError(0) {
+		t.Errorf("NewSaltedCipher with short key, gave error %#v, expected %#v", err, KeySizeError(0))
+	}
+
+	// A 57-byte key. One over the typical blowfish restriction.
+	key := []byte("012345678901234567890123456789012345678901234567890123456")
+	if _, err := NewSaltedCipher(key, []byte{'a'}); err != nil {
+		t.Errorf("NewSaltedCipher with long key, gave error %#v", err)
+	}
+}
+
+// Test vectors generated with Blowfish from OpenSSH.
+var saltedVectors = [][8]byte{
+	{0x0c, 0x82, 0x3b, 0x7b, 0x8d, 0x01, 0x4b, 0x7e},
+	{0xd1, 0xe1, 0x93, 0xf0, 0x70, 0xa6, 0xdb, 0x12},
+	{0xfc, 0x5e, 0xba, 0xde, 0xcb, 0xf8, 0x59, 0xad},
+	{0x8a, 0x0c, 0x76, 0xe7, 0xdd, 0x2c, 0xd3, 0xa8},
+	{0x2c, 0xcb, 0x7b, 0xee, 0xac, 0x7b, 0x7f, 0xf8},
+	{0xbb, 0xf6, 0x30, 0x6f, 0xe1, 0x5d, 0x62, 0xbf},
+	{0x97, 0x1e, 0xc1, 0x3d, 0x3d, 0xe0, 0x11, 0xe9},
+	{0x06, 0xd7, 0x4d, 0xb1, 0x80, 0xa3, 0xb1, 0x38},
+	{0x67, 0xa1, 0xa9, 0x75, 0x0e, 0x5b, 0xc6, 0xb4},
+	{0x51, 0x0f, 0x33, 0x0e, 0x4f, 0x67, 0xd2, 0x0c},
+	{0xf1, 0x73, 0x7e, 0xd8, 0x44, 0xea, 0xdb, 0xe5},
+	{0x14, 0x0e, 0x16, 0xce, 0x7f, 0x4a, 0x9c, 0x7b},
+	{0x4b, 0xfe, 0x43, 0xfd, 0xbf, 0x36, 0x04, 0x47},
+	{0xb1, 0xeb, 0x3e, 0x15, 0x36, 0xa7, 0xbb, 0xe2},
+	{0x6d, 0x0b, 0x41, 0xdd, 0x00, 0x98, 0x0b, 0x19},
+	{0xd3, 0xce, 0x45, 0xce, 0x1d, 0x56, 0xb7, 0xfc},
+	{0xd9, 0xf0, 0xfd, 0xda, 0xc0, 0x23, 0xb7, 0x93},
+	{0x4c, 0x6f, 0xa1, 0xe4, 0x0c, 0xa8, 0xca, 0x57},
+	{0xe6, 0x2f, 0x28, 0xa7, 0x0c, 0x94, 0x0d, 0x08},
+	{0x8f, 0xe3, 0xf0, 0xb6, 0x29, 0xe3, 0x44, 0x03},
+	{0xff, 0x98, 0xdd, 0x04, 0x45, 0xb4, 0x6d, 0x1f},
+	{0x9e, 0x45, 0x4d, 0x18, 0x40, 0x53, 0xdb, 0xef},
+	{0xb7, 0x3b, 0xef, 0x29, 0xbe, 0xa8, 0x13, 0x71},
+	{0x02, 0x54, 0x55, 0x41, 0x8e, 0x04, 0xfc, 0xad},
+	{0x6a, 0x0a, 0xee, 0x7c, 0x10, 0xd9, 0x19, 0xfe},
+	{0x0a, 0x22, 0xd9, 0x41, 0xcc, 0x23, 0x87, 0x13},
+	{0x6e, 0xff, 0x1f, 0xff, 0x36, 0x17, 0x9c, 0xbe},
+	{0x79, 0xad, 0xb7, 0x40, 0xf4, 0x9f, 0x51, 0xa6},
+	{0x97, 0x81, 0x99, 0xa4, 0xde, 0x9e, 0x9f, 0xb6},
+	{0x12, 0x19, 0x7a, 0x28, 0xd0, 0xdc, 0xcc, 0x92},
+	{0x81, 0xda, 0x60, 0x1e, 0x0e, 0xdd, 0x65, 0x56},
+	{0x7d, 0x76, 0x20, 0xb2, 0x73, 0xc9, 0x9e, 0xee},
+}
+
+func TestSaltedCipher(t *testing.T) {
+	var key, salt [32]byte
+	for i := range key {
+		key[i] = byte(i)
+		salt[i] = byte(i + 32)
+	}
+	for i, v := range saltedVectors {
+		c, err := NewSaltedCipher(key[:], salt[:i])
+		if err != nil {
+			t.Fatal(err)
+		}
+		var buf [8]byte
+		c.Encrypt(buf[:], buf[:])
+		if v != buf {
+			t.Errorf("%d: expected %x, got %x", i, v, buf)
+		}
+	}
+}
+
+func BenchmarkExpandKeyWithSalt(b *testing.B) {
+	key := make([]byte, 32)
+	salt := make([]byte, 16)
+	c, _ := NewCipher(key)
+	for i := 0; i < b.N; i++ {
+		expandKeyWithSalt(key, salt, c)
+	}
+}
+
+func BenchmarkExpandKey(b *testing.B) {
+	key := make([]byte, 32)
+	c, _ := NewCipher(key)
+	for i := 0; i < b.N; i++ {
+		ExpandKey(key, c)
+	}
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/cipher.go b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/cipher.go
new file mode 100644
index 000000000..5019658a4
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/cipher.go
@@ -0,0 +1,91 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package blowfish implements Bruce Schneier's Blowfish encryption algorithm.
+package blowfish
+
+// The code is a port of Bruce Schneier's C implementation.
+// See http://www.schneier.com/blowfish.html.
+
+import "strconv"
+
+// The Blowfish block size in bytes.
+const BlockSize = 8
+
+// A Cipher is an instance of Blowfish encryption using a particular key.
+type Cipher struct {
+	p              [18]uint32
+	s0, s1, s2, s3 [256]uint32
+}
+
+type KeySizeError int
+
+func (k KeySizeError) Error() string {
+	return "crypto/blowfish: invalid key size " + strconv.Itoa(int(k))
+}
+
+// NewCipher creates and returns a Cipher.
+// The key argument should be the Blowfish key, from 1 to 56 bytes.
+func NewCipher(key []byte) (*Cipher, error) {
+	var result Cipher
+	if k := len(key); k < 1 || k > 56 {
+		return nil, KeySizeError(k)
+	}
+	initCipher(&result)
+	ExpandKey(key, &result)
+	return &result, nil
+}
+
+// NewSaltedCipher creates a returns a Cipher that folds a salt into its key
+// schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is
+// sufficient and desirable. For bcrypt compatiblity, the key can be over 56
+// bytes.
+func NewSaltedCipher(key, salt []byte) (*Cipher, error) {
+	if len(salt) == 0 {
+		return NewCipher(key)
+	}
+	var result Cipher
+	if k := len(key); k < 1 {
+		return nil, KeySizeError(k)
+	}
+	initCipher(&result)
+	expandKeyWithSalt(key, salt, &result)
+	return &result, nil
+}
+
+// BlockSize returns the Blowfish block size, 8 bytes.
+// It is necessary to satisfy the Block interface in the
+// package "crypto/cipher".
+func (c *Cipher) BlockSize() int { return BlockSize }
+
+// Encrypt encrypts the 8-byte buffer src using the key k
+// and stores the result in dst.
+// Note that for amounts of data larger than a block,
+// it is not safe to just call Encrypt on successive blocks;
+// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
+func (c *Cipher) Encrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+	l, r = encryptBlock(l, r, c)
+	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
+	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
+}
+
+// Decrypt decrypts the 8-byte buffer src using the key k
+// and stores the result in dst.
+func (c *Cipher) Decrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+	l, r = decryptBlock(l, r, c)
+	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
+	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
+}
+
+func initCipher(c *Cipher) {
+	copy(c.p[0:], p[0:])
+	copy(c.s0[0:], s0[0:])
+	copy(c.s1[0:], s1[0:])
+	copy(c.s2[0:], s2[0:])
+	copy(c.s3[0:], s3[0:])
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/const.go b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/const.go
new file mode 100644
index 000000000..8c5ee4cb0
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish/const.go
@@ -0,0 +1,199 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The startup permutation array and substitution boxes.
+// They are the hexadecimal digits of PI; see:
+// http://www.schneier.com/code/constants.txt.
+
+package blowfish
+
+var s0 = [256]uint32{
+	0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96,
+	0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+	0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658,
+	0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+	0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
+	0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+	0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6,
+	0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+	0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c,
+	0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+	0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
+	0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+	0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a,
+	0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+	0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
+	0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+	0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706,
+	0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+	0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b,
+	0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+	0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c,
+	0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+	0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a,
+	0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+	0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
+	0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+	0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
+	0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+	0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33,
+	0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+	0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0,
+	0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+	0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
+	0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+	0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
+	0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+	0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e,
+	0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+	0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9,
+	0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+	0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f,
+	0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+	0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+}
+
+var s1 = [256]uint32{
+	0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
+	0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+	0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
+	0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+	0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
+	0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+	0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
+	0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+	0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
+	0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+	0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
+	0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+	0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
+	0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+	0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
+	0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+	0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
+	0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+	0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
+	0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+	0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
+	0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+	0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
+	0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+	0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
+	0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+	0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
+	0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+	0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
+	0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+	0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
+	0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+	0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+	0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+	0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
+	0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+	0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
+	0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+	0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
+	0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+	0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
+	0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+	0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+}
+
+var s2 = [256]uint32{
+	0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7,
+	0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+	0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af,
+	0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+	0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4,
+	0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+	0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec,
+	0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+	0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332,
+	0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+	0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
+	0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+	0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22,
+	0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+	0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60,
+	0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+	0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99,
+	0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+	0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74,
+	0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+	0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3,
+	0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+	0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979,
+	0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+	0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa,
+	0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+	0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086,
+	0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+	0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24,
+	0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+	0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84,
+	0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+	0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
+	0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+	0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe,
+	0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+	0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0,
+	0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+	0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188,
+	0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+	0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8,
+	0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+	0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+}
+
+var s3 = [256]uint32{
+	0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742,
+	0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+	0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79,
+	0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+	0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
+	0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+	0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
+	0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+	0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797,
+	0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+	0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
+	0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+	0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba,
+	0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+	0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5,
+	0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+	0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
+	0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+	0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd,
+	0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+	0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb,
+	0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+	0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc,
+	0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+	0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc,
+	0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+	0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
+	0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+	0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a,
+	0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+	0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b,
+	0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+	0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
+	0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+	0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623,
+	0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+	0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
+	0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+	0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3,
+	0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+	0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c,
+	0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+	0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
+}
+
+var p = [18]uint32{
+	0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
+	0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+	0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b,
+}
diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go
index cadd20802..ca55046bb 100644
--- a/blockstore/blockstore.go
+++ b/blockstore/blockstore.go
@@ -5,6 +5,7 @@ import (
 
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 
+	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	u "github.com/jbenet/go-ipfs/util"
 )
@@ -35,7 +36,12 @@ func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) {
 	if !ok {
 		return nil, ValueTypeMismatch
 	}
-	return blocks.NewBlock(bdata), nil
+	//TODO: we *could* verify data coming in from the datastore here
+	//		but its probably very unecessary
+	return &blocks.Block{
+		Data:      bdata,
+		Multihash: mh.Multihash(k),
+	}, nil
 }
 
 func (bs *blockstore) Put(block *blocks.Block) error {
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index c7c8e575e..b3796248c 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"strings"
 
-	bfish "code.google.com/p/go.crypto/blowfish"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hmac"
@@ -16,6 +15,7 @@ import (
 	"crypto/sha1"
 	"crypto/sha256"
 	"crypto/sha512"
+	bfish "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.crypto/blowfish"
 	"hash"
 
 	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
@@ -108,17 +108,17 @@ func (s *SecurePipe) handshake() error {
 	}
 	log.Debugf("%s Remote Peer Identified as %s", s.local, s.remote)
 
-	exchange, err := selectBest(SupportedExchanges, proposeResp.GetExchanges())
+	exchange, err := SelectBest(SupportedExchanges, proposeResp.GetExchanges())
 	if err != nil {
 		return err
 	}
 
-	cipherType, err := selectBest(SupportedCiphers, proposeResp.GetCiphers())
+	cipherType, err := SelectBest(SupportedCiphers, proposeResp.GetCiphers())
 	if err != nil {
 		return err
 	}
 
-	hashType, err := selectBest(SupportedHashes, proposeResp.GetHashes())
+	hashType, err := SelectBest(SupportedHashes, proposeResp.GetHashes())
 	if err != nil {
 		return err
 	}
@@ -330,7 +330,7 @@ func (s *SecurePipe) handleSecureOut(hashType, cipherType string, mIV, mCKey, mM
 }
 
 // Determines which algorithm to use.  Note:  f(a, b) = f(b, a)
-func selectBest(myPrefs, theirPrefs string) (string, error) {
+func SelectBest(myPrefs, theirPrefs string) (string, error) {
 	// Person with greatest hash gets first choice.
 	myHash := u.Hash([]byte(myPrefs))
 	theirHash := u.Hash([]byte(theirPrefs))
diff --git a/crypto/spipe/pipe.go b/crypto/spipe/pipe.go
index 17b13f467..b1c9ecccc 100644
--- a/crypto/spipe/pipe.go
+++ b/crypto/spipe/pipe.go
@@ -5,18 +5,14 @@ import (
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	peer "github.com/jbenet/go-ipfs/peer"
-)
 
-// Duplex is a simple duplex channel
-type Duplex struct {
-	In  chan []byte
-	Out chan []byte
-}
+	pipes "github.com/jbenet/go-ipfs/pipes"
+)
 
 // SecurePipe objects represent a bi-directional message channel.
 type SecurePipe struct {
-	Duplex
-	insecure Duplex
+	pipes.Duplex
+	insecure pipes.Duplex
 
 	local  peer.Peer
 	remote peer.Peer
@@ -34,12 +30,12 @@ type params struct {
 
 // NewSecurePipe constructs a pipe with channels of a given buffer size.
 func NewSecurePipe(ctx context.Context, bufsize int, local peer.Peer,
-	peers peer.Peerstore, insecure Duplex) (*SecurePipe, error) {
+	peers peer.Peerstore, insecure pipes.Duplex) (*SecurePipe, error) {
 
 	ctx, cancel := context.WithCancel(ctx)
 
 	sp := &SecurePipe{
-		Duplex: Duplex{
+		Duplex: pipes.Duplex{
 			In:  make(chan []byte, bufsize),
 			Out: make(chan []byte, bufsize),
 		},
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
index a663abade..0a78388f5 100644
--- a/crypto/spipe/signedpipe.go
+++ b/crypto/spipe/signedpipe.go
@@ -5,17 +5,18 @@ import (
 	"crypto/rand"
 	"errors"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ci "github.com/jbenet/go-ipfs/crypto"
 	pb "github.com/jbenet/go-ipfs/crypto/spipe/internal/pb"
 	"github.com/jbenet/go-ipfs/peer"
+	"github.com/jbenet/go-ipfs/pipes"
 )
 
 type SignedPipe struct {
-	Duplex
-	insecure Duplex
+	pipes.Duplex
+	insecure pipes.Duplex
 
 	local  peer.Peer
 	remote peer.Peer
@@ -26,12 +27,12 @@ type SignedPipe struct {
 }
 
 func NewSignedPipe(parctx context.Context, bufsize int, local peer.Peer,
-	peers peer.Peerstore, insecure Duplex) (*SignedPipe, error) {
+	peers peer.Peerstore, insecure pipes.Duplex) (*SignedPipe, error) {
 
 	ctx, cancel := context.WithCancel(parctx)
 
 	sp := &SignedPipe{
-		Duplex: Duplex{
+		Duplex: pipes.Duplex{
 			In:  make(chan []byte, bufsize),
 			Out: make(chan []byte, bufsize),
 		},
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index 6df63e0b3..242acc36c 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -7,6 +7,7 @@ import (
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	"github.com/jbenet/go-ipfs/peer"
+	"github.com/jbenet/go-ipfs/pipes"
 	"github.com/jbenet/go-ipfs/util"
 )
 
@@ -24,7 +25,7 @@ func getPeer(tb testing.TB) peer.Peer {
 	return p
 }
 
-func bindDuplexNoCopy(a, b Duplex) {
+func bindDuplexNoCopy(a, b pipes.Duplex) {
 	go func() {
 		for m := range b.Out {
 			a.In <- m
@@ -35,7 +36,7 @@ func bindDuplexNoCopy(a, b Duplex) {
 	}
 }
 
-func bindDuplexWithCopy(a, b Duplex) {
+func bindDuplexWithCopy(a, b pipes.Duplex) {
 	dup := func(byt []byte) []byte {
 		n := make([]byte, len(byt))
 		copy(n, byt)
@@ -82,14 +83,8 @@ func runEncryptBenchmark(b *testing.B) {
 
 	pa := getPeer(b)
 	pb := getPeer(b)
-	duplexa := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
-	duplexb := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
+	duplexa := pipes.NewDuplex(16)
+	duplexb := pipes.NewDuplex(16)
 
 	go bindDuplexNoCopy(duplexa, duplexb)
 
@@ -140,14 +135,8 @@ func BenchmarkSignedChannel(b *testing.B) {
 
 	pa := getPeer(b)
 	pb := getPeer(b)
-	duplexa := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
-	duplexb := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
+	duplexa := pipes.NewDuplex(16)
+	duplexb := pipes.NewDuplex(16)
 
 	go bindDuplexNoCopy(duplexa, duplexb)
 
@@ -192,14 +181,8 @@ func BenchmarkSignedChannel(b *testing.B) {
 }
 
 func BenchmarkDataTransfer(b *testing.B) {
-	duplexa := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
-	duplexb := Duplex{
-		In:  make(chan []byte),
-		Out: make(chan []byte),
-	}
+	duplexa := pipes.NewDuplex(16)
+	duplexb := pipes.NewDuplex(16)
 
 	go bindDuplexWithCopy(duplexa, duplexb)
 
diff --git a/net/conn/secure_conn.go b/net/conn/secure_conn.go
index 128b8d283..644f39b39 100644
--- a/net/conn/secure_conn.go
+++ b/net/conn/secure_conn.go
@@ -8,6 +8,7 @@ import (
 
 	spipe "github.com/jbenet/go-ipfs/crypto/spipe"
 	peer "github.com/jbenet/go-ipfs/peer"
+	"github.com/jbenet/go-ipfs/pipes"
 	ctxc "github.com/jbenet/go-ipfs/util/ctxcloser"
 )
 
@@ -54,7 +55,7 @@ func (c *secureConn) secureHandshake(peers peer.Peerstore) error {
 	insecureSC := c.insecure.(*singleConn)
 
 	// setup a Duplex pipe for spipe
-	insecureD := spipe.Duplex{
+	insecureD := pipes.Duplex{
 		In:  insecureSC.msgio.incoming.MsgChan,
 		Out: insecureSC.msgio.outgoing.MsgChan,
 	}
diff --git a/pipes/duplex.go b/pipes/duplex.go
new file mode 100644
index 000000000..14f5e480c
--- /dev/null
+++ b/pipes/duplex.go
@@ -0,0 +1,14 @@
+package pipes
+
+// Duplex is a simple duplex channel
+type Duplex struct {
+	In  chan []byte
+	Out chan []byte
+}
+
+func NewDuplex(bufsize int) Duplex {
+	return Duplex{
+		In:  make(chan []byte, bufsize),
+		Out: make(chan []byte, bufsize),
+	}
+}
diff --git a/util/testutil/gen.go b/util/testutil/gen.go
index b92a6dc44..18b88801d 100644
--- a/util/testutil/gen.go
+++ b/util/testutil/gen.go
@@ -2,6 +2,9 @@ package testutil
 
 import (
 	"testing"
+	crand "crypto/rand"
+
+	"github.com/jbenet/go-ipfs/peer"
 
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	bsrv "github.com/jbenet/go-ipfs/blockservice"
@@ -16,3 +19,9 @@ func GetDAGServ(t testing.TB) dag.DAGService {
 	}
 	return dag.NewDAGService(bserv)
 }
+
+func RandPeer() peer.Peer {
+	id := make(peer.ID, 16)
+	crand.Read(id)
+	return peer.WithID(id)
+}
\ No newline at end of file

From 07733b17b3fa5be48a89d497ca7649fef7ef3d73 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Mon, 27 Oct 2014 20:23:14 +0000
Subject: [PATCH 05/20] msgio pooling first hack

---
 .../src/github.com/jbenet/go-msgio/chan.go    | 11 +++++-
 .../github.com/jbenet/go-msgio/chan_test.go   |  6 ++-
 crypto/spipe/handshake.go                     | 37 +++++++++++++++++--
 merkledag/merkledag.go                        | 18 +++++++++
 net/conn/conn.go                              | 24 ++++++++++--
 net/mux/mux.go                                |  4 +-
 routing/dht/pb/dht.pb.go                      |  2 +-
 unixfs/io/dagreader.go                        | 19 ++++------
 8 files changed, 96 insertions(+), 25 deletions(-)

diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
index 4d5af5b8c..84ccbe355 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
@@ -2,6 +2,7 @@ package msgio
 
 import (
 	"io"
+	"sync"
 )
 
 type Chan struct {
@@ -9,13 +10,15 @@ type Chan struct {
 	MsgChan   chan []byte
 	ErrChan   chan error
 	CloseChan chan bool
+	BufPool   *sync.Pool
 }
 
-func NewChan(chanSize int) *Chan {
+func NewChan(chanSize int, pool *sync.Pool) *Chan {
 	return &Chan{
 		MsgChan:   make(chan []byte, chanSize),
 		ErrChan:   make(chan error, 1),
 		CloseChan: make(chan bool, 2),
+		BufPool:   pool,
 	}
 }
 
@@ -25,7 +28,11 @@ func (s *Chan) ReadFrom(r io.Reader, maxMsgLen int) {
 	mr := NewReader(r)
 Loop:
 	for {
-		buf := make([]byte, maxMsgLen)
+		bufi := s.BufPool.Get()
+		buf, ok := bufi.([]byte)
+		if !ok {
+			panic("Got invalid type from sync pool!")
+		}
 		l, err := mr.ReadMsg(buf)
 		if err != nil {
 			if err == io.EOF {
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan_test.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan_test.go
index 043baa2bb..5ca431198 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan_test.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan_test.go
@@ -5,6 +5,7 @@ import (
 	randbuf "github.com/jbenet/go-randbuf"
 	"io"
 	"math/rand"
+	"sync"
 	"testing"
 	"time"
 )
@@ -12,7 +13,8 @@ import (
 func TestReadChan(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
 	writer := NewWriter(buf)
-	rchan := NewChan(10)
+	p := &sync.Pool{New: func() interface{} { return make([]byte, 1000) }}
+	rchan := NewChan(10, p)
 	msgs := [1000][]byte{}
 
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
@@ -58,7 +60,7 @@ Loop:
 func TestWriteChan(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
 	reader := NewReader(buf)
-	wchan := NewChan(10)
+	wchan := NewChan(10, nil)
 	msgs := [1000][]byte{}
 
 	go wchan.WriteTo(buf)
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index b3796248c..a5f647afd 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -184,10 +184,41 @@ func (s *SecurePipe) handshake() error {
 	}
 
 	cmp := bytes.Compare(myPubKey, proposeResp.GetPubkey())
-	mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
+	//mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
+	ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-	go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
-	go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
+	//go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
+	//go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
+
+	// Disable Secure Channel
+	go func(sp *SecurePipe) {
+		for {
+			select {
+			case <-sp.ctx.Done():
+				return
+			case m, ok := <-sp.insecure.In:
+				if !ok {
+					sp.cancel()
+					return
+				}
+				sp.In <- m
+			}
+		}
+	}(s)
+	go func(sp *SecurePipe) {
+		for {
+			select {
+			case <-sp.ctx.Done():
+				return
+			case m, ok := <-sp.Out:
+				if !ok {
+					sp.cancel()
+					return
+				}
+				sp.insecure.Out <- m
+			}
+		}
+	}(s)
 
 	finished := []byte("Finished")
 
diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
index 3134899bd..19e145254 100644
--- a/merkledag/merkledag.go
+++ b/merkledag/merkledag.go
@@ -241,3 +241,21 @@ func (n *dagService) Remove(nd *Node) error {
 	}
 	return n.Blocks.DeleteBlock(k)
 }
+
+func FetchGraph(ctx context.Context, root *Node, serv *DAGService) {
+	for _, l := range root.Links {
+		go func(lnk *Link) {
+			select {
+			case <-ctx.Done():
+				return
+			}
+
+			nd, err := lnk.GetNode(serv)
+			if err != nil {
+				log.Error(err)
+				return
+			}
+			FetchGraph(ctx, nd, serv)
+		}(l)
+	}
+}
diff --git a/net/conn/conn.go b/net/conn/conn.go
index eb262c9fa..537f30870 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -2,6 +2,7 @@ package conn
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
@@ -27,16 +28,31 @@ const (
 	HandshakeTimeout = time.Second * 5
 )
 
+var BufferPool *sync.Pool
+
+func init() {
+	BufferPool = new(sync.Pool)
+	BufferPool.New = func() interface{} {
+		log.Warning("Pool returning new object")
+		return make([]byte, MaxMessageSize)
+	}
+}
+
+func ReleaseBuffer(b []byte) {
+	log.Warningf("Releasing buffer! (size = %d)", cap(b))
+	BufferPool.Put(b[:cap(b)])
+}
+
 // msgioPipe is a pipe using msgio channels.
 type msgioPipe struct {
 	outgoing *msgio.Chan
 	incoming *msgio.Chan
 }
 
-func newMsgioPipe(size int) *msgioPipe {
+func newMsgioPipe(size int, pool *sync.Pool) *msgioPipe {
 	return &msgioPipe{
-		outgoing: msgio.NewChan(10),
-		incoming: msgio.NewChan(10),
+		outgoing: msgio.NewChan(size, nil),
+		incoming: msgio.NewChan(size, pool),
 	}
 }
 
@@ -58,7 +74,7 @@ func newSingleConn(ctx context.Context, local, remote peer.Peer,
 		local:  local,
 		remote: remote,
 		maconn: maconn,
-		msgio:  newMsgioPipe(10),
+		msgio:  newMsgioPipe(10, BufferPool),
 	}
 
 	conn.ContextCloser = ctxc.NewContextCloser(ctx, conn.close)
diff --git a/net/mux/mux.go b/net/mux/mux.go
index a8865bb73..cd5f7f876 100644
--- a/net/mux/mux.go
+++ b/net/mux/mux.go
@@ -1,9 +1,10 @@
-package mux
+tpackage mux
 
 import (
 	"errors"
 	"sync"
 
+	conn "github.com/jbenet/go-ipfs/net/conn"
 	msg "github.com/jbenet/go-ipfs/net/message"
 	pb "github.com/jbenet/go-ipfs/net/mux/internal/pb"
 	u "github.com/jbenet/go-ipfs/util"
@@ -130,6 +131,7 @@ func (m *Muxer) handleIncomingMessage(m1 msg.NetMessage) {
 		log.Errorf("muxer de-serializing error: %v", err)
 		return
 	}
+	conn.ReleaseBuffer(m1.Data())
 
 	m2 := msg.New(m1.Peer(), data)
 	proto, found := m.Protocols[pid]
diff --git a/routing/dht/pb/dht.pb.go b/routing/dht/pb/dht.pb.go
index 6c488c51a..22c87bac9 100644
--- a/routing/dht/pb/dht.pb.go
+++ b/routing/dht/pb/dht.pb.go
@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package dht_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go
index 17ad87371..a2dbeb2f2 100644
--- a/unixfs/io/dagreader.go
+++ b/unixfs/io/dagreader.go
@@ -9,7 +9,6 @@ import (
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	ft "github.com/jbenet/go-ipfs/unixfs"
 	ftpb "github.com/jbenet/go-ipfs/unixfs/pb"
-	u "github.com/jbenet/go-ipfs/util"
 )
 
 var ErrIsDir = errors.New("this dag node is a directory")
@@ -36,11 +35,12 @@ func NewDagReader(n *mdag.Node, serv mdag.DAGService) (io.Reader, error) {
 		// Dont allow reading directories
 		return nil, ErrIsDir
 	case ftpb.Data_File:
-		return &DagReader{
+		dr := &DagReader{
 			node: n,
 			serv: serv,
 			buf:  bytes.NewBuffer(pb.GetData()),
-		}, nil
+		}
+		return dr, nil
 	case ftpb.Data_Raw:
 		// Raw block will just be a single level, return a byte buffer
 		return bytes.NewBuffer(pb.GetData()), nil
@@ -55,17 +55,12 @@ func (dr *DagReader) precalcNextBuf() error {
 	if dr.position >= len(dr.node.Links) {
 		return io.EOF
 	}
-	nxtLink := dr.node.Links[dr.position]
-	nxt := nxtLink.Node
-	if nxt == nil {
-		nxtNode, err := dr.serv.Get(u.Key(nxtLink.Hash))
-		if err != nil {
-			return err
-		}
-		nxt = nxtNode
+	nxt, err := dr.node.Links[dr.position].GetNode(dr.serv)
+	if err != nil {
+		return err
 	}
 	pb := new(ftpb.Data)
-	err := proto.Unmarshal(nxt.Data, pb)
+	err = proto.Unmarshal(nxt.Data, pb)
 	if err != nil {
 		return err
 	}

From f89cfc11086f788beb9ce85bff2f5a8885d2f5c4 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Mon, 27 Oct 2014 21:19:22 +0000
Subject: [PATCH 06/20] moved pipes package

---
 .../src/github.com/jbenet/go-msgio/chan.go       | 16 +++++++++++++++-
 crypto/spipe/pipe.go                             |  2 +-
 crypto/spipe/signedpipe.go                       |  2 +-
 net/conn/conn.go                                 |  4 ++--
 net/conn/secure_conn.go                          |  2 +-
 {pipes => util/pipes}/duplex.go                  |  0
 6 files changed, 20 insertions(+), 6 deletions(-)
 rename {pipes => util/pipes}/duplex.go (100%)

diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
index 84ccbe355..1c16a9f0f 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
@@ -13,7 +13,15 @@ type Chan struct {
 	BufPool   *sync.Pool
 }
 
-func NewChan(chanSize int, pool *sync.Pool) *Chan {
+func NewChan(chanSize int) *Chan {
+	return &Chan{
+		MsgChan:   make(chan []byte, chanSize),
+		ErrChan:   make(chan error, 1),
+		CloseChan: make(chan bool, 2),
+	}
+}
+
+func NewChanWithPool(chanSize int, pool *sync.Pool) *Chan {
 	return &Chan{
 		MsgChan:   make(chan []byte, chanSize),
 		ErrChan:   make(chan error, 1),
@@ -26,6 +34,12 @@ func (s *Chan) ReadFrom(r io.Reader, maxMsgLen int) {
 	// new buffer per message
 	// if bottleneck, cycle around a set of buffers
 	mr := NewReader(r)
+	if s.BufPool == nil {
+		s.BufPool = new(sync.Pool)
+		s.BufPool.New = func() interface{} {
+			return make([]byte, maxMsgLen)
+		}
+	}
 Loop:
 	for {
 		bufi := s.BufPool.Get()
diff --git a/crypto/spipe/pipe.go b/crypto/spipe/pipe.go
index b1c9ecccc..3f8f57b62 100644
--- a/crypto/spipe/pipe.go
+++ b/crypto/spipe/pipe.go
@@ -6,7 +6,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	peer "github.com/jbenet/go-ipfs/peer"
 
-	pipes "github.com/jbenet/go-ipfs/pipes"
+	pipes "github.com/jbenet/go-ipfs/util/pipes"
 )
 
 // SecurePipe objects represent a bi-directional message channel.
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
index 0a78388f5..445981305 100644
--- a/crypto/spipe/signedpipe.go
+++ b/crypto/spipe/signedpipe.go
@@ -11,7 +11,7 @@ import (
 	ci "github.com/jbenet/go-ipfs/crypto"
 	pb "github.com/jbenet/go-ipfs/crypto/spipe/internal/pb"
 	"github.com/jbenet/go-ipfs/peer"
-	"github.com/jbenet/go-ipfs/pipes"
+	"github.com/jbenet/go-ipfs/util/pipes"
 )
 
 type SignedPipe struct {
diff --git a/net/conn/conn.go b/net/conn/conn.go
index 537f30870..e0272c335 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -51,8 +51,8 @@ type msgioPipe struct {
 
 func newMsgioPipe(size int, pool *sync.Pool) *msgioPipe {
 	return &msgioPipe{
-		outgoing: msgio.NewChan(size, nil),
-		incoming: msgio.NewChan(size, pool),
+		outgoing: msgio.NewChan(size),
+		incoming: msgio.NewChanWithPool(size, pool),
 	}
 }
 
diff --git a/net/conn/secure_conn.go b/net/conn/secure_conn.go
index 644f39b39..5c272de28 100644
--- a/net/conn/secure_conn.go
+++ b/net/conn/secure_conn.go
@@ -8,8 +8,8 @@ import (
 
 	spipe "github.com/jbenet/go-ipfs/crypto/spipe"
 	peer "github.com/jbenet/go-ipfs/peer"
-	"github.com/jbenet/go-ipfs/pipes"
 	ctxc "github.com/jbenet/go-ipfs/util/ctxcloser"
+	"github.com/jbenet/go-ipfs/util/pipes"
 )
 
 // secureConn wraps another Conn object with an encrypted channel.
diff --git a/pipes/duplex.go b/util/pipes/duplex.go
similarity index 100%
rename from pipes/duplex.go
rename to util/pipes/duplex.go

From 32417724a6e822b6a83b52f7ef7bf1be5d99fd1e Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Mon, 27 Oct 2014 21:34:48 +0000
Subject: [PATCH 07/20] Reenable secure channel code

---
 crypto/spipe/handshake.go | 56 ++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index a5f647afd..74766dc62 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -184,41 +184,43 @@ func (s *SecurePipe) handshake() error {
 	}
 
 	cmp := bytes.Compare(myPubKey, proposeResp.GetPubkey())
-	//mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
-	ci.KeyStretcher(cmp, cipherType, hashType, secret)
+	mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
+	//ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-	//go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
-	//go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
+	go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
+	go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
 
-	// Disable Secure Channel
-	go func(sp *SecurePipe) {
-		for {
-			select {
-			case <-sp.ctx.Done():
-				return
-			case m, ok := <-sp.insecure.In:
-				if !ok {
-					sp.cancel()
+	/*
+		// Disable Secure Channel
+		go func(sp *SecurePipe) {
+			for {
+				select {
+				case <-sp.ctx.Done():
 					return
+				case m, ok := <-sp.insecure.In:
+					if !ok {
+						sp.cancel()
+						return
+					}
+					sp.In <- m
 				}
-				sp.In <- m
 			}
-		}
-	}(s)
-	go func(sp *SecurePipe) {
-		for {
-			select {
-			case <-sp.ctx.Done():
-				return
-			case m, ok := <-sp.Out:
-				if !ok {
-					sp.cancel()
+		}(s)
+		go func(sp *SecurePipe) {
+			for {
+				select {
+				case <-sp.ctx.Done():
 					return
+				case m, ok := <-sp.Out:
+					if !ok {
+						sp.cancel()
+						return
+					}
+					sp.insecure.Out <- m
 				}
-				sp.insecure.Out <- m
 			}
-		}
-	}(s)
+		}(s)
+	*/
 
 	finished := []byte("Finished")
 

From 9b1c99e9aaed5ad04b7c64369b87ae6ff320413d Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 28 Oct 2014 00:28:54 +0000
Subject: [PATCH 08/20] shrink msgio buffer size to decrease memory pressure

---
 crypto/spipe/handshake.go  | 14 ++++++++------
 crypto/spipe/spipe_test.go |  2 +-
 net/conn/conn.go           |  8 ++++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 74766dc62..e412ecd7a 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -184,13 +184,15 @@ func (s *SecurePipe) handshake() error {
 	}
 
 	cmp := bytes.Compare(myPubKey, proposeResp.GetPubkey())
-	mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
-	//ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-	go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
-	go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
+	if true {
+		mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-	/*
+		go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
+		go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
+
+	} else {
+		log.Critical("Secure Channel Disabled! PLEASE ENSURE YOU KNOW WHAT YOU ARE DOING")
 		// Disable Secure Channel
 		go func(sp *SecurePipe) {
 			for {
@@ -220,7 +222,7 @@ func (s *SecurePipe) handshake() error {
 				}
 			}
 		}(s)
-	*/
+	}
 
 	finished := []byte("Finished")
 
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index 242acc36c..ab37dec27 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -7,8 +7,8 @@ import (
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	"github.com/jbenet/go-ipfs/peer"
-	"github.com/jbenet/go-ipfs/pipes"
 	"github.com/jbenet/go-ipfs/util"
+	"github.com/jbenet/go-ipfs/util/pipes"
 )
 
 func getPeer(tb testing.TB) peer.Peer {
diff --git a/net/conn/conn.go b/net/conn/conn.go
index e0272c335..342be71bb 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -22,7 +22,7 @@ const (
 	ChanBuffer = 10
 
 	// MaxMessageSize is the size of the largest single message
-	MaxMessageSize = 1 << 22 // 4 MB
+	MaxMessageSize = 1 << 21 // 4 MB
 
 	// HandshakeTimeout for when nodes first connect
 	HandshakeTimeout = time.Second * 5
@@ -39,7 +39,11 @@ func init() {
 }
 
 func ReleaseBuffer(b []byte) {
-	log.Warningf("Releasing buffer! (size = %d)", cap(b))
+	log.Warningf("Releasing buffer! (cap,size = %d, %d)", cap(b), len(b))
+	if cap(b) != MaxMessageSize {
+		log.Warning("Release buffer failed.")
+		return
+	}
 	BufferPool.Put(b[:cap(b)])
 }
 

From 027920540ffccb18bac61cb4ceda15527fb5a3cd Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 28 Oct 2014 02:53:29 +0000
Subject: [PATCH 09/20] more memory tweaks

---
 crypto/spipe/spipe_test.go  | 4 +++-
 importer/chunk/splitting.go | 2 +-
 net/conn/conn.go            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index ab37dec27..c4e0a0b7f 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -36,9 +36,11 @@ func bindDuplexNoCopy(a, b pipes.Duplex) {
 	}
 }
 
+var globuf = make([]byte, 4*1024*1024)
+
 func bindDuplexWithCopy(a, b pipes.Duplex) {
 	dup := func(byt []byte) []byte {
-		n := make([]byte, len(byt))
+		n := globuf[:len(byt)]
 		copy(n, byt)
 		return n
 	}
diff --git a/importer/chunk/splitting.go b/importer/chunk/splitting.go
index f5a6f735c..8198999a8 100644
--- a/importer/chunk/splitting.go
+++ b/importer/chunk/splitting.go
@@ -8,7 +8,7 @@ import (
 
 var log = util.Logger("chunk")
 
-var DefaultSplitter = &SizeSplitter{Size: 1024 * 512}
+var DefaultSplitter = &SizeSplitter{Size: 1024 * 256}
 
 type BlockSplitter interface {
 	Split(r io.Reader) chan []byte
diff --git a/net/conn/conn.go b/net/conn/conn.go
index 342be71bb..272a31c3b 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -22,7 +22,7 @@ const (
 	ChanBuffer = 10
 
 	// MaxMessageSize is the size of the largest single message
-	MaxMessageSize = 1 << 21 // 4 MB
+	MaxMessageSize = 1 << 20
 
 	// HandshakeTimeout for when nodes first connect
 	HandshakeTimeout = time.Second * 5

From a8069024e94fa9e4f5527a55ea51000e1f756a36 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 28 Oct 2014 03:58:17 +0000
Subject: [PATCH 10/20] cut down on allocations

---
 .../src/github.com/jbenet/go-msgio/chan.go    | 11 ++-----
 .../src/github.com/jbenet/go-msgio/msgio.go   | 29 ++++++++++++-------
 crypto/spipe/handshake.go                     | 13 ++++-----
 net/conn/conn.go                              |  2 +-
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
index 1c16a9f0f..8c7090ec9 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
@@ -33,7 +33,7 @@ func NewChanWithPool(chanSize int, pool *sync.Pool) *Chan {
 func (s *Chan) ReadFrom(r io.Reader, maxMsgLen int) {
 	// new buffer per message
 	// if bottleneck, cycle around a set of buffers
-	mr := NewReader(r)
+	mr := NewReader(r, s.BufPool)
 	if s.BufPool == nil {
 		s.BufPool = new(sync.Pool)
 		s.BufPool.New = func() interface{} {
@@ -42,12 +42,7 @@ func (s *Chan) ReadFrom(r io.Reader, maxMsgLen int) {
 	}
 Loop:
 	for {
-		bufi := s.BufPool.Get()
-		buf, ok := bufi.([]byte)
-		if !ok {
-			panic("Got invalid type from sync pool!")
-		}
-		l, err := mr.ReadMsg(buf)
+		buf, err := mr.ReadMsg()
 		if err != nil {
 			if err == io.EOF {
 				break Loop // done
@@ -61,7 +56,7 @@ Loop:
 		select {
 		case <-s.CloseChan:
 			break Loop // told we're done
-		case s.MsgChan <- buf[:l]:
+		case s.MsgChan <- buf:
 			// ok seems fine. send it away
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
index 1d3a3d056..ebf7f872b 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
@@ -3,6 +3,7 @@ package msgio
 import (
 	"encoding/binary"
 	"io"
+	"sync"
 )
 
 var NBO = binary.BigEndian
@@ -17,7 +18,7 @@ type WriteCloser interface {
 }
 
 type Reader interface {
-	ReadMsg([]byte) (int, error)
+	ReadMsg() ([]byte, error)
 }
 
 type ReadCloser interface {
@@ -63,22 +64,30 @@ func (s *Writer_) Close() error {
 type Reader_ struct {
 	R    io.Reader
 	lbuf []byte
+	bp   *sync.Pool
 }
 
-func NewReader(r io.Reader) ReadCloser {
-	return &Reader_{r, make([]byte, 4)}
+func NewReader(r io.Reader, bufpool *sync.Pool) ReadCloser {
+	return &Reader_{R: r, lbuf: make([]byte, 4), bp: bufpool}
 }
 
-func (s *Reader_) ReadMsg(msg []byte) (int, error) {
+func (s *Reader_) ReadMsg() ([]byte, error) {
 	if _, err := io.ReadFull(s.R, s.lbuf); err != nil {
-		return 0, err
+		return nil, err
 	}
+
+	bufi := s.bp.Get()
+	buf, ok := bufi.([]byte)
+	if !ok {
+		panic("invalid type in pool!")
+	}
+
 	length := int(NBO.Uint32(s.lbuf))
-	if length < 0 || length > len(msg) {
-		return 0, io.ErrShortBuffer
+	if length < 0 || length > len(buf) {
+		return nil, io.ErrShortBuffer
 	}
-	_, err := io.ReadFull(s.R, msg[:length])
-	return length, err
+	_, err := io.ReadFull(s.R, buf[:length])
+	return buf[:length], err
 }
 
 func (s *Reader_) Close() error {
@@ -95,7 +104,7 @@ type ReadWriter_ struct {
 
 func NewReadWriter(rw io.ReadWriter) ReadWriter {
 	return &ReadWriter_{
-		Reader: NewReader(rw),
+		Reader: NewReader(rw, nil),
 		Writer: NewWriter(rw),
 	}
 }
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index e412ecd7a..37bb79ae5 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -303,21 +303,20 @@ func (s *SecurePipe) handleSecureIn(hashType, cipherType string, tIV, tCKey, tMK
 		}
 
 		mark := len(data) - macSize
-		buff := make([]byte, mark)
-
-		theirCipher.XORKeyStream(buff, data[0:mark])
 
 		theirMac.Write(data[0:mark])
 		expected := theirMac.Sum(nil)
 		theirMac.Reset()
 
 		hmacOk := hmac.Equal(data[mark:], expected)
-
-		if hmacOk {
-			s.Duplex.In <- buff
-		} else {
+		if !hmacOk {
 			s.Duplex.In <- nil
+			continue
 		}
+
+		theirCipher.XORKeyStream(data, data[0:mark])
+
+		s.Duplex.In <- data[:mark]
 	}
 }
 
diff --git a/net/conn/conn.go b/net/conn/conn.go
index 272a31c3b..67384420c 100644
--- a/net/conn/conn.go
+++ b/net/conn/conn.go
@@ -41,7 +41,7 @@ func init() {
 func ReleaseBuffer(b []byte) {
 	log.Warningf("Releasing buffer! (cap,size = %d, %d)", cap(b), len(b))
 	if cap(b) != MaxMessageSize {
-		log.Warning("Release buffer failed.")
+		log.Warning("Release buffer failed (cap, size = %d, %d)", cap(b), len(b))
 		return
 	}
 	BufferPool.Put(b[:cap(b)])

From 950957240a503b7a06fdb52272358aa1e8c5ecb3 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 29 Oct 2014 18:34:53 +0000
Subject: [PATCH 11/20] address comments from PR

---
 .../src/github.com/jbenet/go-msgio/chan.go    |  26 ++--
 .../src/github.com/jbenet/go-msgio/msgio.go   |  29 ++--
 blocks/blocks.go                              |  11 ++
 crypto/spipe/handshake.go                     |  40 +----
 crypto/spipe/internal/pb/spipe.pb.go          |  18 ++-
 crypto/spipe/internal/pb/spipe.proto          |   1 +
 crypto/spipe/signedpipe.go                    | 143 +++++++++++++++---
 7 files changed, 177 insertions(+), 91 deletions(-)

diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
index 8c7090ec9..cb78109f4 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/chan.go
@@ -30,19 +30,27 @@ func NewChanWithPool(chanSize int, pool *sync.Pool) *Chan {
 	}
 }
 
+func (s *Chan) getBuffer(size int) []byte {
+	if s.BufPool == nil {
+		return make([]byte, size)
+	} else {
+		bufi := s.BufPool.Get()
+		buf, ok := bufi.([]byte)
+		if !ok {
+			panic("Got invalid type from sync pool!")
+		}
+		return buf
+	}
+}
+
 func (s *Chan) ReadFrom(r io.Reader, maxMsgLen int) {
 	// new buffer per message
 	// if bottleneck, cycle around a set of buffers
-	mr := NewReader(r, s.BufPool)
-	if s.BufPool == nil {
-		s.BufPool = new(sync.Pool)
-		s.BufPool.New = func() interface{} {
-			return make([]byte, maxMsgLen)
-		}
-	}
+	mr := NewReader(r)
 Loop:
 	for {
-		buf, err := mr.ReadMsg()
+		buf := s.getBuffer(maxMsgLen)
+		l, err := mr.ReadMsg(buf)
 		if err != nil {
 			if err == io.EOF {
 				break Loop // done
@@ -56,7 +64,7 @@ Loop:
 		select {
 		case <-s.CloseChan:
 			break Loop // told we're done
-		case s.MsgChan <- buf:
+		case s.MsgChan <- buf[:l]:
 			// ok seems fine. send it away
 		}
 	}
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go b/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
index ebf7f872b..1d3a3d056 100644
--- a/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
+++ b/Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
@@ -3,7 +3,6 @@ package msgio
 import (
 	"encoding/binary"
 	"io"
-	"sync"
 )
 
 var NBO = binary.BigEndian
@@ -18,7 +17,7 @@ type WriteCloser interface {
 }
 
 type Reader interface {
-	ReadMsg() ([]byte, error)
+	ReadMsg([]byte) (int, error)
 }
 
 type ReadCloser interface {
@@ -64,30 +63,22 @@ func (s *Writer_) Close() error {
 type Reader_ struct {
 	R    io.Reader
 	lbuf []byte
-	bp   *sync.Pool
 }
 
-func NewReader(r io.Reader, bufpool *sync.Pool) ReadCloser {
-	return &Reader_{R: r, lbuf: make([]byte, 4), bp: bufpool}
+func NewReader(r io.Reader) ReadCloser {
+	return &Reader_{r, make([]byte, 4)}
 }
 
-func (s *Reader_) ReadMsg() ([]byte, error) {
+func (s *Reader_) ReadMsg(msg []byte) (int, error) {
 	if _, err := io.ReadFull(s.R, s.lbuf); err != nil {
-		return nil, err
+		return 0, err
 	}
-
-	bufi := s.bp.Get()
-	buf, ok := bufi.([]byte)
-	if !ok {
-		panic("invalid type in pool!")
-	}
-
 	length := int(NBO.Uint32(s.lbuf))
-	if length < 0 || length > len(buf) {
-		return nil, io.ErrShortBuffer
+	if length < 0 || length > len(msg) {
+		return 0, io.ErrShortBuffer
 	}
-	_, err := io.ReadFull(s.R, buf[:length])
-	return buf[:length], err
+	_, err := io.ReadFull(s.R, msg[:length])
+	return length, err
 }
 
 func (s *Reader_) Close() error {
@@ -104,7 +95,7 @@ type ReadWriter_ struct {
 
 func NewReadWriter(rw io.ReadWriter) ReadWriter {
 	return &ReadWriter_{
-		Reader: NewReader(rw, nil),
+		Reader: NewReader(rw),
 		Writer: NewWriter(rw),
 	}
 }
diff --git a/blocks/blocks.go b/blocks/blocks.go
index 9bf556f5a..b87cf5a32 100644
--- a/blocks/blocks.go
+++ b/blocks/blocks.go
@@ -1,6 +1,7 @@
 package blocks
 
 import (
+	"errors"
 	"fmt"
 
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
@@ -18,6 +19,16 @@ func NewBlock(data []byte) *Block {
 	return &Block{Data: data, Multihash: u.Hash(data)}
 }
 
+func NewBlockWithHash(data []byte, h mh.Multihash) (*Block, error) {
+	if u.Debug {
+		chk := u.Hash(data)
+		if string(chk) != string(h) {
+			return nil, errors.New("Data did not match given hash!")
+		}
+	}
+	return &Block{Data: data, Multihash: h}, nil
+}
+
 // Key returns the block's Multihash as a Key value.
 func (b *Block) Key() u.Key {
 	return u.Key(b.Multihash)
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 37bb79ae5..2b5485255 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -185,44 +185,10 @@ func (s *SecurePipe) handshake() error {
 
 	cmp := bytes.Compare(myPubKey, proposeResp.GetPubkey())
 
-	if true {
-		mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
+	mIV, tIV, mCKey, tCKey, mMKey, tMKey := ci.KeyStretcher(cmp, cipherType, hashType, secret)
 
-		go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
-		go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
-
-	} else {
-		log.Critical("Secure Channel Disabled! PLEASE ENSURE YOU KNOW WHAT YOU ARE DOING")
-		// Disable Secure Channel
-		go func(sp *SecurePipe) {
-			for {
-				select {
-				case <-sp.ctx.Done():
-					return
-				case m, ok := <-sp.insecure.In:
-					if !ok {
-						sp.cancel()
-						return
-					}
-					sp.In <- m
-				}
-			}
-		}(s)
-		go func(sp *SecurePipe) {
-			for {
-				select {
-				case <-sp.ctx.Done():
-					return
-				case m, ok := <-sp.Out:
-					if !ok {
-						sp.cancel()
-						return
-					}
-					sp.insecure.Out <- m
-				}
-			}
-		}(s)
-	}
+	go s.handleSecureIn(hashType, cipherType, tIV, tCKey, tMKey)
+	go s.handleSecureOut(hashType, cipherType, mIV, mCKey, mMKey)
 
 	finished := []byte("Finished")
 
diff --git a/crypto/spipe/internal/pb/spipe.pb.go b/crypto/spipe/internal/pb/spipe.pb.go
index 5f1b34c2b..9b5b867e2 100644
--- a/crypto/spipe/internal/pb/spipe.pb.go
+++ b/crypto/spipe/internal/pb/spipe.pb.go
@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-gogo.
 // source: spipe.proto
 // DO NOT EDIT!
 
@@ -15,7 +15,7 @@ It has these top-level messages:
 */
 package spipe_pb
 
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
+import proto "code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -95,9 +95,10 @@ func (m *Exchange) GetSignature() []byte {
 }
 
 type DataSig struct {
-	Data             []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	Sig              []byte `protobuf:"bytes,2,opt,name=sig" json:"sig,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
+	Data             []byte  `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Sig              []byte  `protobuf:"bytes,2,opt,name=sig" json:"sig,omitempty"`
+	Id               *uint64 `protobuf:"varint,3,opt,name=id" json:"id,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
 }
 
 func (m *DataSig) Reset()         { *m = DataSig{} }
@@ -118,5 +119,12 @@ func (m *DataSig) GetSig() []byte {
 	return nil
 }
 
+func (m *DataSig) GetId() uint64 {
+	if m != nil && m.Id != nil {
+		return *m.Id
+	}
+	return 0
+}
+
 func init() {
 }
diff --git a/crypto/spipe/internal/pb/spipe.proto b/crypto/spipe/internal/pb/spipe.proto
index 699821b07..94e4f06f7 100644
--- a/crypto/spipe/internal/pb/spipe.proto
+++ b/crypto/spipe/internal/pb/spipe.proto
@@ -16,4 +16,5 @@ message Exchange {
 message DataSig {
 	optional bytes data = 1;
 	optional bytes sig = 2;
+	optional uint64 id = 3;
 }
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
index 445981305..938b88f1b 100644
--- a/crypto/spipe/signedpipe.go
+++ b/crypto/spipe/signedpipe.go
@@ -24,18 +24,23 @@ type SignedPipe struct {
 
 	ctx    context.Context
 	cancel context.CancelFunc
+
+	mesid      uint64
+	theirmesid uint64
 }
 
+// secureChallengeSize is a constant that determines the initial challenge, and every subsequent
+// sequence number. It should be large enough to be unguessable by adversaries (128+ bits).
+// (SECURITY WARNING)
+const secureChallengeSize = (256 / 32)
+
 func NewSignedPipe(parctx context.Context, bufsize int, local peer.Peer,
 	peers peer.Peerstore, insecure pipes.Duplex) (*SignedPipe, error) {
 
 	ctx, cancel := context.WithCancel(parctx)
 
 	sp := &SignedPipe{
-		Duplex: pipes.Duplex{
-			In:  make(chan []byte, bufsize),
-			Out: make(chan []byte, bufsize),
-		},
+		Duplex:   pipes.NewDuplex(bufsize),
 		local:    local,
 		peers:    peers,
 		insecure: insecure,
@@ -51,6 +56,36 @@ func NewSignedPipe(parctx context.Context, bufsize int, local peer.Peer,
 	return sp, nil
 }
 
+func (sp *SignedPipe) trySend(b []byte) bool {
+	select {
+	case <-sp.ctx.Done():
+		return false
+	case sp.insecure.Out <- b:
+		return true
+	}
+}
+
+func (sp *SignedPipe) tryRecv() ([]byte, bool) {
+	select {
+	case <-sp.ctx.Done():
+		return nil, false
+	case data, ok := <-sp.insecure.In:
+		if !ok {
+			return nil, false
+		}
+		return data, true
+	}
+}
+
+func reduceChallenge(cha []byte) uint64 {
+	var out uint64
+	for _, b := range cha {
+		out ^= uint64(b)
+		out = out << 1
+	}
+	return out
+}
+
 func (sp *SignedPipe) handshake() error {
 	// Send them our public key
 	pubk := sp.local.PubKey()
@@ -59,7 +94,10 @@ func (sp *SignedPipe) handshake() error {
 		return err
 	}
 
-	sp.insecure.Out <- pkb
+	// Exchange public keys with remote peer
+	if !sp.trySend(pkb) {
+		return context.Canceled
+	}
 	theirPkb := <-sp.insecure.In
 
 	theirPubKey, err := ci.UnmarshalPublicKey(theirPkb)
@@ -67,7 +105,7 @@ func (sp *SignedPipe) handshake() error {
 		return err
 	}
 
-	challenge := make([]byte, 32)
+	challenge := make([]byte, secureChallengeSize)
 	rand.Read(challenge)
 
 	enc, err := theirPubKey.Encrypt(challenge)
@@ -75,24 +113,62 @@ func (sp *SignedPipe) handshake() error {
 		return err
 	}
 
-	sp.insecure.Out <- enc
-	theirEnc := <-sp.insecure.In
-
-	unenc, err := sp.local.PrivKey().Unencrypt(theirEnc)
+	chsig, err := sp.local.PrivKey().Sign(challenge)
 	if err != nil {
 		return err
 	}
 
+	if !sp.trySend(enc) {
+		return context.Canceled
+	}
+	if !sp.trySend(chsig) {
+		return context.Canceled
+	}
+
+	theirEnc, ok := sp.tryRecv()
+	if !ok {
+		return context.Canceled
+	}
+	theirChSig, ok := sp.tryRecv()
+	if !ok {
+		return context.Canceled
+	}
+
+	// Unencrypt and verify their challenge
+	unenc, err := sp.local.PrivKey().Unencrypt(theirEnc)
+	if err != nil {
+		return err
+	}
+	ok, err = theirPubKey.Verify(unenc, theirChSig)
+	if err != nil {
+		return err
+	}
+	if !ok {
+		return errors.New("Invalid signature!")
+	}
+
+	// Sign the unencrypted challenge, and send it back
 	sig, err := sp.local.PrivKey().Sign(unenc)
 	if err != nil {
 		return err
 	}
 
-	sp.insecure.Out <- unenc
-	theirUnenc := <-sp.insecure.In
-	sp.insecure.Out <- sig
-	theirSig := <-sp.insecure.In
+	if !sp.trySend(unenc) {
+		return context.Canceled
+	}
+	if !sp.trySend(sig) {
+		return context.Canceled
+	}
+	theirUnenc, ok := sp.tryRecv()
+	if !ok {
+		return context.Canceled
+	}
+	theirSig, ok := sp.tryRecv()
+	if !ok {
+		return context.Canceled
+	}
 
+	// Verify that they correctly unecrypted the challenge
 	if !bytes.Equal(theirUnenc, challenge) {
 		return errors.New("received bad challenge response")
 	}
@@ -106,12 +182,29 @@ func (sp *SignedPipe) handshake() error {
 		return errors.New("Incorrect signature on challenge")
 	}
 
+	sp.theirmesid = reduceChallenge(challenge)
+	sp.mesid = reduceChallenge(unenc)
+
 	go sp.handleIn(theirPubKey)
-	go sp.handleOut()
+	go sp.handleOut(sp.local.PrivKey())
 
 	finished := []byte("finished")
-	sp.Out <- finished
-	resp := <-sp.In
+
+	select {
+	case <-sp.ctx.Done():
+		return context.Canceled
+	case sp.Out <- finished:
+	}
+
+	var resp []byte
+	select {
+	case <-sp.ctx.Done():
+		return context.Canceled
+	case resp, ok = <-sp.In:
+		if !ok {
+			return errors.New("Channel closed before handshake finished.")
+		}
+	}
 	if !bytes.Equal(resp, finished) {
 		return errors.New("Handshake failed!")
 	}
@@ -119,7 +212,7 @@ func (sp *SignedPipe) handshake() error {
 	return nil
 }
 
-func (sp *SignedPipe) handleOut() {
+func (sp *SignedPipe) handleOut(pk ci.PrivKey) {
 	for {
 		var data []byte
 		var ok bool
@@ -135,19 +228,21 @@ func (sp *SignedPipe) handleOut() {
 
 		sdata := new(pb.DataSig)
 
-		sig, err := sp.local.PrivKey().Sign(data)
+		sig, err := pk.Sign(data)
 		if err != nil {
 			log.Error("Error signing outgoing data: %s", err)
-			continue
+			return
 		}
 
 		sdata.Data = data
 		sdata.Sig = sig
+		sdata.Id = proto.Uint64(sp.mesid)
 		b, err := proto.Marshal(sdata)
 		if err != nil {
 			log.Error("Error marshaling signed data object: %s", err)
-			continue
+			return
 		}
+		sp.mesid++
 
 		select {
 		case sp.insecure.Out <- b:
@@ -188,6 +283,12 @@ func (sp *SignedPipe) handleIn(theirPubkey ci.PubKey) {
 			continue
 		}
 
+		if sdata.GetId() != sp.theirmesid {
+			log.Critical("Out of order message id!")
+			return
+		}
+		sp.theirmesid++
+
 		select {
 		case <-sp.ctx.Done():
 			return

From 98f56ab7e2b96147bff452816e016c0caa997d7e Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 29 Oct 2014 19:54:41 +0000
Subject: [PATCH 12/20] remove sha1 from hmac hash suite options

---
 crypto/spipe/handshake.go | 2 +-
 net/mux/mux.go            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 2b5485255..d802f9f90 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -35,7 +35,7 @@ var SupportedExchanges = "P-256,P-224,P-384,P-521"
 var SupportedCiphers = "AES-256,AES-128,Blowfish"
 
 // List of supported Hashes
-var SupportedHashes = "SHA256,SHA512,SHA1"
+var SupportedHashes = "SHA256,SHA512"
 
 // ErrUnsupportedKeyType is returned when a private key cast/type switch fails.
 var ErrUnsupportedKeyType = errors.New("unsupported key type")
diff --git a/net/mux/mux.go b/net/mux/mux.go
index cd5f7f876..c0a72abdf 100644
--- a/net/mux/mux.go
+++ b/net/mux/mux.go
@@ -1,4 +1,4 @@
-tpackage mux
+package mux
 
 import (
 	"errors"

From 3ed10b13315112ad3b11797e53652ac42652682c Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 29 Oct 2014 21:07:17 +0000
Subject: [PATCH 13/20] dagservice interface fix

---
 merkledag/merkledag.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
index 19e145254..d9221f0da 100644
--- a/merkledag/merkledag.go
+++ b/merkledag/merkledag.go
@@ -242,7 +242,7 @@ func (n *dagService) Remove(nd *Node) error {
 	return n.Blocks.DeleteBlock(k)
 }
 
-func FetchGraph(ctx context.Context, root *Node, serv *DAGService) {
+func FetchGraph(ctx context.Context, root *Node, serv DAGService) {
 	for _, l := range root.Links {
 		go func(lnk *Link) {
 			select {

From ce223eef6179d7d9b95f3c24ec9fbd527b714980 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Thu, 30 Oct 2014 05:55:39 +0000
Subject: [PATCH 14/20] some small cleanup of logging

---
 core/commands/add.go   |  6 +++---
 unixfs/io/dagreader.go | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/commands/add.go b/core/commands/add.go
index 57c9666bb..0208354cd 100644
--- a/core/commands/add.go
+++ b/core/commands/add.go
@@ -82,7 +82,7 @@ func addDir(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Node
 		}
 	}
 
-	log.Info("adding dir: %s", fpath)
+	log.Infof("adding dir: %s", fpath)
 
 	return tree, addNode(n, tree, fpath, out)
 }
@@ -98,10 +98,10 @@ func addFile(n *core.IpfsNode, fpath string, depth int, out io.Writer) (*dag.Nod
 		return nil, err
 	}
 
-	log.Info("adding file: %s", fpath)
+	log.Infof("adding file: %s", fpath)
 
 	for _, l := range root.Links {
-		log.Info("adding subblock: %s %s", l.Name, l.Hash.B58String())
+		log.Infof("adding subblock: '%s' %s", l.Name, l.Hash.B58String())
 	}
 
 	k, err := root.Key()
diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go
index a2dbeb2f2..307f1d305 100644
--- a/unixfs/io/dagreader.go
+++ b/unixfs/io/dagreader.go
@@ -18,7 +18,7 @@ type DagReader struct {
 	serv     mdag.DAGService
 	node     *mdag.Node
 	position int
-	buf      *bytes.Buffer
+	buf      io.Reader
 }
 
 // NewDagReader creates a new reader object that reads the data represented by the given
@@ -71,8 +71,13 @@ func (dr *DagReader) precalcNextBuf() error {
 		return ft.ErrInvalidDirLocation
 	case ftpb.Data_File:
 		//TODO: this *should* work, needs testing first
-		//return NewDagReader(nxt, dr.serv)
-		panic("Not yet handling different layers of indirection!")
+		log.Warning("Running untested code for multilayered indirect FS reads.")
+		subr, err := NewDagReader(nxt, dr.serv)
+		if err != nil {
+			return err
+		}
+		dr.buf = subr
+		return nil
 	case ftpb.Data_Raw:
 		dr.buf = bytes.NewBuffer(pb.GetData())
 		return nil

From 09004e498919aa5cb2092d8103f4a8b7c4fa3846 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Thu, 30 Oct 2014 20:50:24 +0000
Subject: [PATCH 15/20] finish addressing PR concerns

---
 unixfs/io/dagreader.go | 5 ++---
 util/testutil/gen.go   | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go
index 307f1d305..804e03438 100644
--- a/unixfs/io/dagreader.go
+++ b/unixfs/io/dagreader.go
@@ -35,12 +35,11 @@ func NewDagReader(n *mdag.Node, serv mdag.DAGService) (io.Reader, error) {
 		// Dont allow reading directories
 		return nil, ErrIsDir
 	case ftpb.Data_File:
-		dr := &DagReader{
+		return &DagReader{
 			node: n,
 			serv: serv,
 			buf:  bytes.NewBuffer(pb.GetData()),
-		}
-		return dr, nil
+		}, nil
 	case ftpb.Data_Raw:
 		// Raw block will just be a single level, return a byte buffer
 		return bytes.NewBuffer(pb.GetData()), nil
diff --git a/util/testutil/gen.go b/util/testutil/gen.go
index 18b88801d..111cbe728 100644
--- a/util/testutil/gen.go
+++ b/util/testutil/gen.go
@@ -9,6 +9,7 @@ import (
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	bsrv "github.com/jbenet/go-ipfs/blockservice"
 	dag "github.com/jbenet/go-ipfs/merkledag"
+	u "github.com/jbenet/go-ipfs/util"
 )
 
 func GetDAGServ(t testing.TB) dag.DAGService {
@@ -21,7 +22,8 @@ func GetDAGServ(t testing.TB) dag.DAGService {
 }
 
 func RandPeer() peer.Peer {
-	id := make(peer.ID, 16)
+	id := make([]byte, 16)
 	crand.Read(id)
-	return peer.WithID(id)
-}
\ No newline at end of file
+	mhid := u.Hash(id)
+	return peer.WithID(peer.ID(mhid))
+}

From 5edbca2e7089aeecb503db9de98acdfaa1a70f9c Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Fri, 31 Oct 2014 06:26:28 +0000
Subject: [PATCH 16/20] cleanup from CR

---
 Godeps/Godeps.json                   |  4 ++--
 blockstore/blockstore.go             |  8 ++------
 crypto/key.go                        |  2 +-
 crypto/rsa.go                        |  2 +-
 crypto/spipe/handshake.go            |  1 -
 crypto/spipe/internal/pb/spipe.pb.go |  8 ++++----
 crypto/spipe/internal/pb/spipe.proto |  2 +-
 crypto/spipe/signedpipe.go           | 26 ++++++++++++++------------
 crypto/spipe/spipe_test.go           |  6 +++---
 routing/dht/pb/dht.pb.go             |  2 +-
 10 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d8a6595ea..4ac3d143d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/jbenet/go-ipfs",
-	"GoVersion": "go1.3.3",
+	"GoVersion": "devel +9340f9f6dfc9 Fri Oct 31 00:48:57 2014 -0300",
 	"Packages": [
 		"./..."
 	],
@@ -98,7 +98,7 @@
 		},
 		{
 			"ImportPath": "github.com/jbenet/go-msgio",
-			"Rev": "c9069ab79c95aa0686347b516972c7329c4391f2"
+			"Rev": "ab0e7a0e111d7c7d814ad238bcbf3934efb76ac3"
 		},
 		{
 			"ImportPath": "github.com/jbenet/go-multiaddr",
diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go
index ca55046bb..1a2bf540d 100644
--- a/blockstore/blockstore.go
+++ b/blockstore/blockstore.go
@@ -36,12 +36,8 @@ func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) {
 	if !ok {
 		return nil, ValueTypeMismatch
 	}
-	//TODO: we *could* verify data coming in from the datastore here
-	//		but its probably very unecessary
-	return &blocks.Block{
-		Data:      bdata,
-		Multihash: mh.Multihash(k),
-	}, nil
+
+	return blocks.NewBlockWithHash(bdata, mh.Multihash(k))
 }
 
 func (bs *blockstore) Put(block *blocks.Block) error {
diff --git a/crypto/key.go b/crypto/key.go
index 856866aaa..872bbd0c9 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -51,7 +51,7 @@ type PrivKey interface {
 	// Generate a secret string of bytes
 	GenSecret() []byte
 
-	Unencrypt(b []byte) ([]byte, error)
+	Decrypt(b []byte) ([]byte, error)
 }
 
 type PubKey interface {
diff --git a/crypto/rsa.go b/crypto/rsa.go
index bb131e06a..1ef99776b 100644
--- a/crypto/rsa.go
+++ b/crypto/rsa.go
@@ -71,7 +71,7 @@ func (sk *RsaPrivateKey) GetPublic() PubKey {
 	return &RsaPublicKey{&sk.k.PublicKey}
 }
 
-func (sk *RsaPrivateKey) Unencrypt(b []byte) ([]byte, error) {
+func (sk *RsaPrivateKey) Decrypt(b []byte) ([]byte, error) {
 	return rsa.DecryptPKCS1v15(rand.Reader, sk.k, b)
 }
 
diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index d802f9f90..fdcd51a13 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -276,7 +276,6 @@ func (s *SecurePipe) handleSecureIn(hashType, cipherType string, tIV, tCKey, tMK
 
 		hmacOk := hmac.Equal(data[mark:], expected)
 		if !hmacOk {
-			s.Duplex.In <- nil
 			continue
 		}
 
diff --git a/crypto/spipe/internal/pb/spipe.pb.go b/crypto/spipe/internal/pb/spipe.pb.go
index 9b5b867e2..684ce5da9 100644
--- a/crypto/spipe/internal/pb/spipe.pb.go
+++ b/crypto/spipe/internal/pb/spipe.pb.go
@@ -15,7 +15,7 @@ It has these top-level messages:
 */
 package spipe_pb
 
-import proto "code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -96,7 +96,7 @@ func (m *Exchange) GetSignature() []byte {
 
 type DataSig struct {
 	Data             []byte  `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	Sig              []byte  `protobuf:"bytes,2,opt,name=sig" json:"sig,omitempty"`
+	Signature        []byte  `protobuf:"bytes,2,opt,name=signature" json:"signature,omitempty"`
 	Id               *uint64 `protobuf:"varint,3,opt,name=id" json:"id,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
@@ -112,9 +112,9 @@ func (m *DataSig) GetData() []byte {
 	return nil
 }
 
-func (m *DataSig) GetSig() []byte {
+func (m *DataSig) GetSignature() []byte {
 	if m != nil {
-		return m.Sig
+		return m.Signature
 	}
 	return nil
 }
diff --git a/crypto/spipe/internal/pb/spipe.proto b/crypto/spipe/internal/pb/spipe.proto
index 94e4f06f7..5f263e7dd 100644
--- a/crypto/spipe/internal/pb/spipe.proto
+++ b/crypto/spipe/internal/pb/spipe.proto
@@ -15,6 +15,6 @@ message Exchange {
 
 message DataSig {
 	optional bytes data = 1;
-	optional bytes sig = 2;
+	optional bytes signature = 2;
 	optional uint64 id = 3;
 }
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
index 938b88f1b..3bc7b1d6f 100644
--- a/crypto/spipe/signedpipe.go
+++ b/crypto/spipe/signedpipe.go
@@ -25,8 +25,8 @@ type SignedPipe struct {
 	ctx    context.Context
 	cancel context.CancelFunc
 
-	mesid      uint64
-	theirmesid uint64
+	localMsgID  uint64
+	removeMsgID uint64
 }
 
 // secureChallengeSize is a constant that determines the initial challenge, and every subsequent
@@ -77,6 +77,8 @@ func (sp *SignedPipe) tryRecv() ([]byte, bool) {
 	}
 }
 
+// reduceChallenge reduces a series of bytes into a
+// single uint64 we can use as a seed for message IDs
 func reduceChallenge(cha []byte) uint64 {
 	var out uint64
 	for _, b := range cha {
@@ -134,8 +136,8 @@ func (sp *SignedPipe) handshake() error {
 		return context.Canceled
 	}
 
-	// Unencrypt and verify their challenge
-	unenc, err := sp.local.PrivKey().Unencrypt(theirEnc)
+	// Decrypt and verify their challenge
+	unenc, err := sp.local.PrivKey().Decrypt(theirEnc)
 	if err != nil {
 		return err
 	}
@@ -182,8 +184,8 @@ func (sp *SignedPipe) handshake() error {
 		return errors.New("Incorrect signature on challenge")
 	}
 
-	sp.theirmesid = reduceChallenge(challenge)
-	sp.mesid = reduceChallenge(unenc)
+	sp.removeMsgID = reduceChallenge(challenge)
+	sp.localMsgID = reduceChallenge(unenc)
 
 	go sp.handleIn(theirPubKey)
 	go sp.handleOut(sp.local.PrivKey())
@@ -235,14 +237,14 @@ func (sp *SignedPipe) handleOut(pk ci.PrivKey) {
 		}
 
 		sdata.Data = data
-		sdata.Sig = sig
-		sdata.Id = proto.Uint64(sp.mesid)
+		sdata.Signature = sig
+		sdata.Id = proto.Uint64(sp.localMsgID)
 		b, err := proto.Marshal(sdata)
 		if err != nil {
 			log.Error("Error marshaling signed data object: %s", err)
 			return
 		}
-		sp.mesid++
+		sp.localMsgID++
 
 		select {
 		case sp.insecure.Out <- b:
@@ -273,7 +275,7 @@ func (sp *SignedPipe) handleIn(theirPubkey ci.PubKey) {
 			log.Error("Failed to unmarshal sigdata object")
 			continue
 		}
-		correct, err := theirPubkey.Verify(sdata.GetData(), sdata.GetSig())
+		correct, err := theirPubkey.Verify(sdata.GetData(), sdata.GetSignature())
 		if err != nil {
 			log.Error(err)
 			continue
@@ -283,11 +285,11 @@ func (sp *SignedPipe) handleIn(theirPubkey ci.PubKey) {
 			continue
 		}
 
-		if sdata.GetId() != sp.theirmesid {
+		if sdata.GetId() != sp.removeMsgID {
 			log.Critical("Out of order message id!")
 			return
 		}
-		sp.theirmesid++
+		sp.removeMsgID++
 
 		select {
 		case <-sp.ctx.Done():
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index c4e0a0b7f..c0f15ac85 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -118,7 +118,7 @@ func runEncryptBenchmark(b *testing.B) {
 	}()
 
 	data := make([]byte, 1024*512)
-	util.NewFastRand().Read(data)
+	util.NewTimeSeededRand().Read(data)
 	// Begin actual benchmarking
 	b.ResetTimer()
 
@@ -170,7 +170,7 @@ func BenchmarkSignedChannel(b *testing.B) {
 	}()
 
 	data := make([]byte, 1024*512)
-	util.NewFastRand().Read(data)
+	util.NewTimeSeededRand().Read(data)
 	// Begin actual benchmarking
 	b.ResetTimer()
 
@@ -199,7 +199,7 @@ func BenchmarkDataTransfer(b *testing.B) {
 	}()
 
 	data := make([]byte, 1024*512)
-	util.NewFastRand().Read(data)
+	util.NewTimeSeededRand().Read(data)
 	// Begin actual benchmarking
 	b.ResetTimer()
 
diff --git a/routing/dht/pb/dht.pb.go b/routing/dht/pb/dht.pb.go
index 22c87bac9..6c488c51a 100644
--- a/routing/dht/pb/dht.pb.go
+++ b/routing/dht/pb/dht.pb.go
@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package dht_pb
 
-import proto "code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

From 6efaa1d811d497923ce4e24b784d24b77df85a04 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Fri, 31 Oct 2014 18:10:10 +0000
Subject: [PATCH 17/20] remove signed pipe

---
 crypto/spipe/internal/pb/spipe.proto |   6 -
 crypto/spipe/signedpipe.go           | 305 ---------------------------
 crypto/spipe/spipe_test.go           |  52 -----
 3 files changed, 363 deletions(-)
 delete mode 100644 crypto/spipe/signedpipe.go

diff --git a/crypto/spipe/internal/pb/spipe.proto b/crypto/spipe/internal/pb/spipe.proto
index 5f263e7dd..a7a467737 100644
--- a/crypto/spipe/internal/pb/spipe.proto
+++ b/crypto/spipe/internal/pb/spipe.proto
@@ -12,9 +12,3 @@ message Exchange {
 	optional bytes epubkey = 1;
 	optional bytes signature = 2;
 }
-
-message DataSig {
-	optional bytes data = 1;
-	optional bytes signature = 2;
-	optional uint64 id = 3;
-}
diff --git a/crypto/spipe/signedpipe.go b/crypto/spipe/signedpipe.go
deleted file mode 100644
index 3bc7b1d6f..000000000
--- a/crypto/spipe/signedpipe.go
+++ /dev/null
@@ -1,305 +0,0 @@
-package spipe
-
-import (
-	"bytes"
-	"crypto/rand"
-	"errors"
-
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
-
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
-	ci "github.com/jbenet/go-ipfs/crypto"
-	pb "github.com/jbenet/go-ipfs/crypto/spipe/internal/pb"
-	"github.com/jbenet/go-ipfs/peer"
-	"github.com/jbenet/go-ipfs/util/pipes"
-)
-
-type SignedPipe struct {
-	pipes.Duplex
-	insecure pipes.Duplex
-
-	local  peer.Peer
-	remote peer.Peer
-	peers  peer.Peerstore
-
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	localMsgID  uint64
-	removeMsgID uint64
-}
-
-// secureChallengeSize is a constant that determines the initial challenge, and every subsequent
-// sequence number. It should be large enough to be unguessable by adversaries (128+ bits).
-// (SECURITY WARNING)
-const secureChallengeSize = (256 / 32)
-
-func NewSignedPipe(parctx context.Context, bufsize int, local peer.Peer,
-	peers peer.Peerstore, insecure pipes.Duplex) (*SignedPipe, error) {
-
-	ctx, cancel := context.WithCancel(parctx)
-
-	sp := &SignedPipe{
-		Duplex:   pipes.NewDuplex(bufsize),
-		local:    local,
-		peers:    peers,
-		insecure: insecure,
-
-		ctx:    ctx,
-		cancel: cancel,
-	}
-
-	if err := sp.handshake(); err != nil {
-		sp.Close()
-		return nil, err
-	}
-	return sp, nil
-}
-
-func (sp *SignedPipe) trySend(b []byte) bool {
-	select {
-	case <-sp.ctx.Done():
-		return false
-	case sp.insecure.Out <- b:
-		return true
-	}
-}
-
-func (sp *SignedPipe) tryRecv() ([]byte, bool) {
-	select {
-	case <-sp.ctx.Done():
-		return nil, false
-	case data, ok := <-sp.insecure.In:
-		if !ok {
-			return nil, false
-		}
-		return data, true
-	}
-}
-
-// reduceChallenge reduces a series of bytes into a
-// single uint64 we can use as a seed for message IDs
-func reduceChallenge(cha []byte) uint64 {
-	var out uint64
-	for _, b := range cha {
-		out ^= uint64(b)
-		out = out << 1
-	}
-	return out
-}
-
-func (sp *SignedPipe) handshake() error {
-	// Send them our public key
-	pubk := sp.local.PubKey()
-	pkb, err := pubk.Bytes()
-	if err != nil {
-		return err
-	}
-
-	// Exchange public keys with remote peer
-	if !sp.trySend(pkb) {
-		return context.Canceled
-	}
-	theirPkb := <-sp.insecure.In
-
-	theirPubKey, err := ci.UnmarshalPublicKey(theirPkb)
-	if err != nil {
-		return err
-	}
-
-	challenge := make([]byte, secureChallengeSize)
-	rand.Read(challenge)
-
-	enc, err := theirPubKey.Encrypt(challenge)
-	if err != nil {
-		return err
-	}
-
-	chsig, err := sp.local.PrivKey().Sign(challenge)
-	if err != nil {
-		return err
-	}
-
-	if !sp.trySend(enc) {
-		return context.Canceled
-	}
-	if !sp.trySend(chsig) {
-		return context.Canceled
-	}
-
-	theirEnc, ok := sp.tryRecv()
-	if !ok {
-		return context.Canceled
-	}
-	theirChSig, ok := sp.tryRecv()
-	if !ok {
-		return context.Canceled
-	}
-
-	// Decrypt and verify their challenge
-	unenc, err := sp.local.PrivKey().Decrypt(theirEnc)
-	if err != nil {
-		return err
-	}
-	ok, err = theirPubKey.Verify(unenc, theirChSig)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return errors.New("Invalid signature!")
-	}
-
-	// Sign the unencrypted challenge, and send it back
-	sig, err := sp.local.PrivKey().Sign(unenc)
-	if err != nil {
-		return err
-	}
-
-	if !sp.trySend(unenc) {
-		return context.Canceled
-	}
-	if !sp.trySend(sig) {
-		return context.Canceled
-	}
-	theirUnenc, ok := sp.tryRecv()
-	if !ok {
-		return context.Canceled
-	}
-	theirSig, ok := sp.tryRecv()
-	if !ok {
-		return context.Canceled
-	}
-
-	// Verify that they correctly unecrypted the challenge
-	if !bytes.Equal(theirUnenc, challenge) {
-		return errors.New("received bad challenge response")
-	}
-
-	correct, err := theirPubKey.Verify(theirUnenc, theirSig)
-	if err != nil {
-		return err
-	}
-
-	if !correct {
-		return errors.New("Incorrect signature on challenge")
-	}
-
-	sp.removeMsgID = reduceChallenge(challenge)
-	sp.localMsgID = reduceChallenge(unenc)
-
-	go sp.handleIn(theirPubKey)
-	go sp.handleOut(sp.local.PrivKey())
-
-	finished := []byte("finished")
-
-	select {
-	case <-sp.ctx.Done():
-		return context.Canceled
-	case sp.Out <- finished:
-	}
-
-	var resp []byte
-	select {
-	case <-sp.ctx.Done():
-		return context.Canceled
-	case resp, ok = <-sp.In:
-		if !ok {
-			return errors.New("Channel closed before handshake finished.")
-		}
-	}
-	if !bytes.Equal(resp, finished) {
-		return errors.New("Handshake failed!")
-	}
-
-	return nil
-}
-
-func (sp *SignedPipe) handleOut(pk ci.PrivKey) {
-	for {
-		var data []byte
-		var ok bool
-		select {
-		case <-sp.ctx.Done():
-			return
-		case data, ok = <-sp.Out:
-			if !ok {
-				log.Warning("pipe closed!")
-				return
-			}
-		}
-
-		sdata := new(pb.DataSig)
-
-		sig, err := pk.Sign(data)
-		if err != nil {
-			log.Error("Error signing outgoing data: %s", err)
-			return
-		}
-
-		sdata.Data = data
-		sdata.Signature = sig
-		sdata.Id = proto.Uint64(sp.localMsgID)
-		b, err := proto.Marshal(sdata)
-		if err != nil {
-			log.Error("Error marshaling signed data object: %s", err)
-			return
-		}
-		sp.localMsgID++
-
-		select {
-		case sp.insecure.Out <- b:
-		case <-sp.ctx.Done():
-			log.Debug("Context finished before send could occur")
-			return
-		}
-	}
-}
-
-func (sp *SignedPipe) handleIn(theirPubkey ci.PubKey) {
-	for {
-		var data []byte
-		var ok bool
-		select {
-		case <-sp.ctx.Done():
-			return
-		case data, ok = <-sp.insecure.In:
-			if !ok {
-				log.Debug("Signed pipe closed")
-				return
-			}
-		}
-
-		sdata := new(pb.DataSig)
-		err := proto.Unmarshal(data, sdata)
-		if err != nil {
-			log.Error("Failed to unmarshal sigdata object")
-			continue
-		}
-		correct, err := theirPubkey.Verify(sdata.GetData(), sdata.GetSignature())
-		if err != nil {
-			log.Error(err)
-			continue
-		}
-		if !correct {
-			log.Error("Received data with invalid signature!")
-			continue
-		}
-
-		if sdata.GetId() != sp.removeMsgID {
-			log.Critical("Out of order message id!")
-			return
-		}
-		sp.removeMsgID++
-
-		select {
-		case <-sp.ctx.Done():
-			return
-		case sp.In <- sdata.GetData():
-		}
-	}
-}
-
-func (sp *SignedPipe) Close() error {
-	sp.cancel()
-	return nil
-}
diff --git a/crypto/spipe/spipe_test.go b/crypto/spipe/spipe_test.go
index c0f15ac85..716b73311 100644
--- a/crypto/spipe/spipe_test.go
+++ b/crypto/spipe/spipe_test.go
@@ -130,58 +130,6 @@ func runEncryptBenchmark(b *testing.B) {
 
 }
 
-func BenchmarkSignedChannel(b *testing.B) {
-	pstore := peer.NewPeerstore()
-	ctx := context.TODO()
-	bufsize := 1024 * 1024
-
-	pa := getPeer(b)
-	pb := getPeer(b)
-	duplexa := pipes.NewDuplex(16)
-	duplexb := pipes.NewDuplex(16)
-
-	go bindDuplexNoCopy(duplexa, duplexb)
-
-	var spb *SignedPipe
-	done := make(chan struct{})
-	go func() {
-		var err error
-		spb, err = NewSignedPipe(ctx, bufsize, pb, pstore, duplexb)
-		if err != nil {
-			b.Fatal(err)
-		}
-		done <- struct{}{}
-	}()
-
-	spa, err := NewSignedPipe(ctx, bufsize, pa, pstore, duplexa)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	<-done
-
-	go func() {
-		for _ = range spa.In {
-			// Throw it all away,
-			// all of your hopes and dreams
-			// piped out to /dev/null...
-			done <- struct{}{}
-		}
-	}()
-
-	data := make([]byte, 1024*512)
-	util.NewTimeSeededRand().Read(data)
-	// Begin actual benchmarking
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		b.SetBytes(int64(len(data)))
-		spb.Out <- data
-		<-done
-	}
-
-}
-
 func BenchmarkDataTransfer(b *testing.B) {
 	duplexa := pipes.NewDuplex(16)
 	duplexb := pipes.NewDuplex(16)

From b4b26faefdd0163c19ee86d7d61ec0103a1b24b5 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Fri, 31 Oct 2014 18:48:48 +0000
Subject: [PATCH 18/20] make FetchGraph waitable

---
 merkledag/merkledag.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
index d9221f0da..26431dea2 100644
--- a/merkledag/merkledag.go
+++ b/merkledag/merkledag.go
@@ -2,6 +2,7 @@ package merkledag
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
@@ -242,9 +243,16 @@ func (n *dagService) Remove(nd *Node) error {
 	return n.Blocks.DeleteBlock(k)
 }
 
-func FetchGraph(ctx context.Context, root *Node, serv DAGService) {
+func FetchGraph(ctx context.Context, root *Node, serv DAGService) chan struct{} {
+	var wg sync.WaitGroup
+	done := make(chan struct{})
+
 	for _, l := range root.Links {
+		wg.Add(1)
 		go func(lnk *Link) {
+
+			// Signal child is done on way out
+			defer wg.Done()
 			select {
 			case <-ctx.Done():
 				return
@@ -255,7 +263,16 @@ func FetchGraph(ctx context.Context, root *Node, serv DAGService) {
 				log.Error(err)
 				return
 			}
-			FetchGraph(ctx, nd, serv)
+
+			// Wait for children to finish
+			<-FetchGraph(ctx, nd, serv)
 		}(l)
 	}
+
+	go func() {
+		wg.Wait()
+		done <- struct{}{}
+	}()
+
+	return done
 }

From 56c45d42ff674f0d0061a1e9363b23f507430d6b Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sat, 1 Nov 2014 17:53:11 -0700
Subject: [PATCH 19/20] Godeps GoVersion off devel

---
 Godeps/Godeps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 4ac3d143d..e68f0b42e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/jbenet/go-ipfs",
-	"GoVersion": "devel +9340f9f6dfc9 Fri Oct 31 00:48:57 2014 -0300",
+	"GoVersion": "go1.3",
 	"Packages": [
 		"./..."
 	],

From 634d89f1b0e06afc17b6f42b5224972866146c16 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sat, 1 Nov 2014 17:55:59 -0700
Subject: [PATCH 20/20] Remove Travis testing of Go 1.2

Go 1.2 is no longer supported (we use sync.Pool).
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f5bf5732a..ecf595da0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 
 go:
-  - 1.2
   - 1.3
   - release
   - tip