Skip to content

Commit 315905b

Browse files
stevespringettstevespringett
authored
Merge branch 'master' into dependabot/github_actions/actions/download-artifact-7
2 parents 0bf9bd9 + a514d7a commit 315905b

2 files changed

Lines changed: 297 additions & 3 deletions

File tree

‎schema/cryptography-defs.json‎

Lines changed: 283 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,48 @@
237237
}
238238
]
239239
},
240+
{
241+
"family": "SRP",
242+
"standard": [
243+
{
244+
"name": "RFC2945",
245+
"url": "https://doi.org/10.17487/RFC2945"
246+
},
247+
{
248+
"name": "RFC5054",
249+
"url": "https://doi.org/10.17487/RFC5054"
250+
}
251+
],
252+
"variant": [
253+
{
254+
"pattern": "SRP-3[-{hashFunction}][-{namedGroup}]",
255+
"primitive": "key-agree"
256+
},
257+
{
258+
"pattern": "SRP-6[-{hashFunction}][-{namedGroup}]",
259+
"primitive": "key-agree"
260+
}
261+
]
262+
},
263+
{
264+
"family": "J-PAKE",
265+
"standard": [
266+
{
267+
"name": "RFC8236",
268+
"url": "https://doi.org/10.17487/RFC8236"
269+
}
270+
],
271+
"variant": [
272+
{
273+
"pattern": "J-PAKE[-{namedGroup}][-{kdf}][-{mac}]",
274+
"primitive": "key-agree"
275+
},
276+
{
277+
"pattern": "J-PAKE[-{ellipticCurve}][-{kdf}][-{mac}]",
278+
"primitive": "key-agree"
279+
}
280+
]
281+
},
240282
{
241283
"family": "SHA-1",
242284
"standard": [
@@ -297,7 +339,7 @@
297339
"primitive": "mac"
298340
},
299341
{
300-
"pattern": "HMACXOF(128|256)",
342+
"pattern": "KMACXOF(128|256)",
301343
"primitive": "mac"
302344
},
303345
{
@@ -353,6 +395,16 @@
353395
"pattern": "AES[-(128|192|256)][-(GCM|CCM)][-{tagLength}][-{ivLength}]",
354396
"primitive": "ae"
355397
},
398+
{
399+
"standard": [
400+
{
401+
"name": "RFC8452",
402+
"url": "https://doi.org/10.17487/RFC8452"
403+
}
404+
],
405+
"pattern": "AES[-(128|192|256)]-GCM-SIV[-{tagLength}][-{ivLength}]",
406+
"primitive": "ae"
407+
},
356408
{
357409
"standard": [
358410
{
@@ -363,6 +415,16 @@
363415
"pattern": "AES[-(128|192|256)]-CTR-HMAC-SHA1[-96]",
364416
"primitive": "ae"
365417
},
418+
{
419+
"standard": [
420+
{
421+
"name": "RFC 5297",
422+
"url": "https://doi.org/10.17487/RFC5297"
423+
}
424+
],
425+
"pattern": "AES[-(128|192|256)]-SIV",
426+
"primitive": "ae"
427+
},
366428
{
367429
"standard": [
368430
{
@@ -457,6 +519,21 @@
457519
}
458520
]
459521
},
522+
{
523+
"family": "UMAC",
524+
"standard": [
525+
{
526+
"name": "RFC4418",
527+
"url": "https://doi.org/10.17487/RFC4418"
528+
}
529+
],
530+
"variant": [
531+
{
532+
"pattern": "UMAC[-(32|64|96|128)]",
533+
"primitive": "mac"
534+
}
535+
]
536+
},
460537
{
461538
"family": "ChaCha",
462539
"standard": [
@@ -602,7 +679,7 @@
602679
},
603680
{
604681
"name": "ANSI INCITS 92-1981",
605-
"url": "https://csrc.nist.gov/pubs/fips/46-3/final"
682+
"url": "https://webstore.ansi.org/standards/incits/ansiincits921981r2003"
606683
}
607684
],
608685
"variant": [
@@ -827,6 +904,90 @@
827904
}
828905
]
829906
},
907+
{
908+
"family": "SM2",
909+
"standard": [
910+
{
911+
"name": "RFC8998",
912+
"url": "https://www.rfc-editor.org/rfc/rfc8998.html"
913+
}
914+
],
915+
"variant": [
916+
{
917+
"pattern": "SM2[-256]",
918+
"primitive": "signature"
919+
},
920+
{
921+
"pattern": "SM2-(ENC|ENCRYPTION)[-256]",
922+
"primitive": "pke"
923+
},
924+
{
925+
"pattern": "SM2-(KEX|KEYEXCHANGE|KEY-EXCHANGE|KEYAGREE|KEY-AGREE|KEYAGREEMENT|KEY-AGREEMENT)[-256]",
926+
"primitive": "key-agree"
927+
}
928+
]
929+
},
930+
{
931+
"family": "SM3",
932+
"standard": [
933+
{
934+
"name": "RFC8998",
935+
"url": "https://www.rfc-editor.org/rfc/rfc8998.html"
936+
}
937+
],
938+
"variant": [
939+
{
940+
"pattern": "SM3",
941+
"primitive": "hash"
942+
}
943+
]
944+
},
945+
{
946+
"family": "SM4",
947+
"standard": [
948+
{
949+
"name": "ISO/IEC18033-3:2010/Amd1:2021",
950+
"url": "https://www.iso.org/standard/81564.html"
951+
}
952+
],
953+
"variant": [
954+
{
955+
"pattern": "SM4[-(ECB|CBC|CFB|OFB|CTR|XTS)][-{padding}][-{ivlen}]",
956+
"primitive": "block-cipher"
957+
},
958+
{
959+
"pattern": "SM4-(GCM|CCM)[-{tagLength}][-{ivLength}]",
960+
"primitive": "ae"
961+
}
962+
]
963+
},
964+
{
965+
"family": "SM9",
966+
"standard": [
967+
{
968+
"name": "GM/T0044.1-2016",
969+
"url": "https://www.gmbz.org.cn/upload/2025-01-23/1737625691994053970.pdf"
970+
}
971+
],
972+
"variant": [
973+
{
974+
"pattern": "SM9-(SIG|SIGNATURE)",
975+
"primitive": "signature"
976+
},
977+
{
978+
"pattern": "SM9-(KEX|KEYEXCHANGE|KEY-EXCHANGE|KEYAGREE|KEYAGREEMENT|KEY-AGREE|KEY-AGREEMENT)",
979+
"primitive": "key-agree"
980+
},
981+
{
982+
"pattern": "SM9-(KEM|KEYENCAPSULATION|KEY-ENCAPSULATION)",
983+
"primitive": "kem"
984+
},
985+
{
986+
"pattern": "SM9-(ENC|ENCRYPTION|PKE|PUBLICKEY-ENCRYPTION|PUBLIC-KEY-ENCRYPTION)",
987+
"primitive": "pke"
988+
}
989+
]
990+
},
830991
{
831992
"family": "SEED",
832993
"standard": [
@@ -1028,6 +1189,21 @@
10281189
}
10291190
]
10301191
},
1192+
{
1193+
"family": "OPAQUE",
1194+
"standard": [
1195+
{
1196+
"name": "RFC9807",
1197+
"url": "https://doi.org/10.17487/RFC9807"
1198+
}
1199+
],
1200+
"variant": [
1201+
{
1202+
"pattern": "OPAQUE-3DH[-{group}][-{hashFunction}][-{ksf}][-{kdf}][-{mac}]",
1203+
"primitive": "key-agree"
1204+
}
1205+
]
1206+
},
10311207
{
10321208
"family": "MILENAGE",
10331209
"standard": [
@@ -1047,6 +1223,36 @@
10471223
}
10481224
]
10491225
},
1226+
{
1227+
"family": "SPAKE2",
1228+
"standard": [
1229+
{
1230+
"name": "RFC9382",
1231+
"url": "https://doi.org/10.17487/RFC9382"
1232+
}
1233+
],
1234+
"variant": [
1235+
{
1236+
"pattern": "SPAKE2[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
1237+
"primitive": "key-agree"
1238+
}
1239+
]
1240+
},
1241+
{
1242+
"family": "SPAKE2PLUS",
1243+
"standard": [
1244+
{
1245+
"name": "RFC9383",
1246+
"url": "https://doi.org/10.17487/RFC9383"
1247+
}
1248+
],
1249+
"variant": [
1250+
{
1251+
"pattern": "SPAKE2+[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
1252+
"primitive": "key-agree"
1253+
}
1254+
]
1255+
},
10501256
{
10511257
"family": "TUAK",
10521258
"standard": [
@@ -1357,6 +1563,21 @@
13571563
}
13581564
]
13591565
},
1566+
{
1567+
"family": "Argon2",
1568+
"standard": [
1569+
{
1570+
"name": "RFC9106",
1571+
"url": "https://doi.org/10.17487/RFC9106"
1572+
}
1573+
],
1574+
"variant": [
1575+
{
1576+
"pattern": "Argon2(id|i|d)[-{memoryKiB}][-{passes}][-{parallelism}][-{saltLenBytes}][-{secretLenBytes}][-{associatedDataLenBytes}][-{tagLenBytes}]",
1577+
"primitive": "kdf"
1578+
}
1579+
]
1580+
},
13601581
{
13611582
"family": "PBKDF1",
13621583
"standard": [
@@ -1451,6 +1672,21 @@
14511672
}
14521673
]
14531674
},
1675+
{
1676+
"family": "scrypt",
1677+
"standard": [
1678+
{
1679+
"name": "RFC7914",
1680+
"url": "https://doi.org/10.17487/RFC7914"
1681+
}
1682+
],
1683+
"variant": [
1684+
{
1685+
"pattern": "scrypt[-{N}][-{r}][-{p}][-{dkLen}]",
1686+
"primitive": "hash"
1687+
}
1688+
]
1689+
},
14541690
{
14551691
"family": "A5/1",
14561692
"variant": [
@@ -1519,6 +1755,51 @@
15191755
"primitive": "drbg"
15201756
}
15211757
]
1758+
},
1759+
{
1760+
"family": "CTR_DRBG",
1761+
"standard": [
1762+
{
1763+
"name": "SP800-90Ar1",
1764+
"url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
1765+
}
1766+
],
1767+
"variant": [
1768+
{
1769+
"pattern": "CTR_DRBG[-{cipherAlgorithm}][-{keyLength}]",
1770+
"primitive": "drbg"
1771+
}
1772+
]
1773+
},
1774+
{
1775+
"family": "Hash_DRBG",
1776+
"standard": [
1777+
{
1778+
"name": "SP800-90Ar1",
1779+
"url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
1780+
}
1781+
],
1782+
"variant": [
1783+
{
1784+
"pattern": "Hash_DRBG[-{hashFunction}]",
1785+
"primitive": "drbg"
1786+
}
1787+
]
1788+
},
1789+
{
1790+
"family": "HMAC_DRBG",
1791+
"standard": [
1792+
{
1793+
"name": "SP800-90Ar1",
1794+
"url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
1795+
}
1796+
],
1797+
"variant": [
1798+
{
1799+
"pattern": "HMAC_DRBG[-{hashFunction}]",
1800+
"primitive": "drbg"
1801+
}
1802+
]
15221803
}
15231804
],
15241805
"ellipticCurves": [

0 commit comments

Comments
 (0)