Skip to content

Commit ae266d4

Browse files
Add more cryptographic functions, paddings, modes, and validation levels to schema (#841)
fixes #840 paramgen and paramver refer to the DSA parameter generation / verification functionality from FIPS 186-4 (Appendix A). keyver refers to DSA / ECDSA / Safe Primes key verification from FIPS 186-5 and SP 800-56Ar3.
2 parents 979b738 + ff45d63 commit ae266d4

3 files changed

Lines changed: 33 additions & 1 deletion

File tree

schema/2.0/cyclonedx-2.0-bundled.min.schema.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

schema/2.0/cyclonedx-2.0-bundled.schema.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2802,6 +2802,7 @@
28022802
"cc-eal6+",
28032803
"cc-eal7",
28042804
"cc-eal7+",
2805+
"cavp",
28052806
"other",
28062807
"unknown"
28072808
],
@@ -2833,6 +2834,7 @@
28332834
"cc-eal6+": "Common Criteria - Evaluation Assurance Level 6 (Augmented)",
28342835
"cc-eal7": "Common Criteria - Evaluation Assurance Level 7",
28352836
"cc-eal7+": "Common Criteria - Evaluation Assurance Level 7 (Augmented)",
2837+
"cavp": "Cryptographic Algorithm Validation Program",
28362838
"other": "Another certification",
28372839
"unknown": "The certification level is not known"
28382840
}
@@ -2858,6 +2860,9 @@
28582860
"kwp",
28592861
"cts",
28602862
"xts",
2863+
"xpn",
2864+
"ff1",
2865+
"ff3-1",
28612866
"other",
28622867
"unknown"
28632868
],
@@ -2877,6 +2882,9 @@
28772882
"kwp": "AES Key Wrap with Padding (RFC 5649).",
28782883
"cts": "Ciphertext Stealing mode.",
28792884
"xts": "XEX Tweaked-codebook with Stealing (disk encryption).",
2885+
"xpn": "Extended Packet Numbering mode.",
2886+
"ff1": "Format-preserving encryption mode 1.",
2887+
"ff3-1": "Format-preserving encryption mode 3, update 1.",
28802888
"other": "Another mode of operation.",
28812889
"unknown": "The mode is not known."
28822890
}
@@ -2892,6 +2900,7 @@
28922900
"oaep",
28932901
"raw",
28942902
"pss",
2903+
"x931",
28952904
"other",
28962905
"unknown"
28972906
],
@@ -2902,6 +2911,7 @@
29022911
"oaep": "Optimal Asymmetric Encryption Padding for RSA.",
29032912
"raw": "No padding applied.",
29042913
"pss": "Probabilistic Signature Scheme for RSA signatures.",
2914+
"x931": "ANSI X9.31 padding for RSA.",
29052915
"other": "Another padding scheme.",
29062916
"unknown": "The padding scheme is not known."
29072917
}
@@ -3636,7 +3646,10 @@
36363646
"description": "A cryptographic function or usage.",
36373647
"enum": [
36383648
"generate",
3649+
"paramgen",
3650+
"paramver",
36393651
"keygen",
3652+
"keyver",
36403653
"encrypt",
36413654
"decrypt",
36423655
"digest",
@@ -3653,7 +3666,10 @@
36533666
],
36543667
"meta:enum": {
36553668
"generate": "Generates random data, IVs, or nonces.",
3669+
"paramgen": "Generates cryptographic domain parameters.",
3670+
"paramver": "Verifies cryptographic domain parameters.",
36563671
"keygen": "Generates cryptographic keys.",
3672+
"keyver": "Verifies cryptographic keys.",
36573673
"encrypt": "Transforms plaintext into ciphertext.",
36583674
"decrypt": "Transforms ciphertext into plaintext.",
36593675
"digest": "Computes a hash value from input data.",

schema/2.0/model/cyclonedx-cryptography-2.0.schema.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
"cc-eal6+",
200200
"cc-eal7",
201201
"cc-eal7+",
202+
"cavp",
202203
"other",
203204
"unknown"
204205
],
@@ -230,6 +231,7 @@
230231
"cc-eal6+": "Common Criteria - Evaluation Assurance Level 6 (Augmented)",
231232
"cc-eal7": "Common Criteria - Evaluation Assurance Level 7",
232233
"cc-eal7+": "Common Criteria - Evaluation Assurance Level 7 (Augmented)",
234+
"cavp": "Cryptographic Algorithm Validation Program",
233235
"other": "Another certification",
234236
"unknown": "The certification level is not known"
235237
}
@@ -255,6 +257,9 @@
255257
"kwp",
256258
"cts",
257259
"xts",
260+
"xpn",
261+
"ff1",
262+
"ff3-1",
258263
"other",
259264
"unknown"
260265
],
@@ -274,6 +279,9 @@
274279
"kwp": "AES Key Wrap with Padding (RFC 5649).",
275280
"cts": "Ciphertext Stealing mode.",
276281
"xts": "XEX Tweaked-codebook with Stealing (disk encryption).",
282+
"xpn": "Extended Packet Numbering mode.",
283+
"ff1": "Format-preserving encryption mode 1.",
284+
"ff3-1": "Format-preserving encryption mode 3, update 1.",
277285
"other": "Another mode of operation.",
278286
"unknown": "The mode is not known."
279287
}
@@ -289,6 +297,7 @@
289297
"oaep",
290298
"raw",
291299
"pss",
300+
"x931",
292301
"other",
293302
"unknown"
294303
],
@@ -299,6 +308,7 @@
299308
"oaep": "Optimal Asymmetric Encryption Padding for RSA.",
300309
"raw": "No padding applied.",
301310
"pss": "Probabilistic Signature Scheme for RSA signatures.",
311+
"x931": "ANSI X9.31 padding for RSA.",
302312
"other": "Another padding scheme.",
303313
"unknown": "The padding scheme is not known."
304314
}
@@ -1033,7 +1043,10 @@
10331043
"description": "A cryptographic function or usage.",
10341044
"enum": [
10351045
"generate",
1046+
"paramgen",
1047+
"paramver",
10361048
"keygen",
1049+
"keyver",
10371050
"encrypt",
10381051
"decrypt",
10391052
"digest",
@@ -1050,7 +1063,10 @@
10501063
],
10511064
"meta:enum": {
10521065
"generate": "Generates random data, IVs, or nonces.",
1066+
"paramgen": "Generates cryptographic domain parameters.",
1067+
"paramver": "Verifies cryptographic domain parameters.",
10531068
"keygen": "Generates cryptographic keys.",
1069+
"keyver": "Verifies cryptographic keys.",
10541070
"encrypt": "Transforms plaintext into ciphertext.",
10551071
"decrypt": "Transforms ciphertext into plaintext.",
10561072
"digest": "Computes a hash value from input data.",

0 commit comments

Comments
 (0)