From 54b57b53b490e8f116e668374465e881481f43d1 Mon Sep 17 00:00:00 2001 From: Dan Fuhry Date: Fri, 14 Nov 2025 13:25:35 -0500 Subject: [PATCH] [mtls] merge the init functions in provider_macos_keychain --- mtls/provider_keychain_macos.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mtls/provider_keychain_macos.go b/mtls/provider_keychain_macos.go index bf10632..0d174e1 100644 --- a/mtls/provider_keychain_macos.go +++ b/mtls/provider_keychain_macos.go @@ -66,12 +66,6 @@ func (kso *kcSignerOpts) HashFunc() crypto.Hash { var kcLogger log.Logger -func init() { - kcLogger = log.WithPrefix("mtls.macOSKeychain") - - registerIdentityDriver("macos_keychain", NewCertificateFromMacKeychain) -} - func NewCertificateFromMacKeychain(principal string) (CertificateProvider, error) { root, err := getMtlsRootFromMacKeychain() if err != nil { @@ -452,6 +446,10 @@ func (kcr *macosKeychainRoots) IntermediateCertificates() ([]*x509.Certificate, } func init() { + kcLogger = log.WithPrefix("mtls.macOSKeychain") + + registerIdentityDriver("macos_keychain", NewCertificateFromMacKeychain) + registerRootDriver("macos_keychain", func() (rootsPrimitive, error) { return &macosKeychainRoots{}, nil }) -- 2.50.1