Skip to content
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ require (
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sigstore/rekor v1.5.3 // indirect
github.com/sigstore/sigstore v1.10.8 // indirect
github.com/sigstore/sigstore v1.10.8
github.com/sirupsen/logrus v1.9.4
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/spdx/tools-golang v0.6.0-rc4 // indirect
Expand Down
5 changes: 3 additions & 2 deletions src/pkg/packager/layout/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func (p *PackageLayout) VerifyPackageSignature(ctx context.Context, opts signing
opts.Key = opts.KeyRef //nolint:staticcheck // intentional read of deprecated alias for migration sync
}

hasKey := opts.Key != ""
hasKey := opts.Key != "" || opts.SecurityKey.Use

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exposed by the CLI but potentially supported by the SDK given the broader VerfiyBlobOptions.

hasKeylessIdentity := opts.CertVerify.CertIdentity != "" || opts.CertVerify.CertIdentityRegexp != ""
hasCert := opts.CertVerify.Cert != ""
hasVerificationMaterial := hasKey || hasKeylessIdentity || hasCert
Expand Down Expand Up @@ -413,7 +413,8 @@ func (p *PackageLayout) VerifyPackageSignature(ctx context.Context, opts signing
opts.CommonVerifyOptions.UseSignedTimestamps = true
}
ZarfYAMLPath := filepath.Join(p.dirPath, ZarfYAML)
return signing.CosignVerifyBlobWithOptions(ctx, ZarfYAMLPath, opts)
_, err := signing.SigstoreVerifyBundleWithOptions(ctx, ZarfYAMLPath, opts)
return err
}
if !errors.Is(bundleErr, os.ErrNotExist) {
return fmt.Errorf("error checking bundle signature: %w", bundleErr)
Expand Down
Loading