Skip to content

Adds support for post-quantum ML-DSA & ML-KEM algorithms #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 155 commits into from
Closed

Adds support for post-quantum ML-DSA & ML-KEM algorithms #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
9b8323e
creating 1.7 from 1.6. Updating doc generation and templates.
stevespringett Aug 31, 2024
cf2ad78
Merge branch 'master' into 1.7-dev
jkowalleck Sep 2, 2024
6166a17
Merge branch 'master' into 1.7-dev
jkowalleck Sep 4, 2024
7cc2dee
carry over of latest master
jkowalleck Sep 4, 2024
ae1b41c
Merge branch 'master' into 1.7-dev
jkowalleck Sep 4, 2024
efc7163
carry over of latest master
jkowalleck Sep 4, 2024
0cc2e3a
Added support for STREEBOG-256 and STREEBOG-512 hashing algorithms (#…
volkdm Sep 26, 2024
1d0a1d5
Add "HASH_ALG_" prefix to algorithm name
volkdm Sep 26, 2024
fec8c4c
Fix hashing algorithm name, because Streebog is not an abbreviation, …
volkdm Sep 26, 2024
d0bd373
Merge branch 'master' into 1.7-dev
jkowalleck Nov 7, 2024
08a441d
carry over from master: XML,JSON,PB
jkowalleck Nov 7, 2024
fb32c17
Merge branch 'master' into 1.7-dev
jkowalleck Nov 18, 2024
b113ce6
Merge branch 'master' into 1.7-dev
jkowalleck Dec 12, 2024
60fe7c5
Merge branch 'master' into 1.7-dev
jkowalleck Dec 12, 2024
bcea8a9
incorporate latest changes from master
jkowalleck Dec 12, 2024
77c2d0e
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Jan 8, 2025
5ac9746
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Jan 11, 2025
2eeeb2a
docs: docsgen prep for 1.7
jkowalleck Jan 11, 2025
3e624b1
Merge branch 'master' into 1.7-dev
jkowalleck Jan 11, 2025
2bcbb1c
Merge branch 'master' into 1.7-dev
jkowalleck Jan 11, 2025
a998cfc
Merge branch 'master' into 1.7-dev
jkowalleck Jan 19, 2025
63541da
tests: enable tests for 1.7
jkowalleck Jan 22, 2025
423729e
tests: copy tests from 1.6
jkowalleck Jan 22, 2025
4010887
tests: rename tests for 1.7
jkowalleck Jan 22, 2025
6262459
tests: migrate tests for 1.7
jkowalleck Jan 22, 2025
544db94
tests: testcases initial 1.7 (#583)
jkowalleck Jan 22, 2025
9f5b308
feat: licenses allow mix of multiple SPDX expressions AND/OR multiple…
jkowalleck Jan 20, 2025
4abbe2f
tests
jkowalleck Jan 22, 2025
1572344
docs: docsgen latest first
jkowalleck Jan 22, 2025
504a69f
docs: docsgen latest first (#584)
jkowalleck Jan 22, 2025
4315e39
Merge branch 'master' into 1.7-dev
jkowalleck Feb 3, 2025
439f407
add CDX 1.7 schema to xmlcatalog
jkowalleck Feb 3, 2025
df66f06
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 3, 2025
4162876
forward-port #581
jkowalleck Feb 3, 2025
76f2b2c
forward-port #581
jkowalleck Feb 3, 2025
20d766d
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 5, 2025
4aef005
draft: JSON - extraneous comp and version range
jkowalleck Oct 22, 2025
a6941df
docs
jkowalleck Oct 22, 2023
7ede07a
xml
jkowalleck Oct 23, 2023
84a9783
docs
jkowalleck Jan 16, 2024
7a52828
docs
jkowalleck Jan 16, 2024
d3e0ed5
Update schema/bom-1.7.schema.json
jkowalleck Feb 5, 2025
045a6de
wip
jkowalleck Feb 5, 2025
0971f02
wip
jkowalleck Feb 5, 2025
b12bd49
wip
jkowalleck Feb 6, 2025
2c00374
wip
jkowalleck Feb 6, 2025
db0b3b8
wip
jkowalleck Feb 6, 2025
d2e3053
wip
jkowalleck Feb 6, 2025
401b245
wip
jkowalleck Feb 6, 2025
65ec962
wip
jkowalleck Feb 6, 2025
959a82c
wip
jkowalleck Feb 6, 2025
e7d714f
wip
jkowalleck Feb 6, 2025
36dc8f6
Merge branch 'master' into 1.7-dev
jkowalleck Feb 6, 2025
03f20f0
Merge branch '1.7-dev' into feat/extraneous-component
jkowalleck Feb 6, 2025
3f3873e
Merge branch '1.7-dev' into feat/licenses-multi-mix-all
jkowalleck Feb 6, 2025
339dec6
Merge branch '1.7-dev' into add-streebog-hashalg
jkowalleck Feb 6, 2025
a4622ea
spec: isExtraneous only for runtime-components
jkowalleck Feb 8, 2025
c34176d
rename `isExtranous `-> `isExternal` + wording
jkowalleck Feb 8, 2025
919e49f
docs for JSON schema requirements
jkowalleck Feb 8, 2025
21f8f42
component's version and versionRange exclusively
jkowalleck Feb 8, 2025
22c6e75
tests
jkowalleck Feb 8, 2025
45af9ec
Initial checkin of patent support
stevespringett Feb 10, 2025
0a978ea
Merge remote-tracking branch 'origin/master' into 1.7-dev
jkowalleck Feb 17, 2025
88de88c
tests(Java) 1.7
jkowalleck Feb 17, 2025
0f6d558
Merge branch '1.7-dev' into 1.7-dev-patents
jkowalleck Feb 17, 2025
19e7c21
Merge branch '1.7-dev' into feat/extraneous-component
jkowalleck Feb 17, 2025
f5aa93e
Merge branch '1.7-dev' into feat/licenses-multi-mix-all
jkowalleck Feb 17, 2025
760c2db
Merge branch '1.7-dev' into add-streebog-hashalg
jkowalleck Feb 17, 2025
39524a2
feat: license expression text attachment
jkowalleck Feb 20, 2025
0ddab28
examples: use alternative XML style
jkowalleck Feb 20, 2025
c1a6b33
tests: fix json example
jkowalleck Feb 21, 2025
e97c3d3
tests: examples for license expression details
jkowalleck Feb 21, 2025
cebcf7d
tests: extend/revisit example for expression-details
jkowalleck Feb 21, 2025
9f08878
Fix missing type definitions for ComponentData subelements
andreas-hilti Feb 21, 2025
a0a6f8f
Fix missing type definitions for ComponentData subelements in XML (#601)
jkowalleck Feb 22, 2025
1962322
feat: Add support for TLP marking in metadata (fixes #595)
anthonyharrison Feb 22, 2025
925f5f9
feat: Add support for TLP marking in metadata (fixes #595)
anthonyharrison Feb 23, 2025
55425e5
feat: Add support for TLP marking in metadata - fix protobuf enum (fi…
anthonyharrison Feb 23, 2025
d3d243f
feat: Add support for TLP marking in metadata - add default values an…
anthonyharrison Feb 23, 2025
5708d61
`TLP_CLEAR_UNSPECIFIED` -> `TLP_CLEAR`
jkowalleck Feb 24, 2025
1f333ed
Added missing doc
Feb 24, 2025
903cb43
rework license expression lext attachments and add shema
jkowalleck Feb 24, 2025
59c9a1f
ework license expression lext attachments and add shema
jkowalleck Feb 24, 2025
ee671a8
rename xml
jkowalleck Feb 25, 2025
5995a6d
docs: proto
jkowalleck Feb 25, 2025
7701a10
struct proto
jkowalleck Feb 25, 2025
561c8dd
docs
jkowalleck Feb 25, 2025
0dc34e0
docs
jkowalleck Feb 25, 2025
c16b24a
docs: SPDX expression examplefor `LicenseRef-`
jkowalleck Feb 26, 2025
7c49125
docs
jkowalleck Feb 26, 2025
267ef6d
style
jkowalleck Feb 26, 2025
85e903d
refactor: rename and docs
jkowalleck Feb 27, 2025
714813c
licenseexpression details bom-ref
jkowalleck Feb 27, 2025
6aa6fba
tests: examples
jkowalleck Feb 27, 2025
d1f83ff
tests: examples
jkowalleck Feb 27, 2025
add2dc1
tests: examples
jkowalleck Feb 27, 2025
09a8717
tests: examples
jkowalleck Feb 27, 2025
b2c5ca5
docs
jkowalleck Feb 27, 2025
41fc9b2
docs
jkowalleck Feb 27, 2025
c974a3c
feat: license url
jkowalleck Feb 27, 2025
bfd9eb4
feat: license expression licensing and properties
jkowalleck Feb 27, 2025
5b12e67
tests
jkowalleck Feb 27, 2025
7f73c1d
tests: revisit examples
jkowalleck Mar 6, 2025
ebe66bc
dev-docs
jkowalleck Mar 6, 2025
98d888d
fixed schema and docs
jkowalleck Mar 6, 2025
dbd3c43
tests: fix examples
jkowalleck Mar 6, 2025
636eb43
style fixes
jkowalleck Mar 6, 2025
3da8e47
feat: Add support for TLP marking in metadata - correct TLP descripti…
anthonyharrison Mar 6, 2025
4e918f8
Merge remote-tracking branch 'refs/remotes/origin/1.7-dev' into 1.7-dev
anthonyharrison Mar 6, 2025
ed5fa84
feat: Add support for TLP marking in metadata - correct TLP descripti…
anthonyharrison Mar 6, 2025
ed9918d
feat: add custom properties to external references
Urist-McGit Mar 10, 2025
93c29e5
Add support for Streebog hashing algorithm (#525)
jkowalleck Mar 16, 2025
2f1fb1e
feat: support for external components with version-ranges (#586)
jkowalleck Apr 3, 2025
1cc3320
Merge branch '1.7-dev' into 1.7-dev-patents
jkowalleck Apr 14, 2025
be626a9
Added citation support and test cases.
stevespringett May 1, 2025
84f8e2e
Corrected tests
stevespringett May 1, 2025
ec18e41
corrected pointer repeating
stevespringett May 1, 2025
ddc4842
Added external ref for citation
stevespringett May 1, 2025
1e9cdce
Corrected minor issue with JSON schema. Ported to XSD and added XML t…
stevespringett May 2, 2025
8c5d03a
Fixed linting errors
stevespringett May 2, 2025
2fe1e2e
Merge branch '1.7-dev' into 1.7-dev-patents
jkowalleck May 2, 2025
cb2a539
Merge branch 'master' into 1.7-dev
jkowalleck May 2, 2025
9776c2a
Made patents optional
stevespringett May 2, 2025
7f2978e
Ported to protobuf and added test case
stevespringett May 2, 2025
0bd4de7
Updated comments
stevespringett May 2, 2025
16f7632
docs: add ProtoBuf enum docs - taken from JSON
jkowalleck May 15, 2025
7dba14f
docs: annotations
jkowalleck May 20, 2025
a9122e8
feat: Add support for TLP marking in metadata (#604)
jkowalleck Jun 5, 2025
ee39f18
feat: add custom properties to external references (#610)
jkowalleck Jun 5, 2025
6425bd8
feat: license expression details and properties - text attachment, li…
jkowalleck Jun 5, 2025
4cf9489
Add support for representing patent information (#597)
jkowalleck Jun 5, 2025
bc3dda0
Merge branch '1.7-dev' into feat/licenses-multi-mix-all
jkowalleck Jun 6, 2025
5462e66
tests: add latest features to test cases
jkowalleck Jun 6, 2025
32b73df
tests: add latest features to test cases
jkowalleck Jun 6, 2025
9958c12
feat: JIT compilers and interpreters are platforms
jkowalleck Jun 6, 2025
7ab0895
wording
jkowalleck Jun 10, 2025
d88ff39
JIT compilers & interpreters are "platforms" (#647)
jkowalleck Jun 16, 2025
a3d7d01
Added explicit documentation in XSD and Proto that either attributedT…
stevespringett Jul 2, 2025
58e5ad2
Merge branch '1.7-dev' into 1.7-dev-citations
jkowalleck Jul 3, 2025
abcc29d
added additional test cases, and adjusted the XSD to detect them
jkowalleck Jul 3, 2025
4a24b07
revert XSD improvements
jkowalleck Jul 3, 2025
c486d31
docs
jkowalleck Jul 3, 2025
0f225ad
docs
jkowalleck Jul 3, 2025
e95af17
feat: support multi license mix (#582)
jkowalleck Jul 24, 2025
f315e00
Added expressions - JSONPath and XPath as an alternative to JSON Poin…
stevespringett Aug 5, 2025
bcdcaca
Merge branch '1.7-dev' into 1.7-dev-citations
jkowalleck Aug 6, 2025
22f8b63
streamlined some docs
jkowalleck Aug 5, 2025
efbbbf4
wip
jkowalleck Aug 5, 2025
2bf3edc
wip
jkowalleck Aug 6, 2025
fd1a034
tests
jkowalleck Aug 6, 2025
e9689a5
[1.7] citation: proposed changes 2 (#667)
jkowalleck Aug 11, 2025
680b4fc
[1.7] Added citation support and test cases. (#630)
stevespringett Aug 15, 2025
a3c3f6a
Adds support for post-quantum ML-DSA algorithms
prabhu Aug 16, 2025
8cf06b2
Improved description based on a review from qwen3-coder
prabhu Aug 16, 2025
07b86aa
Adds support for ML-KEM key encapsulation mechanism
prabhu Aug 18, 2025
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
1 change: 1 addition & 0 deletions docgen/json/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/json/templates/cyclonedx/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@
v${version} (JSON)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -54,6 +56,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
1 change: 1 addition & 0 deletions docgen/proto/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/proto/templates/html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,14 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
v${version} (Protobuf)
</a>
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -285,6 +287,7 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
1 change: 1 addition & 0 deletions docgen/xml/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
set -eu

declare -a CDX_VERSIONS=(
'1.7'
'1.6'
'1.5'
'1.4'
Expand Down
3 changes: 3 additions & 0 deletions docgen/xml/xs3p.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,14 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle version-selector" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">v<xsl:value-of select="$cycloneDxVersion"/> (XML)<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
Expand All @@ -354,6 +356,7 @@
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
<li style="padding:0"><hr class="dropdown-divider"/></li>
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>
Expand Down
Loading