SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-03 20:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add merge command

Browse source
This commit is contained in:
世界 2023-09-19 19:59:07 +08:00
parent a9743b77f6
commit e7b7ae811f
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
10 changed files with 198 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/tls/std_client.go
View file

@ -7,6 +7,7 @@ import (
"net"
"net/netip"
"os"
"strings"
"github.com/sagernet/sing-box/option"
E "github.com/sagernet/sing/common/exceptions"
@ -111,8 +112,8 @@ func NewSTDClient(ctx context.Context, serverAddress string, options option.Outb
}
}
var certificate []byte
if options.Certificate != "" {
certificate = []byte(options.Certificate)
if len(options.Certificate) > 0 {
certificate = []byte(strings.Join(options.Certificate, "\n"))
} else if options.CertificatePath != "" {
content, err := os.ReadFile(options.CertificatePath)
if err != nil {