Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
0b50080b
Commit
0b50080b
authored
Nov 21, 2015
by
Lars Gierth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seccat: fix secio context
License: MIT Signed-off-by:
Lars Gierth
<
larsg@systemli.org
>
parent
93c23099
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
cmd/seccat/seccat.go
cmd/seccat/seccat.go
+2
-1
No files found.
cmd/seccat/seccat.go
View file @
0b50080b
...
@@ -18,6 +18,7 @@ import (
...
@@ -18,6 +18,7 @@ import (
"os/signal"
"os/signal"
"syscall"
"syscall"
context
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ci
"github.com/ipfs/go-ipfs/p2p/crypto"
ci
"github.com/ipfs/go-ipfs/p2p/crypto"
secio
"github.com/ipfs/go-ipfs/p2p/crypto/secio"
secio
"github.com/ipfs/go-ipfs/p2p/crypto/secio"
peer
"github.com/ipfs/go-ipfs/p2p/peer"
peer
"github.com/ipfs/go-ipfs/p2p/peer"
...
@@ -155,7 +156,7 @@ func connect(args args) error {
...
@@ -155,7 +156,7 @@ func connect(args args) error {
// OK, let's setup the channel.
// OK, let's setup the channel.
sk
:=
ps
.
PrivKey
(
p
)
sk
:=
ps
.
PrivKey
(
p
)
sg
:=
secio
.
SessionGenerator
{
LocalID
:
p
,
PrivateKey
:
sk
}
sg
:=
secio
.
SessionGenerator
{
LocalID
:
p
,
PrivateKey
:
sk
}
sess
,
err
:=
sg
.
NewSession
(
nil
,
rwc
)
sess
,
err
:=
sg
.
NewSession
(
context
.
TODO
()
,
rwc
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment