[pull] master from CycloneDX:master

schema/cryptography-defs.json

@@ -297,7 +297,7 @@
           "primitive": "mac"
         },
         {
-          "pattern": "HMACXOF(128|256)",
+          "pattern": "KMACXOF(128|256)",
           "primitive": "mac"
         },
         {
@@ -353,6 +353,16 @@
           "pattern": "AES[-(128|192|256)][-(GCM|CCM)][-{tagLength}][-{ivLength}]",
           "primitive": "ae"
         },
+        {
+          "standard": [
+            {
+              "name": "RFC8452",
+              "url": "https://doi.org/10.17487/RFC8452"
+            }
+          ],
+          "pattern": "AES[-(128|192|256)]-GCM-SIV[-{tagLength}][-{ivLength}]",
+          "primitive": "ae"
+        },
         {
           "standard": [
             {
@@ -363,6 +373,16 @@
           "pattern": "AES[-(128|192|256)]-CTR-HMAC-SHA1[-96]",
           "primitive": "ae"
         },
+        {
+          "standard": [
+            {
+              "name": "RFC 5297",
+              "url": "https://doi.org/10.17487/RFC5297"
+            }
+          ],
+          "pattern": "AES[-(128|192|256)]-SIV",
+          "primitive": "ae"
+        },
         {
           "standard": [
             {
@@ -457,6 +477,21 @@
         }
       ]
     },
+    {
+      "family": "UMAC",
+      "standard": [
+        {
+          "name": "RFC4418",
+          "url": "https://doi.org/10.17487/RFC4418"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "UMAC[-(32|64|96|128)]",
+          "primitive": "mac"
+        }
+      ]
+    },
     {
       "family": "ChaCha",
       "standard": [
@@ -602,7 +637,7 @@
         },
         {
           "name": "ANSI INCITS 92-1981",
-          "url": "https://csrc.nist.gov/pubs/fips/46-3/final"
+          "url": "https://webstore.ansi.org/standards/incits/ansiincits921981r2003"
         }
       ],
       "variant": [
@@ -827,6 +862,90 @@
         }
       ]
     },
+    {
+      "family": "SM2",
+      "standard": [
+        {
+          "name": "RFC8998",
+          "url": "https://www.rfc-editor.org/rfc/rfc8998.html"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SM2[-256]",
+          "primitive": "signature"
+        },
+        {
+          "pattern": "SM2-(ENC|ENCRYPTION)[-256]",
+          "primitive": "pke"
+        },
+        {
+          "pattern": "SM2-(KEX|KEYEXCHANGE|KEY-EXCHANGE|KEYAGREE|KEY-AGREE|KEYAGREEMENT|KEY-AGREEMENT)[-256]",
+          "primitive": "key-agree"
+        }
+      ]
+    },
+    {
+      "family": "SM3",
+      "standard": [
+        {
+          "name": "RFC8998",
+          "url": "https://www.rfc-editor.org/rfc/rfc8998.html"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SM3",
+          "primitive": "hash"
+        }
+      ]
+    },
+    {
+      "family": "SM4",
+      "standard": [
+        {
+          "name": "ISO/IEC18033-3:2010/Amd1:2021",
+          "url": "https://www.iso.org/standard/81564.html"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SM4[-(ECB|CBC|CFB|OFB|CTR|XTS)][-{padding}][-{ivlen}]",
+          "primitive": "block-cipher"
+        },
+        {
+          "pattern": "SM4-(GCM|CCM)[-{tagLength}][-{ivLength}]",
+          "primitive": "ae"
+        }
+      ]
+    },
+    {
+      "family": "SM9",
+      "standard": [
+        {
+          "name": "GM/T0044.1-2016",
+          "url": "https://www.gmbz.org.cn/upload/2025-01-23/1737625691994053970.pdf"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SM9-(SIG|SIGNATURE)",
+          "primitive": "signature"
+        },
+        {
+          "pattern": "SM9-(KEX|KEYEXCHANGE|KEY-EXCHANGE|KEYAGREE|KEYAGREEMENT|KEY-AGREE|KEY-AGREEMENT)",
+          "primitive": "key-agree"
+        },
+        {
+          "pattern": "SM9-(KEM|KEYENCAPSULATION|KEY-ENCAPSULATION)",
+          "primitive": "kem"
+        },
+        {
+          "pattern": "SM9-(ENC|ENCRYPTION|PKE|PUBLICKEY-ENCRYPTION|PUBLIC-KEY-ENCRYPTION)",
+          "primitive": "pke"
+        }
+      ]
+    },
     {
       "family": "SEED",
       "standard": [
@@ -1028,6 +1147,21 @@
         }
       ]
     },
+    {
+      "family": "OPAQUE",
+      "standard": [
+        {
+          "name": "RFC9807",
+          "url": "https://doi.org/10.17487/RFC9807"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "OPAQUE-3DH[-{group}][-{hashFunction}][-{ksf}][-{kdf}][-{mac}]",
+          "primitive": "key-agree"
+        }
+      ]
+    },
     {
       "family": "MILENAGE",
       "standard": [
@@ -1047,6 +1181,36 @@
         }
       ]
     },
+    {
+      "family": "SPAKE2",
+      "standard": [
+        {
+          "name": "RFC9382",
+          "url": "https://doi.org/10.17487/RFC9382"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SPAKE2[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
+          "primitive": "key-agree"
+        }
+      ]
+    },
+    {
+      "family": "SPAKE2PLUS",
+      "standard": [
+        {
+          "name": "RFC9383",
+          "url": "https://doi.org/10.17487/RFC9383"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "SPAKE2+[-{group}][-{hashFunction}][-{kdf}][-{mac}]",
+          "primitive": "key-agree"
+        }
+      ]
+    },
     {
       "family": "TUAK",
       "standard": [
@@ -1357,6 +1521,21 @@
         }
       ]
     },
+    {
+      "family": "Argon2",
+      "standard": [
+        {
+          "name": "RFC9106",
+          "url": "https://doi.org/10.17487/RFC9106"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "Argon2(id|i|d)[-{memoryKiB}][-{passes}][-{parallelism}][-{saltLenBytes}][-{secretLenBytes}][-{associatedDataLenBytes}][-{tagLenBytes}]",
+          "primitive": "kdf"
+        }
+      ]
+    },
     {
       "family": "PBKDF1",
       "standard": [
@@ -1451,6 +1630,21 @@
         }
       ]
     },
+    {
+      "family": "scrypt",
+      "standard": [
+        {
+          "name": "RFC7914",
+          "url": "https://doi.org/10.17487/RFC7914"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "scrypt[-{N}][-{r}][-{p}][-{dkLen}]",
+          "primitive": "hash"
+        }
+      ]
+    },
     {
       "family": "A5/1",
       "variant": [
@@ -1519,6 +1713,51 @@
           "primitive": "drbg"
         }
       ]
+    },
+    {
+      "family": "CTR_DRBG",
+      "standard": [
+        {
+          "name": "SP800-90Ar1",
+          "url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "CTR_DRBG[-{cipherAlgorithm}][-{keyLength}]",
+          "primitive": "drbg"
+        }
+      ]
+    },
+    {
+      "family": "Hash_DRBG",
+      "standard": [
+        {
+          "name": "SP800-90Ar1",
+          "url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "Hash_DRBG[-{hashFunction}]",
+          "primitive": "drbg"
+        }
+      ]
+    },
+    {
+      "family": "HMAC_DRBG",
+      "standard": [
+        {
+          "name": "SP800-90Ar1",
+          "url": "https://doi.org/10.6028/NIST.SP.800-90Ar1"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "HMAC_DRBG[-{hashFunction}]",
+          "primitive": "drbg"
+        }
+      ]
     }
   ],
   "ellipticCurves": [

schema/cryptography-defs.schema.json

@@ -248,6 +248,7 @@
         "A5/2",
         "AES",
         "ARIA",
+        "Argon2",
         "Ascon",
         "BLAKE2",
         "BLAKE3",
@@ -260,6 +261,7 @@
         "CMEA",
         "ChaCha",
         "ChaCha20",
+        "CTR_DRBG",
         "DES",
         "DSA",
         "ECDH",
@@ -270,10 +272,12 @@
         "FFDH",
         "Fortuna",
         "GOST",
+        "Hash_DRBG",
         "HPKE",
         "HC",
         "HKDF",
         "HMAC",
+        "HMAC_DRBG",
         "IDEA",
         "IKE-PRF",
         "KMAC",
@@ -285,6 +289,7 @@
         "ML-DSA",
         "ML-KEM",
         "MQV",
+        "OPAQUE",
         "PBES1",
         "PBES2",
         "PBKDF1",
@@ -301,11 +306,16 @@
         "RSAES-PKCS1",
         "RSASSA-PKCS1",
         "RSASSA-PSS",
+        "scrypt",
         "SEED",
         "SHA-1",
         "SHA-2",
         "SHA-3",
         "SLH-DSA",
+        "SM2",
+        "SM3",
+        "SM4",
+        "SM9",
         "SNOW3G",
         "SP800-108",
         "Salsa20",
@@ -314,6 +324,7 @@
         "Skipjack",
         "TUAK",
         "Twofish",
+        "UMAC",
         "Whirlpool",
         "X3DH",
         "XMSS",
@@ -574,4 +585,4 @@
       ]
     }
   }
-}
+}