From 956a2bad524f8223de4582ac3033b65929ca50c3 Mon Sep 17 00:00:00 2001 From: adnano Date: Mon, 28 Sep 2020 00:41:00 -0400 Subject: [PATCH] Remove NewCertificateStore function --- README.md | 2 +- cert.go | 5 ----- examples/client/client.go | 2 +- gemini.go | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e593e18..969f843 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ The default client handles this for you. Other clients must specify the fields ```go // Initialize the certificate store. -client.CertificateStore = gmi.NewCertificateStore() +client.CertificateStore = gmi.CertificateStore{} // GetCertificate is called when a server requests a certificate. // The returned certificate, if not nil, will be used when resending the request. client.GetCertificate = func(hostname string, store gmi.CertificateStore) *tls.Certificate { diff --git a/cert.go b/cert.go index 90bb514..44276da 100644 --- a/cert.go +++ b/cert.go @@ -17,11 +17,6 @@ import ( // CertificateStore maps hostnames to certificates. type CertificateStore map[string]*tls.Certificate -// NewCertificateStore creates and returns a new certificate store. -func NewCertificateStore() CertificateStore { - return map[string]*tls.Certificate{} -} - // NewCertificate creates and returns a new parsed certificate. func NewCertificate(host string, duration time.Duration) (tls.Certificate, error) { crt, key, err := NewRawCertificate(host, duration) diff --git a/examples/client/client.go b/examples/client/client.go index 3e88c73..15f6dd2 100644 --- a/examples/client/client.go +++ b/examples/client/client.go @@ -47,7 +47,7 @@ func init() { return err } - client.CertificateStore = gmi.NewCertificateStore() + client.CertificateStore = gmi.CertificateStore{} client.GetCertificate = func(hostname string, store gmi.CertificateStore) *tls.Certificate { // If the certificate is in the store, return it if cert, ok := store[hostname]; ok { diff --git a/gemini.go b/gemini.go index 944bd9d..81181d6 100644 --- a/gemini.go +++ b/gemini.go @@ -76,7 +76,7 @@ func init() { var setupDefaultClientOnce sync.Once func setupDefaultClient() { - DefaultClient.CertificateStore = NewCertificateStore() + DefaultClient.CertificateStore = CertificateStore{} DefaultClient.KnownHosts.Load() }