Skip to content

sbom: drop nested wolfcrypt CPE - #894

Open
sameehj wants to merge 3 commits into
wolfSSL:masterfrom
sameehj:fix/sbom-drop-nested-wolfcrypt-cpe
Open

sameehj wants to merge 3 commits into
wolfSSL:masterfrom
sameehj:fix/sbom-drop-nested-wolfcrypt-cpe

Conversation

@sameehj

@sameehj sameehj commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Summary

Test plan

  • make sbom TARGET=sim — nested wolfcrypt has PURL, no cpe
  • wolfssl component still has cpe:2.3:a:wolfssl:wolfssl:<version>
  • wolfGlass drift check against 224a4f3

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

The identifier behavior lacks a regression assertion and leaves contradictory matching guidance in vendored comments.

Get a fresh assessment by requesting another Copilot review.

Pull request overview

Updates SBOM generation to treat nested wolfcrypt as provenance-only while retaining wolfSSL CPE matching.

Changes:

  • Removes wolfcrypt CPEs from CycloneDX and SPDX output.
  • Requires wolfcrypt PURLs in validation and updates documentation.
  • Re-vendors wolfGlass at 3b708da and bumps generator version to 1.9.
File summaries
File Description
tools/sbom/validate_sbom.py Accepts wolfcrypt with PURL but no CPE.
tools/sbom/gen-sbom Omits nested wolfcrypt CPEs.
tools/sbom/build/sbom.mk Updates Make integration documentation.
tools/sbom/build/sbom.cmake Updates CMake integration documentation.
tools/sbom/.wolfglass-rev Updates wolfGlass revision pin.
Makefile Documents wolfSSL CPE matching.
docs/SBOM.md Documents identifier semantics.
Review details

Suppressed comments (1)

tools/sbom/gen-sbom:1086

  • The new conditional is the behavior this PR changes, but the SBOM workflow only performs structural validation and never asserts the identifier set. A future vendor sync could re-add the nested wolfcrypt CPE (or drop the parent wolfssl CPE) while the current checks remain green; add a focused generated-SBOM assertion for both documents.
        # wolfcrypt has no CPE: matching rides on the parent wolfssl CPE.
        if meta.get('cpe'):
            comp['cpe'] = meta['cpe'](version)
  • Files reviewed: 7/7 changed files
  • Comments generated: 2
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread Makefile
Comment thread tools/sbom/gen-sbom
sameehj and others added 2 commits September 22, 2026 15:53
Re-vendor wolfGlass at 3b708da. wolfcrypt stays a nested component
(name, version, PURL). Matching uses the wolfssl CPE only.

Co-authored-by: Cursor <cursoragent@cursor.com>
Makefile no longer says a scan matches wolfssl:wolfcrypt. Re-vendor
wolfGlass at 48796ea so the generator contract exempts nested wolfcrypt.

Co-authored-by: Cursor <cursoragent@cursor.com>
@sameehj
sameehj force-pushed the fix/sbom-drop-nested-wolfcrypt-cpe branch from 7b8c779 to feef1fa Compare September 22, 2026 13:08

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Fenrir Automated Review — PR #894

No scan targets match the changed files in this PR. Review skipped.

@sameehj
sameehj force-pushed the fix/sbom-drop-nested-wolfcrypt-cpe branch from feef1fa to 743c11e Compare September 22, 2026 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants