From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 4 Sep 2021 20:01:51 +0000 (+0300)
Subject: Returned parsed certificates also in CertPoolFromFile
X-Git-Tag: v0.1.0~10
X-Git-Url: http://www.git.cypherpunks.ru/?p=ucspi.git;a=commitdiff_plain;h=57c1e9924fef3fe07dfa9b3d5b996b50d0c08f17

Returned parsed certificates also in CertPoolFromFile
---

diff --git a/cmd/tlsc/main.go b/cmd/tlsc/main.go
index 80813b4..7f1651a 100644
--- a/cmd/tlsc/main.go
+++ b/cmd/tlsc/main.go
@@ -82,7 +82,7 @@ func main() {
 	}
 	if *casPath != "" {
 		var err error
-		cfg.RootCAs, err = ucspi.CertPoolFromFile(*casPath)
+		_, cfg.RootCAs, err = ucspi.CertPoolFromFile(*casPath)
 		if err != nil {
 			log.Fatalln(err)
 		}
diff --git a/cmd/tlss/main.go b/cmd/tlss/main.go
index c0f7a09..7740ecd 100644
--- a/cmd/tlss/main.go
+++ b/cmd/tlss/main.go
@@ -53,7 +53,7 @@ func main() {
 	}
 	var cas *x509.CertPool
 	if *casPath != "" {
-		cas, err = ucspi.CertPoolFromFile(*casPath)
+		_, cas, err = ucspi.CertPoolFromFile(*casPath)
 		if err != nil {
 			log.Fatalln(err)
 		}
diff --git a/x509.go b/x509.go
index 8a5dd4e..0743ba0 100644
--- a/x509.go
+++ b/x509.go
@@ -67,7 +67,7 @@ func PrivateKeyFromFile(p string) (prv interface{}, err error) {
 	return
 }
 
-func CertPoolFromFile(p string) (pool *x509.CertPool, err error) {
+func CertPoolFromFile(p string) (certs []*x509.Certificate, pool *x509.CertPool, err error) {
 	var data []byte
 	data, err = ioutil.ReadFile(p)
 	if err != nil {
@@ -90,6 +90,7 @@ func CertPoolFromFile(p string) (pool *x509.CertPool, err error) {
 		if err != nil {
 			return
 		}
+		certs = append(certs, ca)
 		pool.AddCert(ca)
 	}
 	return