Skip to content

Commit f0499a9

Browse files
stevespringettstevespringett
authored
Extend crypto definitions (#672)
This PR further extends the list of algorithms in cryptography-defs.json. <!-- Thank you for taking the time to develop and contribute a core enhancement or fix for a defect! We kindly request that you create pull requests only for things that have been discussed in a ticket first; exceptions may be made for spelling or grammar fixes. Read more about the process here: https://cyclonedx.org/participate/standardization-process/#working-model Please have the related ticket/issue ID ready. If there is none, feel free to create a new ticket: https://github.com/CycloneDX/specification/issues/new/choose --> <!-- Please provide a brief description of what this pull request intends to do and which ticket it fixes/closes. Example: > As discussed in ticket #485, this PR adds Streebog to the hash algorithm enum. > > fixes #485 In case this is for a spelling or grammar improvement, please provide a brief description. Example: > Fixe typo: color(AE) -> colour(BE) -->
2 parents 7d76dfd + 9270cd1 commit f0499a9

File tree

1 file changed

+202
-12
lines changed

1 file changed

+202
-12
lines changed

‎schema/cryptography-defs.json‎

Lines changed: 202 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -426,29 +426,25 @@
426426
{
427427
"pattern": "ML-DSA-(44|65|87)",
428428
"primitive": "signature"
429-
}
430-
]
431-
},
432-
{
433-
"family": "HashML-DSA",
434-
"standard": [
435-
{"name": "FIPS 204", "url": "https://doi.org/10.6028/NIST.FIPS.204"}
436-
],
437-
"variant": [
429+
},
438430
{
439431
"pattern": "HashML-DSA-(44|65|87)[-{hashFunction}]",
440432
"primitive": "signature"
441433
}
442434
]
443435
},
444436
{
445-
"family": "HashSLH-DSA",
437+
"family": "SLH-DSA",
446438
"standard": [
447439
{"name": "FIPS 205", "url": "https://doi.org/10.6028/NIST.FIPS.205"}
448440
],
449441
"variant": [
450442
{
451-
"pattern": "HashSLH-DSA-(SHA2|SHAKE)-(128s|128f|192s|192f|256s|256f)",
443+
"pattern": "SLH-DSA-(SHA2|SHAKE)-(128s|128f|192s|192f|256s|256f)",
444+
"primitive": "signature"
445+
},
446+
{
447+
"pattern": "HashSLH-DSA-(SHA2|SHAKE)-(128s|128f|192s|192f|256s|256f)[-{hashFunction}]",
452448
"primitive": "signature"
453449
}
454450
]
@@ -688,7 +684,7 @@
688684
]
689685
},
690686
{
691-
"family": "BLAKE2b",
687+
"family": "BLAKE2",
692688
"standard": [
693689
{"name": "RFC7693", "url": "https://doi.org/10.17487/RFC7693"}
694690
],
@@ -697,12 +693,32 @@
697693
"pattern": "BLAKE2b-(160|256|384|512)",
698694
"primitive": "hash"
699695
},
696+
{
697+
"pattern": "BLAKE2b-(160|256|384|512)-HMAC",
698+
"primitive": "mac"
699+
},
700+
{
701+
"pattern": "BLAKE2s-(160|256)",
702+
"primitive": "hash"
703+
},
700704
{
701705
"pattern": "BLAKE2b-(160|256|384|512)-HMAC",
702706
"primitive": "mac"
703707
}
704708
]
705709
},
710+
{
711+
"family": "BLAKE3",
712+
"standard": [
713+
{"name": "BLAKE3 Spec", "url": "https://github.com/BLAKE3-team/BLAKE3-specs/blob/master/blake3.pdf"}
714+
],
715+
"variant": [
716+
{
717+
"pattern": "BLAKE3[-{outputLength}]",
718+
"primitive": "hash"
719+
}
720+
]
721+
},
706722
{
707723
"family": "X3DH",
708724
"standard": [
@@ -810,6 +826,180 @@
810826
"primitive": "kdf"
811827
}
812828
]
829+
},
830+
{
831+
"family": "MD2",
832+
"standard": [
833+
{"name": "RFC1319", "url": "https://doi.org/10.17487/RFC1319"}
834+
],
835+
"variant": [
836+
{
837+
"pattern": "MD2",
838+
"primitive": "hash"
839+
}
840+
]
841+
},
842+
{
843+
"family": "MD4",
844+
"standard": [
845+
{"name": "RFC1320", "url": "https://doi.org/10.17487/RFC1320"}
846+
],
847+
"variant": [
848+
{
849+
"pattern": "MD4",
850+
"primitive": "hash"
851+
}
852+
]
853+
},
854+
{
855+
"family": "MD5",
856+
"standard": [
857+
{"name": "RFC1321", "url": "https://doi.org/10.17487/RFC1321"}
858+
],
859+
"variant": [
860+
{
861+
"pattern": "MD5",
862+
"primitive": "hash"
863+
}
864+
]
865+
},
866+
{
867+
"family": "RIPEMD",
868+
"standard": [
869+
{"name": "ISO10118-3", "url": "https://www.iso.org/standard/67116.html"}
870+
],
871+
"variant": [
872+
{
873+
"pattern": "RIPEMD-(128|160|256|320)",
874+
"primitive": "hash"
875+
}
876+
]
877+
},
878+
{
879+
"family": "Whirlpool",
880+
"standard": [
881+
{"name": "ISO10118-3", "url": "https://www.iso.org/standard/67116.html"},
882+
{"name": "NESSIE", "url": "https://www.cosic.esat.kuleuven.be/nessie/"}
883+
],
884+
"variant": [
885+
{
886+
"pattern": "Whirlpool",
887+
"primitive": "hash"
888+
}
889+
]
890+
},
891+
{
892+
"family": "Serpent",
893+
"standard": [
894+
{"name": "AES Finalist", "url": "https://www.cl.cam.ac.uk/~rja14/serpent.html"}
895+
],
896+
"variant": [
897+
{
898+
"pattern": "Serpent-(128|192|256)[-{mode}][-{padding}]",
899+
"primitive": "block-cipher"
900+
}
901+
]
902+
},
903+
{
904+
"family": "CAST5",
905+
"standard": [
906+
{"name": "RFC2144", "url": "https://doi.org/10.17487/RFC2144"}
907+
],
908+
"variant": [
909+
{
910+
"pattern": "CAST5[-{keyLength}][-{mode}]",
911+
"primitive": "block-cipher"
912+
}
913+
]
914+
},
915+
{
916+
"family": "CAST6",
917+
"standard": [
918+
{"name": "RFC2612", "url": "https://doi.org/10.17487/RFC2612"}
919+
],
920+
"variant": [
921+
{
922+
"pattern": "CAST6[-{keyLength}][-{mode}]",
923+
"primitive": "block-cipher"
924+
}
925+
]
926+
},
927+
{
928+
"family": "RC5",
929+
"standard": [
930+
{"name": "RFC2040", "url": "https://doi.org/10.17487/RFC2040"}
931+
],
932+
"variant": [
933+
{
934+
"pattern": "RC5[-{keyLength}][-{mode}]",
935+
"primitive": "block-cipher"
936+
}
937+
]
938+
},
939+
{
940+
"family": "HC",
941+
"standard": [
942+
{"name": "eSTREAM", "url": "https://www.ecrypt.eu.org/stream/"}
943+
],
944+
"variant": [
945+
{
946+
"pattern": "HC-128",
947+
"primitive": "stream-cipher"
948+
},
949+
{
950+
"pattern": "HC-256",
951+
"primitive": "stream-cipher"
952+
}
953+
]
954+
},
955+
{
956+
"family": "RABBIT",
957+
"standard": [
958+
{"name": "RFC4503", "url": "https://doi.org/10.17487/RFC4503"},
959+
{"name": "eSTREAM", "url": "https://www.ecrypt.eu.org/stream/"}
960+
],
961+
"variant": [
962+
{
963+
"pattern": "RABBIT",
964+
"primitive": "stream-cipher"
965+
}
966+
]
967+
},
968+
{
969+
"family": "Ascon",
970+
"standard": [
971+
{"name": "NIST SP 800-232", "url": "https://doi.org/10.6028/NIST.SP.800-232"}
972+
],
973+
"variant": [
974+
{
975+
"pattern": "Ascon-AEAD128",
976+
"primitive": "ae"
977+
},
978+
{
979+
"pattern": "Ascon-Hash256",
980+
"primitive": "hash"
981+
},
982+
{
983+
"pattern": "Ascon-XOF128",
984+
"primitive": "xof"
985+
},
986+
{
987+
"pattern": "Ascon-CXOF128",
988+
"primitive": "xof"
989+
}
990+
]
991+
},
992+
{
993+
"family": "SipHash",
994+
"standard": [
995+
{"name": "SipHash Spec", "url": "https://131002.net/siphash/"}
996+
],
997+
"variant": [
998+
{
999+
"pattern": "SipHash[-{compressionRounds}-{finalizationRounds}]",
1000+
"primitive": "hash"
1001+
}
1002+
]
8131003
}
8141004
],
8151005
"ellipticCurves": [

0 commit comments

Comments
 (0)