Skip to content

Commit

Permalink
Merge pull request #1987 from ipfs/seccat-context
Browse files Browse the repository at this point in the history
seccat: fix secio context
  • Loading branch information
whyrusleeping committed Nov 23, 2015
2 parents 93c2309 + 0b50080 commit c9d118c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cmd/seccat/seccat.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"os/signal"
"syscall"

context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ci "github.com/ipfs/go-ipfs/p2p/crypto"
secio "github.com/ipfs/go-ipfs/p2p/crypto/secio"
peer "github.com/ipfs/go-ipfs/p2p/peer"
Expand Down Expand Up @@ -155,7 +156,7 @@ func connect(args args) error {
// OK, let's setup the channel.
sk := ps.PrivKey(p)
sg := secio.SessionGenerator{LocalID: p, PrivateKey: sk}
sess, err := sg.NewSession(nil, rwc)
sess, err := sg.NewSession(context.TODO(), rwc)
if err != nil {
return err
}
Expand Down

0 comments on commit c9d118c

Please sign in to comment.