lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

removed tool to prepare for v5

Browse Source
This commit is contained in:
Shelikhoo 2021-04-17 10:50:53 +01:00
parent 0c6a2e06b9
commit 3138b3e815
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/control/certchainhash.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"io/ioutil"
"github.com/v2fly/v2ray-core/v4/common"
v2tls "github.com/v2fly/v2ray-core/v4/transport/internet/tls"
)
@ -42,5 +41,6 @@ func (c CertificateChainHashCommand) Execute(args []string) error {
}
func init() {
common.Must(RegisterCommand(&CertificateChainHashCommand{}))
// Do not release tool before v5's refactor
// common.Must(RegisterCommand(&CertificateChainHashCommand{}))
}

22
infra/control/tlsping.go
View File

@ -73,11 +73,12 @@ func (c *TLSPingCommand) Execute(args []string) error {
return newError("dial tcp").Base(err)
}
tlsConn := tls.Client(tcpConn, &tls.Config{
InsecureSkipVerify: true,
NextProtos: []string{"http/1.1"},
MaxVersion: tls.VersionTLS12,
MinVersion: tls.VersionTLS12,
VerifyPeerCertificate: showCert(),
InsecureSkipVerify: true,
NextProtos: []string{"http/1.1"},
MaxVersion: tls.VersionTLS12,
MinVersion: tls.VersionTLS12,
// Do not release tool before v5's refactor
// VerifyPeerCertificate: showCert(),
})
err = tlsConn.Handshake()
if err != nil {
@ -97,11 +98,12 @@ func (c *TLSPingCommand) Execute(args []string) error {
return newError("dial tcp").Base(err)
}
tlsConn := tls.Client(tcpConn, &tls.Config{
ServerName: domain,
NextProtos: []string{"http/1.1"},
MaxVersion: tls.VersionTLS12,
MinVersion: tls.VersionTLS12,
VerifyPeerCertificate: showCert(),
ServerName: domain,
NextProtos: []string{"http/1.1"},
MaxVersion: tls.VersionTLS12,
MinVersion: tls.VersionTLS12,
// Do not release tool before v5's refactor
// VerifyPeerCertificate: showCert(),
})
err = tlsConn.Handshake()
if err != nil {