Austin/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-12-27 02:25:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix reloading of tls.certificate_path, tls.key_path and tls.ech.key_path

Browse Source
This commit is contained in:
zeetex 2024-11-18 13:24:14 +08:00 committed by 世界
parent 97c47e72c4
commit 1d81996ceb
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tls/ech_server.go
View File

@ -98,7 +98,7 @@ func (c *echServerConfig) startWatcher() error {
return err return err
} }
c.watcher = watcher c.watcher = watcher
return nil return c.watcher.Start()
} }
func (c *echServerConfig) credentialsUpdated(path string) error { func (c *echServerConfig) credentialsUpdated(path string) error {
@ -232,7 +232,7 @@ func NewECHServer(ctx context.Context, logger log.Logger, options option.Inbound
var echKey []byte var echKey []byte
if len(options.ECH.Key) > 0 { if len(options.ECH.Key) > 0 {
echKey = []byte(strings.Join(options.ECH.Key, "\n")) echKey = []byte(strings.Join(options.ECH.Key, "\n"))
} else if options.KeyPath != "" { } else if options.ECH.KeyPath != "" {
content, err := os.ReadFile(options.ECH.KeyPath) content, err := os.ReadFile(options.ECH.KeyPath)
if err != nil { if err != nil {
return nil, E.Cause(err, "read ECH key") return nil, E.Cause(err, "read ECH key")

2
common/tls/std_server.go
View File

@ -107,7 +107,7 @@ func (c *STDServerConfig) startWatcher() error {
return err return err
} }
c.watcher = watcher c.watcher = watcher
return nil return c.watcher.Start()
} }
func (c *STDServerConfig) certificateUpdated(path string) error { func (c *STDServerConfig) certificateUpdated(path string) error {