mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-07-27 12:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

TLS client & server: Support Encrypted Client Hello (ECH) (#3813)

Browse source 
b9a72a4a26

---------

Co-authored-by: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
This commit is contained in:
风扇滑翔翼 2025-07-26 16:47:27 +08:00 • committed by GitHub
parent 3fe02a658a
commit fb7a9d8d61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 520 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
infra/conf/transport_internet.go
View file

@ -412,6 +412,8 @@ type TLSConfig struct {
MasterKeyLog string `json:"masterKeyLog"`
ServerNameToVerify string `json:"serverNameToVerify"`
VerifyPeerCertInNames []string `json:"verifyPeerCertInNames"`
ECHConfigList string `json:"echConfigList"`
ECHServerKeys string `json:"echServerKeys"`
}
// Build implements Buildable.
@ -483,6 +485,16 @@ func (c *TLSConfig) Build() (proto.Message, error) {
}
config.VerifyPeerCertInNames = c.VerifyPeerCertInNames
config.EchConfigList = c.ECHConfigList
if c.ECHServerKeys != "" {
EchPrivateKey, err := base64.StdEncoding.DecodeString(c.ECHServerKeys)
if err != nil {
return nil, errors.New("invalid ECH Config", c.ECHServerKeys)
}
config.EchServerKeys = EchPrivateKey
}
return config, nil
}