From 527f953c2c96b5acfd1e12a47646f41f23252fb4 Mon Sep 17 00:00:00 2001 From: Caleb Jasik Date: Thu, 23 Jun 2022 16:27:34 +0100 Subject: [PATCH] Remove x509 config loading code (#685) --- cert.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cert.go b/cert.go index 694b63989..be7bb6a4e 100644 --- a/cert.go +++ b/cert.go @@ -51,11 +51,6 @@ func NewCertStateFromConfig(c *config.C) (*CertState, error) { var err error privPathOrPEM := c.GetString("pki.key", "") - if privPathOrPEM == "" { - // Support backwards compat with the old x509 - //TODO: remove after this is rolled out everywhere - NB 2018/02/23 - privPathOrPEM = c.GetString("x509.key", "") - } if privPathOrPEM == "" { return nil, errors.New("no pki.key path or PEM data provided") @@ -79,11 +74,6 @@ func NewCertStateFromConfig(c *config.C) (*CertState, error) { var rawCert []byte pubPathOrPEM := c.GetString("pki.cert", "") - if pubPathOrPEM == "" { - // Support backwards compat with the old x509 - //TODO: remove after this is rolled out everywhere - NB 2018/02/23 - pubPathOrPEM = c.GetString("x509.cert", "") - } if pubPathOrPEM == "" { return nil, errors.New("no pki.cert path or PEM data provided")