Skip to content

[pull] master from CycloneDX:master #26

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
pull merged 18 commits into from
Jan 22, 2026
Merged

[pull] master from CycloneDX:master #26

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
94f0c96
fix(registry): correct RFC 3610 DOI reference (#761)
Mehrn0ush Jan 5, 2026
23942de
feat(registry): add HPKE (RFC 9180) to cryptography registry (#)
Mehrn0ush Jan 6, 2026
d9bd204
feat(registry): add AES-CMAC-PRF-128 (RFC 4615) (#767)
Mehrn0ush Jan 7, 2026
c2f046d
feat(registry): add AES-CTR-HMAC-SHA1-96 suite pattern (RFC 3686) (#770)
Mehrn0ush Jan 7, 2026
99eb482
Remove space between RFC and 9180; and update the pattern. thanks to …
Mehrn0ush Jan 19, 2026
0cc8dc5
Remove HPKE; and Remove space between RFC and 4615
Mehrn0ush Jan 19, 2026
51dbe7d
fix(registry): correct BLAKE2s-HMAC variant typo (CycloneDX#752)
Mehrn0ush Jan 21, 2026
b714d1a
fix(registry): correct BLAKE2s-HMAC variant typo (CycloneDX#752)
Mehrn0ush Jan 21, 2026
614724a
fix(registry): correct RFC 3610 DOI and remove unintended XChaCha20 e…
Mehrn0ush Jan 21, 2026
5e268ca
chore(registry): remove trailing whitespace in HPKE entry
Mehrn0ush Jan 21, 2026
462e23c
chore(registry): remove trailing whitespace in AES-CTR-HMAC entry
Mehrn0ush Jan 22, 2026
f48cd62
Merge branch 'master' into feat/crypto-registry-aes-ctr-hmac
stevespringett Jan 22, 2026
dfa5e7e
feat(registry): add AES-CTR-HMAC-SHA1-96 suite pattern (RFC 3686) (#771)
stevespringett Jan 22, 2026
d25aa7d
feat(registry): add AES-CMAC-PRF-128 (RFC 4615) (#768)
stevespringett Jan 22, 2026
9fc9ae8
feat(registry): add HPKE (RFC 9180) to Cryptography Registry (#766)
stevespringett Jan 22, 2026
b96452a
fix(registry): correct RFC 3610 DOI reference (#762)
stevespringett Jan 22, 2026
5f7aad4
Merge branch 'master' into fix/crypto-registry-blake2-dup
stevespringett Jan 22, 2026
8c16b5c
fix(registry): remove duplicate BLAKE2b-HMAC variant (#752) (#753)
stevespringett Jan 22, 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
43 changes: 39 additions & 4 deletions schema/cryptography-defs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,21 @@
"primitive": "pke"
}
]
},
{
"family": "HPKE",
"standard": [
{
"name": "RFC9180",
"url": "https://doi.org/10.17487/RFC9180"
}
],
"variant": [
{
"pattern": "HPKE[-(mode_base|mode_psk|mode_auth|mode_auth_psk)]-{kem}-{kdf}-{aead}",
"primitive": "pke"
}
]
},
{
"family": "MQV",
Expand Down Expand Up @@ -331,13 +346,23 @@
"url": "https://doi.org/10.6028/NIST.SP.800-38D"
},
{
"name": "RFC 3610",
"url": "https://doi.org/10.17487/RFC5116"
"name": "RFC3610",
"url": "https://doi.org/10.17487/RFC3610"
}
],
"pattern": "AES[-(128|192|256)][-(GCM|CCM)][-{tagLength}][-{ivLength}]",
"primitive": "ae"
},
{
"standard": [
{
"name": "RFC 3686",
"url": "https://doi.org/10.17487/RFC3686"
}
],
"pattern": "AES[-(128|192|256)]-CTR-HMAC-SHA1[-96]",
"primitive": "ae"
},
{
"standard": [
{
Expand All @@ -352,6 +377,16 @@
"pattern": "AES[-(128|192|256)][-(GMAC|CMAC)]",
"primitive": "mac"
},
{
"standard": [
{
"name": "RFC4615",
"url": "https://doi.org/10.17487/RFC4615"
}
],
"pattern": "AES-CMAC-PRF-128",
"primitive": "mac"
},
{
"pattern": "AES[-(128|192|256)][-(XCBC_MAC[_96])]",
"primitive": "mac"
Expand Down Expand Up @@ -939,11 +974,11 @@
"primitive": "hash"
},
{
"pattern": "BLAKE2b-(160|256|384|512)-HMAC",
"pattern": "BLAKE2s-(160|256)-HMAC",
"primitive": "mac"
}
]
},
},
{
"family": "BLAKE3",
"standard": [
Expand Down