Skip to content

2.0 dev mergemaster 20260704 2 #1003

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

Merged
jkowalleck merged 142 commits into from
Aug 4, 2026
+4 −2
Merged

2.0 dev mergemaster 20260704 2 #1003

Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
ad3dc9e
fix: add properties field to ModelCard xml and proto to resolve misma…
wiebe-vandendriessche Dec 17, 2025
f5b3f90
fix: removed some unnecessary whitespace
wiebe-vandendriessche Dec 17, 2025
49b7470
fix: allow multiple entries for ModelCard considerations lists in xml…
wiebe-vandendriessche Dec 17, 2025
c2c0f34
fix: update XML schema versions to 1.5.1, 1.6.2, and 1.7.1
wiebe-vandendriessche Dec 19, 2025
f1b7301
fix: bump version numbers in BOM schema files to 1.5.1, 1.6.2, and 1.7.1
wiebe-vandendriessche Jan 15, 2026
28eed10
test: Add second entry for users, useCases, technicalLimitations, and
wiebe-vandendriessche Jan 16, 2026
98eb26f
test: add tests for custom properties field in modelCard (json, xml, …
wiebe-vandendriessche Jan 16, 2026
af9df67
fix: add another custom property to ModelCard across JSON, XML, and p…
wiebe-vandendriessche Feb 9, 2026
2eb1645
Merge branch 'master' into fix/modelcard-missing-properties
wiebe-vandendriessche Feb 9, 2026
6176322
Merge branch 'master' into fix/modelcard-considerations-list-fields
wiebe-vandendriessche Feb 9, 2026
1cacb27
fix: add test cases for all supported formats
wiebe-vandendriessche Feb 9, 2026
2deea41
Merge branch 'master' into fix/modelcard-missing-properties
wiebe-vandendriessche Feb 9, 2026
0112141
Merge branch 'master' into fix/modelcard-considerations-list-fields
wiebe-vandendriessche Feb 9, 2026
c9f1780
feat: enum labels for spdx.schema.json
jkowalleck Feb 23, 2026
62ab8e6
Update crypto definitions
bhess Feb 24, 2026
117e2e4
fix(crypto-registry): normalize RFC/FIPS standard name formatting
Mehrn0ush Feb 24, 2026
0bd48c8
fix(schema): correct typos in content-type text and refType comment
Mehrn0ush Feb 25, 2026
b20b074
docs: correct typos in BOM 1.6/1.7 JSON Schema and XSD (#850)
jkowalleck Feb 25, 2026
3c92ef0
Remove duplicate KDF, merge with kdf with SP800-108r1
bhess Feb 26, 2026
81f31a6
fix(crypto-registry): normalize RFC/FIPS standard name formatting (#847)
stevespringett Feb 26, 2026
60cbf7a
chore: update algorithm families [skip ci]
github-actions[bot] Feb 26, 2026
0828e7c
chore: update algorithm families (#843)
stevespringett Feb 26, 2026
c57fdd8
Merge branch 'master' into feat/enum-labels-for-spdx.schema.json
stevespringett Feb 26, 2026
b29918c
feat: enum labels for spdx.schema.json (#839)
jkowalleck Mar 2, 2026
ecd4f22
chore: harden schema validators
jkowalleck Mar 2, 2026
353f378
chore: harden schema validators (#859)
jkowalleck Mar 2, 2026
605735c
Added missing scarf to docs.
stevespringett Mar 2, 2026
fe143ee
Added missing scarf to docs. (#860)
jkowalleck Mar 2, 2026
ca4d2f6
Consistent use of kdf for password-based key derivation algorithms, a…
bhess Mar 5, 2026
c83d471
Merge branch 'master' into bhe-cryptodefs
stevespringett Mar 5, 2026
dbb6575
Update crypto definitions (#844)
stevespringett Mar 5, 2026
f9ab2ad
chore: update algorithm families [skip ci]
github-actions[bot] Mar 5, 2026
e152cc1
chore: update algorithm families (#852)
stevespringett Mar 5, 2026
58441e3
Updated documentation generation
stevespringett Mar 10, 2026
a085fce
Updated documentation generation
stevespringett Mar 10, 2026
18c651a
Fixed potential security issue
stevespringett Mar 10, 2026
1badf6b
Fixed potential security issue
stevespringett Mar 10, 2026
5aef9ae
Potential fix for code scanning alert no. 39: Uncontrolled data used …
stevespringett Mar 10, 2026
ca40799
Merge branch 'master' into doc-updates
stevespringett Mar 10, 2026
1886816
Modernize docgen: Bootstrap 5.3.8, drop jQuery/Font Awesome, add cent…
stevespringett Mar 10, 2026
526a2db
major changes to json template doc generation - reducing filesize fro…
stevespringett Mar 10, 2026
b92bd46
JSON doc performance improvements (#865)
stevespringett Mar 10, 2026
5be66ad
Add RSA-X931
jvdsn Mar 11, 2026
9772d16
Separate out AES KW / KWP
jvdsn Mar 11, 2026
3302c7d
Remove dash from EdDSA
jvdsn Mar 11, 2026
0a5d281
Remove dash from SHA-3 hash algorithms
jvdsn Mar 11, 2026
7c03de5
Add hashAlgorithm to IKE-PRF
jvdsn Mar 11, 2026
6277ecf
Add TLS-PRF family
jvdsn Mar 12, 2026
2927c1f
Add SP800-56C family
jvdsn Mar 12, 2026
29740a0
Deduplicate MD4 and MD5 entries in cryptography registry
Mehrn0ush Mar 12, 2026
8c484e9
remove buf comments
jkowalleck Mar 12, 2026
70d9a25
docs: remove buf comments (#880)
jkowalleck Mar 12, 2026
bae98dc
Merge branch 'master' into patch-4
stevespringett Mar 12, 2026
23d749f
Merge branch 'master' into patch-2
stevespringett Mar 12, 2026
6f6b79b
Add two variants instead of one
jvdsn Mar 12, 2026
8c9e826
Fix primitive
jvdsn Mar 12, 2026
ce0b592
Add ANSI KDFs
jvdsn Mar 12, 2026
5ca781b
Fix SipHash primitive classification in cryptography registry
Mehrn0ush Mar 12, 2026
20f78d8
Add AES-OCB to cryptography registry
Mehrn0ush Mar 12, 2026
ee54510
fix scroll-padding-top for XML
jkowalleck Mar 13, 2026
3077216
docs: fix scroll-padding-top for XML (#886)
jkowalleck Mar 13, 2026
8613aab
Merge branch 'master' into fix/modelcard-missing-properties
jkowalleck Mar 18, 2026
16f4660
Merge branch 'master' into fix/modelcard-considerations-list-fields
jkowalleck Mar 18, 2026
3966350
Merge branch 'master' into patch-2
jkowalleck Mar 18, 2026
e67f335
Merge branch 'master' into patch-3
jkowalleck Mar 18, 2026
06ee11b
Merge branch 'master' into patch-4
jkowalleck Mar 18, 2026
efe4268
Merge branch 'master' into patch-5
jkowalleck Mar 18, 2026
fcc0861
Merge branch 'master' into patch-6
jkowalleck Mar 18, 2026
e07246d
Merge branch 'master' into patch-7
jkowalleck Mar 18, 2026
40bfa39
Merge branch 'master' into patch-8
jkowalleck Mar 18, 2026
bf58178
Merge branch 'master' into fix/crypto-registry-deduplicate-md4-md5
jkowalleck Mar 18, 2026
a1f0ea6
Merge branch 'master' into patch-9
jkowalleck Mar 18, 2026
8c6a4fd
Merge branch 'master' into fix/crypto-registry-siphash-primitive
jkowalleck Mar 18, 2026
7f400f4
Merge branch 'master' into feat/crypto-registry-aes-ocb
stevespringett Mar 26, 2026
3941d06
Add AES-OCB to cryptography registry (#885)
stevespringett Mar 26, 2026
4dce6d1
Merge branch 'master' into fix/crypto-registry-siphash-primitive
stevespringett Mar 26, 2026
e32b374
Fix SipHash primitive classification in cryptography registry (#883)
stevespringett Mar 26, 2026
b35d028
Add ANSI KDFs (#881)
stevespringett Mar 26, 2026
263aa27
Deduplicate MD4 and MD5 entries in cryptography registry (#879)
stevespringett Mar 26, 2026
482573e
Merge branch 'master' into patch-8
stevespringett Mar 26, 2026
28f2ce4
Add SP800-56C family (#877)
stevespringett Mar 26, 2026
2634ad5
Merge branch 'master' into patch-6
stevespringett Mar 26, 2026
88d01bf
Remove dash from SHA-3 hash algorithms (#871)
stevespringett Mar 26, 2026
9bf7f3c
Remove dash from EdDSA (#870)
stevespringett Mar 26, 2026
bbc87f7
Add hashAlgorithm to IKE-PRF (#873)
stevespringett Mar 26, 2026
959e07e
Merge branch 'master' into patch-3
stevespringett Mar 26, 2026
09eea58
Separate out AES KW / KWP (#869)
stevespringett Mar 26, 2026
8bf6eb0
Merge branch 'master' into patch-7
stevespringett Mar 26, 2026
ba0154a
Add TLS-PRF family (#875)
stevespringett Mar 26, 2026
7e5501c
Fixed JSON issue
stevespringett Mar 26, 2026
12ea822
Fixed JSON issue (#894)
stevespringett Mar 26, 2026
46e4878
Add SSH-KDF
jvdsn Mar 27, 2026
dc1bc04
Add SSH-KDF to cryptography registry (#899)
stevespringett Apr 2, 2026
054e479
Initial plan
Copilot Apr 16, 2026
98f25e7
chore: pin GitHub Actions to immutable commit SHAs
Copilot Apr 16, 2026
6bd0b0a
chore: pin GitHub Actions to immutable commit SHAs (#908)
jkowalleck Apr 16, 2026
86e4b97
Add standard
jvdsn Apr 16, 2026
1a25c5b
Merge branch 'master' into patch-2
stevespringett Apr 16, 2026
29b8bdd
Add RSA-X931 (#868)
stevespringett Apr 16, 2026
12d91d1
Merge branch 'master' into fix/modelcard-missing-properties
wiebe-vandendriessche Apr 29, 2026
c68bf84
Merge branch 'master' into fix/modelcard-considerations-list-fields
wiebe-vandendriessche Apr 29, 2026
b95785f
fix: correct GOST 28147 algorithm names
Mehrn0ush May 2, 2026
c222dd9
fix: correct BLS12 algorithm pattern
Mehrn0ush May 2, 2026
3749afd
chore(workflows): add zizmor security gate and harden Actions credent…
Copilot May 8, 2026
774ad50
chore: bump schema versions for upcoming changes
jkowalleck May 18, 2026
46d31a7
Merge branch '1.7.1-dev' into fix/modelcard-missing-properties
jkowalleck May 18, 2026
3d85bae
Merge branch '1.7.1-dev' into fix/modelcard-considerations-list-fields
jkowalleck May 18, 2026
e7ab299
fix: add missing modelCard.properties to XML + Protobuf schemas (#743)
jkowalleck May 19, 2026
971124c
fix: allow multiple entries for ModelCard considerations lists in xml…
jkowalleck May 19, 2026
0c8110c
Merge branch 'master' into fix/bls12-algorithm-pattern
stevespringett May 21, 2026
c2466ad
Merge branch 'master' into fix/gost-28147-algorithm-name
stevespringett May 21, 2026
f8b021f
fix: correct GOST 28147 algorithm names (#921)
stevespringett May 21, 2026
5cbdee8
Merge branch 'master' into fix/bls12-algorithm-pattern
stevespringett May 21, 2026
793c097
fix: correct BLS12 algorithm pattern (#923)
stevespringett May 21, 2026
87fbed8
chore(deps): bump shivammathur/setup-php from 2.37.0 to 2.37.1
dependabot[bot] May 23, 2026
9e2d54e
chore(deps): bump shivammathur/setup-php from 2.37.0 to 2.37.1 (#938)
jkowalleck May 27, 2026
d2a6935
chore(deps): bump zizmorcore/zizmor-action from 0.5.3 to 0.5.6
dependabot[bot] May 27, 2026
06e31b4
chore(deps): bump zizmorcore/zizmor-action from 0.5.3 to 0.5.6 (#939)
jkowalleck May 27, 2026
0e38ff6
Merge branch 'master' into 1.7.1-dev
jkowalleck Jun 2, 2026
b29bae6
CycloneDX 1.7.1 - Schema Alignment & Typo-/Bug‑Fix Release (#932)
jkowalleck Jun 2, 2026
b09e2c5
ci: pinned action comments exact versions
jkowalleck Jun 3, 2026
ac0f527
ci: pinned action comments exact versions (#944)
jkowalleck Jun 3, 2026
45ea3f8
chore: adjust zizmor
jkowalleck Jun 3, 2026
731f7ad
chore: adjust zizmor
jkowalleck Jun 3, 2026
9036739
chore: adjust zizmor (#945)
jkowalleck Jun 3, 2026
18d6e15
wip
jkowalleck Jun 3, 2026
9d83527
wip
jkowalleck Jun 3, 2026
88dbd0e
wip
jkowalleck Jun 3, 2026
d671c7d
Merge branch 'master' into ci/adjust-zizmor
jkowalleck Jun 3, 2026
e506960
wip
jkowalleck Jun 3, 2026
2e0fba3
ci: adjust zizmor (#946)
jkowalleck Jun 3, 2026
db134d6
chore(deps): bump zizmorcore/zizmor-action from 0.5.6 to 0.5.7
dependabot[bot] Jul 4, 2026
fac1ff6
chore(deps): bump zizmorcore/zizmor-action from 0.5.6 to 0.5.7 (#970)
jkowalleck Jul 8, 2026
40e0891
chore(deps): bump zizmorcore/zizmor-action from 0.5.7 to 0.6.1 (#994)
dependabot[bot] Aug 3, 2026
71cfd9b
chore(deps): bump actions/setup-node from 6.4.0 to 7.0.0 (#983)
dependabot[bot] Aug 3, 2026
4600c1b
chore(deps): bump actions/checkout from 5.0.1 to 7.0.1 (#987)
dependabot[bot] Aug 3, 2026
aa9f38b
chore(deps): bump actions/setup-java from 5.2.0 to 5.6.0 (#986)
dependabot[bot] Aug 3, 2026
10298c6
chore(deps): bump actions/setup-python from 5.6.0 to 7.0.0 (#993)
dependabot[bot] Aug 3, 2026
d3ce653
chore(deps): bump shivammathur/setup-php from 2.37.1 to 2.37.2 (#958)
dependabot[bot] Aug 3, 2026
daf2ca1
chore(deps): bump actions/upload-artifact from 4.6.2 to 7.0.1 (#911)
dependabot[bot] Aug 3, 2026
4c84515
chore(deps): bump actions/download-artifact from 5.0.0 to 8.0.1 (#926)
dependabot[bot] Aug 3, 2026
ffae620
Merge remote-tracking branch 'origin/master' into 2.0-dev_mergemaster…
jkowalleck Aug 4, 2026
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
6 changes: 4 additions & 2 deletions .github/workflows/test_2.x_java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ jobs:
steps:
- name: Checkout
# see https://github.com/actions/checkout
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- name: Set up JDK
# see https://github.com/actions/setup-java
uses: actions/setup-java@v5
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
with:
java-version: '8'
distribution: 'zulu'
Expand Down
Loading