Fix windows for rootCA

nabbar · Apr 17, 2020 · 7c054c4 · 7c054c4
1 parent ac0339c
commit 7c054c4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/njs-certif/tlsTools.go b/njs-certif/tlsTools.go
@@ -29,6 +29,7 @@ import (
 	"crypto/x509"
 	"io/ioutil"
 	"os"
+	"runtime"
 	"strings"
 
 	logger "github.com/nabbar/golib/njs-logger"
@@ -58,15 +59,17 @@ func init() {
 }
 
 func InitRootCA() {
-	if c, e := x509.SystemCertPool(); e != nil {
+	if runtime.GOOS == "windows" {
+		rootCA = x509.NewCertPool()
+	} else if c, e := x509.SystemCertPool(); e != nil {
 		rootCA = c
 	} else {
 		rootCA = x509.NewCertPool()
 	}
 }
 
 func AddRootCAContents(rootContent string) bool {
-	if rootContent != "" {
+	if rootContent != "" && rootCA != nil {
 		return rootCA.AppendCertsFromPEM([]byte(rootContent))
 	}