purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-03 22:03:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename

Browse source
This commit is contained in:
patterniha 2025-03-24 15:42:18 +03:30
parent 17f2dbcdb7
commit 55c7874d5c
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/platform/filesystem/file.go
View file

@ -29,7 +29,7 @@ func ReadAsset(file string) ([]byte, error) {
return ReadFile(platform.GetAssetLocation(file))
}
func ReadCertificate(file string) ([]byte, error) {
func ReadCert(file string) ([]byte, error) {
if filepath.IsAbs(file) {
return ReadFile(file)
}

4
common/platform/others.go
View file

@ -44,6 +44,6 @@ func GetAssetLocation(file string) string {
}
func GetCertLocation(file string) string {
certificatePath := NewEnvFlag(CertLocation).GetValue(getExecutableDir)
return filepath.Join(certificatePath, file)
certPath := NewEnvFlag(CertLocation).GetValue(getExecutableDir)
return filepath.Join(certPath, file)
}

4
common/platform/windows.go
View file

@ -26,6 +26,6 @@ func GetAssetLocation(file string) string {
}
func GetCertLocation(file string) string {
certificatePath := NewEnvFlag(CertLocation).GetValue(getExecutableDir)
return filepath.Join(certificatePath, file)
certPath := NewEnvFlag(CertLocation).GetValue(getExecutableDir)
return filepath.Join(certPath, file)
}

2
infra/conf/transport_internet.go
View file

@ -334,7 +334,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
func readFileOrString(f string, s []string) ([]byte, error) {
if len(f) > 0 {
return filesystem.ReadCertificate(f)
return filesystem.ReadCert(f)
}
if len(s) > 0 {
return []byte(strings.Join(s, "\n")), nil

4
transport/internet/tls/config.go
View file

@ -109,12 +109,12 @@ func setupOcspTicker(entry *Certificate, callback func(isReloaded, isOcspstaplin
for {
var isReloaded bool
if entry.CertificatePath != "" && entry.KeyPath != "" {
newCert, err := filesystem.ReadCertificate(entry.CertificatePath)
newCert, err := filesystem.ReadCert(entry.CertificatePath)
if err != nil {
errors.LogErrorInner(context.Background(), err, "failed to parse certificate")
return
}
newKey, err := filesystem.ReadCertificate(entry.KeyPath)
newKey, err := filesystem.ReadCert(entry.KeyPath)
if err != nil {
errors.LogErrorInner(context.Background(), err, "failed to parse key")
return