mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-05-06 20:28:40 +00:00
Do some rename
This commit is contained in:
parent
22463f3256
commit
2dc6a344a5
5 changed files with 48 additions and 61 deletions
|
@ -412,8 +412,7 @@ type TLSConfig struct {
|
|||
MasterKeyLog string `json:"masterKeyLog"`
|
||||
ServerNameToVerify string `json:"serverNameToVerify"`
|
||||
VerifyPeerCertInNames []string `json:"verifyPeerCertInNames"`
|
||||
ECHConfig string `json:"echConfig"`
|
||||
ECHDNSServer string `json:"echDnsServer"`
|
||||
ECHConfigList string `json:"echConfigList"`
|
||||
EchKeySets string `json:"echKeySets"`
|
||||
}
|
||||
|
||||
|
@ -486,13 +485,8 @@ func (c *TLSConfig) Build() (proto.Message, error) {
|
|||
}
|
||||
config.VerifyPeerCertInNames = c.VerifyPeerCertInNames
|
||||
|
||||
if c.ECHConfig != "" {
|
||||
ECHConfig, err := base64.StdEncoding.DecodeString(c.ECHConfig)
|
||||
if err != nil {
|
||||
return nil, errors.New("invalid ECH Config", c.ECHConfig)
|
||||
}
|
||||
config.EchConfig = ECHConfig
|
||||
}
|
||||
config.EchConfigList = c.ECHConfigList
|
||||
|
||||
if c.EchKeySets != "" {
|
||||
EchPrivateKey, err := base64.StdEncoding.DecodeString(c.EchKeySets)
|
||||
if err != nil {
|
||||
|
@ -500,7 +494,6 @@ func (c *TLSConfig) Build() (proto.Message, error) {
|
|||
}
|
||||
config.EchKeySets = EchPrivateKey
|
||||
}
|
||||
config.Ech_DNSserver = c.ECHDNSServer
|
||||
|
||||
return config, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue