Returned parsed certificates also in CertPoolFromFile

diff --git a/cmd/tlsc/main.go b/cmd/tlsc/main.go
index 80813b48527b69537c957b6818803bb16ab3af3a..7f1651a9301f5d2a4d7eca353d958098a37509ca 100644 (file)
--- 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 c0f7a09f443da23151236219e1ed39da006d3f80..7740ecd5cdf07443908de03885378f48437120e1 100644 (file)
--- 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 8a5dd4eac910799dbb545a602184a4883fb15521..0743ba0b0c1734d2aab322a9d0fa850186f4807c 100644 (file)
--- 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