github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

disable system roots for windows

pull/1445/head v3.17.1
Darien Raymond 2018-04-13 10:01:10 +02:00
parent e4b24984c4
commit ccafce3c9b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
transport/internet/tls/config.go
View File

@ -3,7 +3,6 @@ package tls
import (
"context"
"crypto/tls"
"crypto/x509"
"time"
"v2ray.com/core/common/net"
@ -24,22 +23,6 @@ func ParseCertificate(c *cert.Certificate) *Certificate {
}
}
func (c *Config) GetCertPool() *x509.CertPool {
pool, err := x509.SystemCertPool()
if err != nil {
newError("failed to get system cert pool.").Base(err).WriteToLog()
return nil
}
if pool != nil {
for _, cert := range c.Certificate {
if cert.Usage == Certificate_AUTHORITY_VERIFY {
pool.AppendCertsFromPEM(cert.Certificate)
}
}
}
return pool
}
func (c *Config) BuildCertificates() []tls.Certificate {
certs := make([]tls.Certificate, 0, len(c.Certificate))
for _, entry := range c.Certificate {

21
transport/internet/tls/config_other.go Normal file
View File

@ -0,0 +1,21 @@
// +build !windows
package tls
import "crypto/x509"
func (c *Config) GetCertPool() *x509.CertPool {
pool, err := x509.SystemCertPool()
if err != nil {
newError("failed to get system cert pool.").Base(err).WriteToLog()
return nil
}
if pool != nil {
for _, cert := range c.Certificate {
if cert.Usage == Certificate_AUTHORITY_VERIFY {
pool.AppendCertsFromPEM(cert.Certificate)
}
}
}
return pool
}

9
transport/internet/tls/config_windows.go Normal file
View File

@ -0,0 +1,9 @@
// +build windows
package tls
import "crypto/x509"
func (c *Config) GetCertPool() *x509.CertPool {
return nil
}