hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 00:59:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-1982: Load custom origin CA when OriginCAPool is specified

Browse Source
This commit is contained in:
Chung-Ting Huang
2019-06-20 19:29:18 -05:00
parent 2fa09e1cc6
commit c2a3ac3991
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tunnelrpc/pogs/config.go
View File

@@ -180,7 +180,7 @@ func (up *UnixPath) Addr() string {
}
func (hc *HTTPOriginConfig) Service() (originservice.OriginService, error) {
rootCAs, err := tlsconfig.LoadCustomCertPool(hc.OriginCAPool)
rootCAs, err := tlsconfig.LoadCustomOriginCA(hc.OriginCAPool)
if err != nil {
return nil, err
}
@@ -220,7 +220,7 @@ type WebSocketOriginConfig struct {
}
func (wsc *WebSocketOriginConfig) Service() (originservice.OriginService, error) {
rootCAs, err := tlsconfig.LoadCustomCertPool(wsc.OriginCAPool)
rootCAs, err := tlsconfig.LoadCustomOriginCA(wsc.OriginCAPool)
if err != nil {
return nil, err
}