From b4616ee8f181179a14ab524eddbfe34d913203d7 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Wed, 12 Jun 2024 15:54:17 -0700 Subject: [PATCH] Upgrade linkedca This commit upgrades go.step.sm/linkedca with dependencies required by smallstep/certificates#1802. It also fixes some linter warnings. --- acme/api/order.go | 1 + authority/policy/policy.go | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/acme/api/order.go b/acme/api/order.go index 6aa079fc..bbadcdce 100644 --- a/acme/api/order.go +++ b/acme/api/order.go @@ -226,6 +226,7 @@ func isIdentifierAllowed(acmePolicy policy.X509Policy, identifier acme.Identifie func newACMEPolicyEngine(eak *acme.ExternalAccountKey) (policy.X509Policy, error) { if eak == nil { + //nolint:nilnil // expected values return nil, nil } return policy.NewX509PolicyEngine(eak.Policy) diff --git a/authority/policy/policy.go b/authority/policy/policy.go index 96c7d7ea..f126dc37 100644 --- a/authority/policy/policy.go +++ b/authority/policy/policy.go @@ -21,6 +21,7 @@ type HostPolicy policy.SSHNamePolicyEngine func NewX509PolicyEngine(policyOptions X509PolicyOptionsInterface) (X509Policy, error) { // return early if no policy engine options to configure if policyOptions == nil { + //nolint:nilnil // expected values return nil, nil } @@ -50,6 +51,7 @@ func NewX509PolicyEngine(policyOptions X509PolicyOptionsInterface) (X509Policy, // ensure no policy engine is returned when no name options were provided if len(options) == 0 { + //nolint:nilnil // expected values return nil, nil } @@ -93,6 +95,7 @@ func NewSSHHostPolicyEngine(policyOptions SSHPolicyOptionsInterface) (HostPolicy func newSSHPolicyEngine(policyOptions SSHPolicyOptionsInterface, typ sshPolicyEngineType) (policy.SSHNamePolicyEngine, error) { // return early if no policy engine options to configure if policyOptions == nil { + //nolint:nilnil // expected values return nil, nil } @@ -134,6 +137,7 @@ func newSSHPolicyEngine(policyOptions SSHPolicyOptionsInterface, typ sshPolicyEn // ensure no policy engine is returned when no name options were provided if len(options) == 0 { + //nolint:nilnil // expected values return nil, nil } diff --git a/go.mod b/go.mod index cc3fd910..0b244fa6 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/urfave/cli v1.22.15 go.step.sm/cli-utils v0.9.0 go.step.sm/crypto v0.47.0 - go.step.sm/linkedca v0.20.1 + go.step.sm/linkedca v0.21.1 golang.org/x/crypto v0.24.0 golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 golang.org/x/net v0.25.0 diff --git a/go.sum b/go.sum index 0db01f7f..6447d06f 100644 --- a/go.sum +++ b/go.sum @@ -496,8 +496,8 @@ go.step.sm/cli-utils v0.9.0 h1:55jYcsQbnArNqepZyAwcato6Zy2MoZDRkWW+jF+aPfQ= go.step.sm/cli-utils v0.9.0/go.mod h1:Y/CRoWl1FVR9j+7PnAewufAwKmBOTzR6l9+7EYGAnp8= go.step.sm/crypto v0.47.0 h1:LWxiKWiN0Y/A5+dq+fTIAvFYAL8oe3PQmCurjtn6ZBU= go.step.sm/crypto v0.47.0/go.mod h1:0NMEfYrFfV5jqs8aJY5wRqIShBV8y/fyDLTseyv5xhY= -go.step.sm/linkedca v0.20.1 h1:bHDn1+UG1NgRrERkWbbCiAIvv4lD5NOFaswPDTyO5vU= -go.step.sm/linkedca v0.20.1/go.mod h1:Vaq4+Umtjh7DLFI1KuIxeo598vfBzgSYZUjgVJ7Syxw= +go.step.sm/linkedca v0.21.1 h1:2pM0qk48Rd8mre5V/Zch3AsaXUpyZAxsICKYB/gV2kc= +go.step.sm/linkedca v0.21.1/go.mod h1:dOKdF4HSn73YUEkfS5/FECngZmBtj2Il5DTKWXY4S6Y= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=