mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-07-27 12:24:14 +00:00
REALITY config: Allow mldsa65
fields to be empty (#4924)
This commit is contained in:
parent
d141d01d0c
commit
955a569181
1 changed files with 11 additions and 7 deletions
|
@ -613,11 +613,13 @@ func (c *REALITYConfig) Build() (proto.Message, error) {
|
||||||
config.ServerNames = c.ServerNames
|
config.ServerNames = c.ServerNames
|
||||||
config.MaxTimeDiff = c.MaxTimeDiff
|
config.MaxTimeDiff = c.MaxTimeDiff
|
||||||
|
|
||||||
if mldsa65Seed, err := base64.RawURLEncoding.DecodeString(c.Mldsa65Seed); err != nil || len(mldsa65Seed) != 32 {
|
if c.Mldsa65Seed != "" {
|
||||||
return nil, errors.New(`invalid "mldsa65Seed": `, c.Mldsa65Seed)
|
if mldsa65Seed, err := base64.RawURLEncoding.DecodeString(c.Mldsa65Seed); err != nil || len(mldsa65Seed) != 32 {
|
||||||
} else {
|
return nil, errors.New(`invalid "mldsa65Seed": `, c.Mldsa65Seed)
|
||||||
_, key := mldsa65.NewKeyFromSeed((*[32]byte)(mldsa65Seed))
|
} else {
|
||||||
config.Mldsa65Key = key.Bytes()
|
_, key := mldsa65.NewKeyFromSeed((*[32]byte)(mldsa65Seed))
|
||||||
|
config.Mldsa65Key = key.Bytes()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
config.LimitFallbackUpload = new(reality.LimitFallback)
|
config.LimitFallbackUpload = new(reality.LimitFallback)
|
||||||
|
@ -655,8 +657,10 @@ func (c *REALITYConfig) Build() (proto.Message, error) {
|
||||||
if _, err = hex.Decode(config.ShortId, []byte(c.ShortId)); err != nil {
|
if _, err = hex.Decode(config.ShortId, []byte(c.ShortId)); err != nil {
|
||||||
return nil, errors.New(`invalid "shortId": `, c.ShortId)
|
return nil, errors.New(`invalid "shortId": `, c.ShortId)
|
||||||
}
|
}
|
||||||
if config.Mldsa65Verify, err = base64.RawURLEncoding.DecodeString(c.Mldsa65Verify); err != nil || len(config.Mldsa65Verify) != 1952 {
|
if c.Mldsa65Verify != "" {
|
||||||
return nil, errors.New(`invalid "mldsa65Verify": `, c.Mldsa65Verify)
|
if config.Mldsa65Verify, err = base64.RawURLEncoding.DecodeString(c.Mldsa65Verify); err != nil || len(config.Mldsa65Verify) != 1952 {
|
||||||
|
return nil, errors.New(`invalid "mldsa65Verify": `, c.Mldsa65Verify)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if c.SpiderX == "" {
|
if c.SpiderX == "" {
|
||||||
c.SpiderX = "/"
|
c.SpiderX = "/"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue