fix TLS enforcement

PirateNetwork · Jun 9, 2022 · f8f97c9 · f8f97c9
1 parent 0c1fa13
commit f8f97c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1642,6 +1642,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             return InitError(strprintf(_("Cannot find trusted certificates directory: '%s'"), pathTLSTrustredDir.string()));
     }
 
+    if (!usingGUI) {
+        SoftSetArg("-tlsenforcement", std::string("0"));
+    }
+
 #if ENABLE_ZMQ
     pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);
 

diff --git a/src/net.cpp b/src/net.cpp
@@ -464,7 +464,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
                 NODE_ADDR nodeAddr(addrConnect.ToStringIP());
 
                 bool bTlsEnforcement = (GetBoolArg("-tlsenforcement", true) || GetArg("-tlsenforcement", "") == "1");
-                bool bUseTLS = bTlsEnforcement && (find(vNonTLSNodesOutbound.begin(),
+                bool bUseTLS = (find(vNonTLSNodesOutbound.begin(),
                                      vNonTLSNodesOutbound.end(),
                                      nodeAddr) == vNonTLSNodesOutbound.end());
                 unsigned long err_code = 0;
@@ -1316,7 +1316,7 @@ if (CNode::GetTlsFallbackNonTls())
     NODE_ADDR nodeAddr(addr.ToStringIP());
 
     bool bTlsEnforcement = (GetBoolArg("-tlsenforcement", true) || GetArg("-tlsenforcement", "") == "1");
-    bool bUseTLS = bTlsEnforcement && (find(vNonTLSNodesInbound.begin(),
+    bool bUseTLS = (find(vNonTLSNodesInbound.begin(),
                          vNonTLSNodesInbound.end(),
                          nodeAddr) == vNonTLSNodesInbound.end());
     unsigned long err_code = 0;