Skip to content

Commit ca40799

Browse files
stevespringettstevespringett
authored
Merge branch 'master' into doc-updates
2 parents 5aef9ae + e152cc1 commit ca40799

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

‎schema/cryptography-defs.json‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://cyclonedx.org/schema/cryptography-defs.schema.json",
3-
"lastUpdated": "2025-03-22T00:00:00Z",
3+
"lastUpdated": "2026-02-24T00:00:00Z",
44
"algorithms": [
55
{
66
"family": "RSASSA-PKCS1",
@@ -16,7 +16,7 @@
1616
],
1717
"variant": [
1818
{
19-
"pattern": "RSA-PKCS1-1.5[-{digestAlgorithm}][-{keyLength}]",
19+
"pattern": "RSA-PKCS1-1.5[-{hashAlgorithm}][-{keyLength}]",
2020
"primitive": "signature"
2121
}
2222
]
@@ -35,7 +35,7 @@
3535
],
3636
"variant": [
3737
{
38-
"pattern": "RSA-PSS[-{digestAlgorithm}][-{saltLength}][-{keyLength}]",
38+
"pattern": "RSA-PSS[-{hashAlgorithm}][-{maskGenAlgorithm}][-{saltLength}][-{keyLength}]",
3939
"primitive": "signature"
4040
}
4141
]
@@ -99,7 +99,7 @@
9999
],
100100
"variant": [
101101
{
102-
"pattern": "ECDSA[-{ellipticCurve}][-{hash}]",
102+
"pattern": "ECDSA[-{ellipticCurve}][-{hashAlgorithm}]",
103103
"primitive": "signature"
104104
}
105105
]
@@ -186,7 +186,7 @@
186186
],
187187
"variant": [
188188
{
189-
"pattern": "DSA[-{length}][-{hash}]",
189+
"pattern": "DSA[-{length}][-{hashAlgorithm}]",
190190
"primitive": "signature"
191191
}
192192
]
@@ -251,11 +251,11 @@
251251
],
252252
"variant": [
253253
{
254-
"pattern": "SRP-3[-{hashFunction}][-{namedGroup}]",
254+
"pattern": "SRP-3[-{hashAlgorithm}][-{namedGroup}]",
255255
"primitive": "key-agree"
256256
},
257257
{
258-
"pattern": "SRP-6[-{hashFunction}][-{namedGroup}]",
258+
"pattern": "SRP-6[-{hashAlgorithm}][-{namedGroup}]",
259259
"primitive": "key-agree"
260260
}
261261
]
@@ -465,7 +465,7 @@
465465
],
466466
"variant": [
467467
{
468-
"pattern": "HKDF[-{hashFunction}]",
468+
"pattern": "HKDF[-{hashAlgorithm}]",
469469
"primitive": "kdf"
470470
}
471471
]
@@ -484,7 +484,7 @@
484484
],
485485
"variant": [
486486
{
487-
"pattern": "HMAC[-{hashFunction}][-{tagLength}]",
487+
"pattern": "HMAC[-{hashAlgorithm}][-{tagLength}]",
488488
"primitive": "mac"
489489
}
490490
]
@@ -504,21 +504,6 @@
504504
}
505505
]
506506
},
507-
{
508-
"family": "KMAC",
509-
"standard": [
510-
{
511-
"name": "SP800-108r1",
512-
"url": "https://doi.org/10.6028/NIST.SP.800-108r1-upd1"
513-
}
514-
],
515-
"variant": [
516-
{
517-
"pattern": "KMAC[-(128|256)]",
518-
"primitive": "mac"
519-
}
520-
]
521-
},
522507
{
523508
"family": "UMAC",
524509
"standard": [
@@ -733,7 +718,7 @@
733718
"primitive": "signature"
734719
},
735720
{
736-
"pattern": "HashML-DSA-(44|65|87)[-{hashFunction}]",
721+
"pattern": "HashML-DSA-(44|65|87)[-{hashAlgorithm}]",
737722
"primitive": "signature"
738723
}
739724
]
@@ -752,7 +737,7 @@
752737
"primitive": "signature"
753738
},
754739
{
755-
"pattern": "HashSLH-DSA-(SHA2|SHAKE)-(128s|128f|192s|192f|256s|256f)[-{hashFunction}]",
740+
"pattern": "HashSLH-DSA-(SHA2|SHAKE)-(128s|128f|192s|192f|256s|256f)[-{hashAlgorithm}]",
756741
"primitive": "signature"
757742
}
758743
]
@@ -798,7 +783,7 @@
798783
],
799784
"variant": [
800785
{
801-
"pattern": "LMS[_{hashFunction}][_M{bytesPerNode}][_H{treeHeight}]",
786+
"pattern": "LMS[_{hashAlgorithm}][_M{bytesPerNode}][_H{treeHeight}]",
802787
"primitive": "signature"
803788
},
804789
{
@@ -1006,7 +991,7 @@
1006991
"primitive": "block-cipher"
1007992
},
1008993
{
1009-
"pattern": "SEED-128[-{mode}][-{padding}]-HMAC[-{hashFunction}][-{tagLength}]",
994+
"pattern": "SEED-128[-{mode}][-{padding}]-HMAC[-{hashAlgorithm}][-{tagLength}]",
1010995
"primitive": "ae"
1011996
},
1012997
{
@@ -1108,7 +1093,7 @@
11081093
],
11091094
"variant": [
11101095
{
1111-
"pattern": "SP800_108_(CounterKDF|FeedbackKDF|DoublePipelineKDF)[-{prfFunction}][-{dkmLength}]",
1096+
"pattern": "SP800_108_(CounterKDF|FeedbackKDF|DoublePipelineKDF|KMAC)[-{prfFunction}][-{dkmLength}]",
11121097
"primitive": "key-derive"
11131098
}
11141099
]
@@ -1165,7 +1150,7 @@
11651150
],
11661151
"variant": [
11671152
{
1168-
"pattern": "X3DH[-{hashFunction}]",
1153+
"pattern": "X3DH[-{hashAlgorithm}]",
11691154
"primitive": "key-agree"
11701155
}
11711156
]
@@ -1199,7 +1184,7 @@
11991184
],
12001185
"variant": [
12011186
{
1202-
"pattern": "OPAQUE-3DH[-{group}][-{hashFunction}][-{ksf}][-{kdf}][-{mac}]",
1187+
"pattern": "OPAQUE-3DH[-{group}][-{hashAlgorithm}][-{ksf}][-{kdf}][-{mac}]",
12031188
"primitive": "key-agree"
12041189
}
12051190
]
@@ -1233,7 +1218,7 @@
12331218
],
12341219
"variant": [
12351220
{
1236-
"pattern": "SPAKE2[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
1221+
"pattern": "SPAKE2[-{group}][-{hashAlgorithm}][-{kdf}][-{mac}]",
12371222
"primitive": "key-agree"
12381223
}
12391224
]
@@ -1248,7 +1233,7 @@
12481233
],
12491234
"variant": [
12501235
{
1251-
"pattern": "SPAKE2+[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
1236+
"pattern": "SPAKE2+[-{group}][-{hashAlgorithm}][-{kdf}][-{mac}]",
12521237
"primitive": "key-agree"
12531238
}
12541239
]
@@ -1588,7 +1573,7 @@
15881573
],
15891574
"variant": [
15901575
{
1591-
"pattern": "PBKDF1[-{hashFunction}][-{iterations}][-{dkLen}]",
1576+
"pattern": "PBKDF1[-{hashAlgorithm}][-{iterations}][-{dkLen}]",
15921577
"primitive": "kdf"
15931578
}
15941579
]
@@ -1607,7 +1592,7 @@
16071592
],
16081593
"variant": [
16091594
{
1610-
"pattern": "PBKDF2[-{hashFunction}][-{iterations}][-{dkLen}]",
1595+
"pattern": "PBKDF2[-{hashAlgorithm}][-{iterations}][-{dkLen}]",
16111596
"primitive": "kdf"
16121597
}
16131598
]
@@ -1652,7 +1637,7 @@
16521637
],
16531638
"variant": [
16541639
{
1655-
"pattern": "PBMAC1[-{macAlgorithm}][-{hashFunction}][-{iterations}][-{dkLen}]",
1640+
"pattern": "PBMAC1[-{macAlgorithm}][-{hashAlgorithm}][-{iterations}][-{dkLen}]",
16561641
"primitive": "mac"
16571642
}
16581643
]
@@ -1668,7 +1653,7 @@
16681653
"variant": [
16691654
{
16701655
"pattern": "bcrypt[-{cost}]",
1671-
"primitive": "hash"
1656+
"primitive": "kdf"
16721657
}
16731658
]
16741659
},
@@ -1683,7 +1668,22 @@
16831668
"variant": [
16841669
{
16851670
"pattern": "scrypt[-{N}][-{r}][-{p}][-{dkLen}]",
1686-
"primitive": "hash"
1671+
"primitive": "kdf"
1672+
}
1673+
]
1674+
},
1675+
{
1676+
"family": "yescrypt",
1677+
"standard": [
1678+
{
1679+
"name": "yescrypt - scalable KDF and password hashing scheme",
1680+
"url": "https://www.openwall.com/yescrypt/"
1681+
}
1682+
],
1683+
"variant": [
1684+
{
1685+
"pattern": "[{hashAlgorithm}-]yescrypt[-{N_log2}][-{r}][-{p}][-{t}]",
1686+
"primitive": "kdf"
16871687
}
16881688
]
16891689
},
@@ -1716,7 +1716,7 @@
17161716
"standard": [
17171717
{
17181718
"name": "TIA TR45.0.A",
1719-
"url": ""
1719+
"url": "https://patents.google.com/patent/US5159634"
17201720
}
17211721
],
17221722
"variant": [
@@ -1736,7 +1736,7 @@
17361736
],
17371737
"variant": [
17381738
{
1739-
"pattern": "Fortuna[-{blockCipher}][-{hashFunction}]",
1739+
"pattern": "Fortuna[-{blockCipher}][-{hashAlgorithm}]",
17401740
"primitive": "drbg"
17411741
}
17421742
]
@@ -1751,7 +1751,7 @@
17511751
],
17521752
"variant": [
17531753
{
1754-
"pattern": "Yarrow[-{blockCipher}][-{hashFunction}]",
1754+
"pattern": "Yarrow[-{blockCipher}][-{hashAlgorithm}]",
17551755
"primitive": "drbg"
17561756
}
17571757
]
@@ -1781,7 +1781,7 @@
17811781
],
17821782
"variant": [
17831783
{
1784-
"pattern": "Hash_DRBG[-{hashFunction}]",
1784+
"pattern": "Hash_DRBG[-{hashAlgorithm}]",
17851785
"primitive": "drbg"
17861786
}
17871787
]
@@ -1796,7 +1796,7 @@
17961796
],
17971797
"variant": [
17981798
{
1799-
"pattern": "HMAC_DRBG[-{hashFunction}]",
1799+
"pattern": "HMAC_DRBG[-{hashAlgorithm}]",
18001800
"primitive": "drbg"
18011801
}
18021802
]

‎schema/cryptography-defs.schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"$id": "http://cyclonedx.org/schema/cryptography-defs.schema.json",
4-
"$comment": "2026-02-26T14:12:39Z",
4+
"$comment": "2026-03-05T14:27:50Z",
55
"title": "Cryptographic Algorithm Family Definitions",
66
"description": "Enumerates cryptographic algorithm families and their specific metadata.",
77
"type": "object",
@@ -281,7 +281,6 @@
281281
"IDEA",
282282
"IKE-PRF",
283283
"J-PAKE",
284-
"KMAC",
285284
"LMS",
286285
"MD2",
287286
"MD4",
@@ -334,7 +333,8 @@
334333
"Yarrow",
335334
"ZUC",
336335
"bcrypt",
337-
"scrypt"
336+
"scrypt",
337+
"yescrypt"
338338
]
339339
},
340340
"ellipticCurvesEnum": {

0 commit comments

Comments
 (0)