From 0b9ce0c5e42e7818febddb7bd8c6b0cb7c07b012 Mon Sep 17 00:00:00 2001 From: Rasmus Dahlberg Date: Thu, 5 Nov 2020 12:31:34 +0100 Subject: moved publlic x509 helpers into a separate package --- client/client.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'client/client.go') diff --git a/client/client.go b/client/client.go index 54f75de..a95fc77 100644 --- a/client/client.go +++ b/client/client.go @@ -17,6 +17,7 @@ import ( "github.com/google/trillian/merkle/rfc6962" "github.com/system-transparency/stfe" "github.com/system-transparency/stfe/server/descriptor" + "github.com/system-transparency/stfe/x509util" "golang.org/x/net/context/ctxhttp" ) @@ -44,12 +45,12 @@ func NewClient(log *descriptor.Log, client *http.Client, useHttp bool, chain []* // client, namely, a pem-encoded certificate chain, a pem-encoded ed25519 // private key, and a json-encoded list of log operators (see descriptor). func NewClientFromPath(logId, chainPath, keyPath, operatorsPath string, cli *http.Client, useHttp bool) (*Client, error) { - c, err := stfe.LoadChain(chainPath) + c, err := x509util.LoadChain(chainPath) if err != nil { return nil, err } - k, err := stfe.LoadEd25519SigningKey(keyPath) + k, err := x509util.LoadEd25519SigningKey(keyPath) if err != nil && keyPath != "" { return nil, err } -- cgit v1.2.3