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

Disable secio by default
ipfs · Aug 17, 2020 · 1a0474b · 1a0474b
2 parents 8e73021 + 08913c7
commit 1a0474b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/node/libp2p/sec.go b/core/node/libp2p/sec.go
@@ -26,7 +26,7 @@ func Security(enabled bool, tptConfig config.Transports) interface{} {
 			opt:             libp2p.Security(tls.ID, tls.New),
 		}, {
 			priority:        tptConfig.Security.SECIO,
-			defaultPriority: 200,
+			defaultPriority: config.Disabled,
 			opt:             libp2p.Security(secio.ID, secio.New),
 		}, {
 			priority:        tptConfig.Security.Noise,

diff --git a/test/sharness/t0060-daemon.sh b/test/sharness/t0060-daemon.sh
@@ -128,7 +128,7 @@ test_expect_success "ipfs help output looks good" '
 # check transport is encrypted
 test_expect_success SOCAT "transport should be encrypted ( needs socat )" '
   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_fsh cat swarmnc
 '