diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md index bee7566a9..672ad20bc 100644 --- a/docs/release-notes/release-notes-0.16.0.md +++ b/docs/release-notes/release-notes-0.16.0.md @@ -261,6 +261,9 @@ in the lnwire package](https://github.com/lightningnetwork/lnd/pull/7303) * [Remove unused args](https://github.com/lightningnetwork/lnd/pull/7387) from `cert.GenCertPair`. +* [Fixup GenCertPair use](https://github.com/lightningnetwork/lnd/pull/7388) + after updating to cert/v1.2.1. + ## `lncli` * [Add an `insecure` flag to skip tls auth as well as a `metadata` string slice @@ -443,6 +446,7 @@ refactor the itest for code health and maintenance. * Alejandro Pedraza * Alyssa Hertig +* Andras Banki-Horvath * andreihod * Antoni Spaanderman * Carla Kirk-Cohen diff --git a/go.mod b/go.mod index 778ce9059..b2d272474 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/lightninglabs/neutrino v0.14.2 github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 - github.com/lightningnetwork/lnd/cert v1.2.0 + github.com/lightningnetwork/lnd/cert v1.2.1 github.com/lightningnetwork/lnd/clock v1.1.0 github.com/lightningnetwork/lnd/healthcheck v1.2.2 github.com/lightningnetwork/lnd/kvdb v1.4.1 diff --git a/go.sum b/go.sum index 4d1654116..02783c367 100644 --- a/go.sum +++ b/go.sum @@ -406,8 +406,8 @@ github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display h1:RZJ8H4ueU/aQ github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE= github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 h1:Wm0g70gkcAu2pGpNZwfWPSVOY21j8IyYsNewwK4OkT4= github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo= -github.com/lightningnetwork/lnd/cert v1.2.0 h1:IWfjHNMI5JgQZU5fdvDptF3DkVI38f4jO/s3tYgWFbE= -github.com/lightningnetwork/lnd/cert v1.2.0/go.mod h1:04JhIEodoR6usBN5+XBRtLEEmEHsclLi0tEyxZQNP+w= +github.com/lightningnetwork/lnd/cert v1.2.1 h1:CTrTcU0L66J73oqdRLVfNylZyp1Fh97ZezX6IuzkrqE= +github.com/lightningnetwork/lnd/cert v1.2.1/go.mod h1:04JhIEodoR6usBN5+XBRtLEEmEHsclLi0tEyxZQNP+w= github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg= github.com/lightningnetwork/lnd/clock v1.1.0 h1:/yfVAwtPmdx45aQBoXQImeY7sOIEr7IXlImRMBOZ7GQ= github.com/lightningnetwork/lnd/clock v1.1.0/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg= diff --git a/tls_manager.go b/tls_manager.go index 2bd174ca1..249c76218 100644 --- a/tls_manager.go +++ b/tls_manager.go @@ -219,8 +219,7 @@ func (t *TLSManager) generateCertPair(keyRing keychain.SecretKeyRing) error { rpcsLog.Infof("Generating TLS certificates...") certBytes, keyBytes, err := cert.GenCertPair( - "lnd autogenerated cert", t.cfg.TLSCertPath, - t.cfg.TLSKeyPath, t.cfg.TLSExtraIPs, + "lnd autogenerated cert", t.cfg.TLSExtraIPs, t.cfg.TLSExtraDomains, t.cfg.TLSDisableAutofill, t.cfg.TLSCertDuration, ) @@ -368,9 +367,9 @@ func (t *TLSManager) maintainCert( rpcsLog.Infof("Renewing TLS certificates...") certBytes, keyBytes, err := cert.GenCertPair( - "lnd autogenerated cert", t.cfg.TLSCertPath, t.cfg.TLSKeyPath, - t.cfg.TLSExtraIPs, t.cfg.TLSExtraDomains, - t.cfg.TLSDisableAutofill, t.cfg.TLSCertDuration, + "lnd autogenerated cert", t.cfg.TLSExtraIPs, + t.cfg.TLSExtraDomains, t.cfg.TLSDisableAutofill, + t.cfg.TLSCertDuration, ) if err != nil { return nil, err @@ -509,9 +508,8 @@ func (t *TLSManager) loadEphemeralCertificate() ([]byte, error) { // Pass in a blank string for the key path so the // function doesn't write them to disk. certBytes, keyBytes, err := cert.GenCertPair( - "lnd ephemeral autogenerated cert", tmpCertPath, - "", t.cfg.TLSExtraIPs, t.cfg.TLSExtraDomains, - t.cfg.TLSDisableAutofill, tmpValidity, + "lnd ephemeral autogenerated cert", t.cfg.TLSExtraIPs, + t.cfg.TLSExtraDomains, t.cfg.TLSDisableAutofill, tmpValidity, ) if err != nil { return nil, err