Merge pull request #9 from libp2p/feat/update-deps

gx publish 1.1.0

.gx/lastpubver

-1.0.12: QmbnPJidHfeekkdLkoboBooA56KB92cT8csDmJwCc2bQJ1
+1.1.0: QmfDU2uJQkxXP6nDTfSPSx4rQt4S4fU4XMRoQA5DzYGWfe

al.go

@@ -13,7 +13,7 @@ import (
 	"crypto/sha512"
 	"hash"
 
-	ci "github.com/ipfs/go-libp2p-crypto"
+	ci "github.com/libp2p/go-libp2p-crypto"
 	bfish "golang.org/x/crypto/blowfish"
 )
 

interface.go

@@ -2,13 +2,12 @@
 package secio
 
 import (
+	"context"
 	"io"
 
-	ci "github.com/ipfs/go-libp2p-crypto"
-
-	peer "github.com/ipfs/go-libp2p-peer"
 	msgio "github.com/jbenet/go-msgio"
-	context "golang.org/x/net/context"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 // SessionGenerator constructs secure communication sessions for a peer.

package.json

 {
   "author": "whyrusleeping",
   "bugs": {
-    "url": "https://github.com/ipfs/go-libp2p-secio"
+    "url": "https://github.com/libp2p/go-libp2p-secio"
   },
   "gx": {
-    "dvcsimport": "github.com/ipfs/go-libp2p-secio"
+    "dvcsimport": "github.com/libp2p/go-libp2p-secio"
   },
   "gxDependencies": [
-    {
-      "author": "whyrusleeping",
-      "hash": "QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt",
-      "name": "go-net",
-      "version": "0.0.0"
-    },
     {
       "author": "whyrusleeping",
       "hash": "QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL",
@@ -21,9 +15,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1",
+      "hash": "Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr",
       "name": "go-ipfs-util",
-      "version": "1.0.0"
+      "version": "1.2.0"
     },
     {
       "author": "whyrusleeping",
@@ -39,20 +33,22 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ",
+      "hash": "QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46",
       "name": "go-libp2p-crypto",
-      "version": "1.0.4"
+      "version": "1.3.1"
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p",
+      "hash": "QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC",
       "name": "go-libp2p-peer",
-      "version": "2.0.4"
+      "version": "2.1.0"
     }
   ],
   "gxVersion": "0.4.0",
   "language": "go",
   "license": "MIT",
   "name": "go-libp2p-secio",
-  "version": "1.0.12"
+  "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
+  "version": "1.1.0"
 }
+

protocol.go

@@ -2,6 +2,7 @@ package secio
 
 import (
 	"bytes"
+	"context"
 	"crypto/rand"
 	"errors"
 	"fmt"
@@ -10,12 +11,11 @@ import (
 	"time"
 
 	u "github.com/ipfs/go-ipfs-util"
-	ci "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pb "github.com/ipfs/go-libp2p-secio/pb"
 	logging "github.com/ipfs/go-log"
 	msgio "github.com/jbenet/go-msgio"
-	context "golang.org/x/net/context"
+	ci "github.com/libp2p/go-libp2p-crypto"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pb "github.com/libp2p/go-libp2p-secio/pb"
 )
 
 var log = logging.Logger("secio")

rw.go

 package secio
 
 import (
+	"context"
 	"crypto/cipher"
+	"crypto/hmac"
 	"encoding/binary"
 	"errors"
 	"fmt"
 	"io"
 	"sync"
 
-	"crypto/hmac"
-
 	proto "github.com/gogo/protobuf/proto"
 	msgio "github.com/jbenet/go-msgio"
 	mpool "github.com/jbenet/go-msgio/mpool"
-	context "golang.org/x/net/context"
 )
 
 // ErrMACInvalid signals that a MAC verification failed