Skip to content

GitLab

Unverified Commit 1a0474bb authored by Adin Schmahmann's avatar Adin Schmahmann Committed by GitHub
Browse files
Options

Merge pull request #7600 from ipfs/feat/disable-secio-default 

Disable secio by default
parents 8e730218 08913c70
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
core/node/libp2p/sec.go
View file @ 1a0474bb
...@@ -26,7 +26,7 @@ func Security(enabled bool, tptConfig config.Transports) interface{} { ...@@ -26,7 +26,7 @@ func Security(enabled bool, tptConfig config.Transports) interface{} {
opt: libp2p.Security(tls.ID, tls.New), opt: libp2p.Security(tls.ID, tls.New),
}, { }, {
priority: tptConfig.Security.SECIO, priority: tptConfig.Security.SECIO,
defaultPriority: 200, defaultPriority: config.Disabled,
opt: libp2p.Security(secio.ID, secio.New), opt: libp2p.Security(secio.ID, secio.New),
}, { }, {
priority: tptConfig.Security.Noise, priority: tptConfig.Security.Noise,
......
test/sharness/t0060-daemon.sh
View file @ 1a0474bb
...@@ -128,7 +128,7 @@ test_expect_success "ipfs help output looks good" ' ...@@ -128,7 +128,7 @@ test_expect_success "ipfs help output looks good" '
# check transport is encrypted # check transport is encrypted
test_expect_success SOCAT "transport should be encrypted ( needs socat )" ' test_expect_success SOCAT "transport should be encrypted ( needs socat )" '
socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-ls && socat - tcp:localhost:$SWARM_PORT,connect-timeout=1 > swarmnc < ../t0060-data/mss-ls &&
grep -q "/secio" swarmnc && grep -q "/tls" swarmnc &&
test_must_fail grep -q "/plaintext/1.0.0" swarmnc || test_must_fail grep -q "/plaintext/1.0.0" swarmnc ||
test_fsh cat swarmnc test_fsh cat swarmnc
' '
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment