Merge branch 'master' into feat/crypto-registry-aes-ctr-hmac

Author: stevespringett

schema/cryptography-defs.json

@@ -478,6 +478,10 @@
         {
           "pattern": "ChaCha20-Poly1305",
           "primitive": "ae"
+        },
+        {
+          "pattern": "XChaCha20-Poly1305",
+          "primitive": "ae"
         }
       ]
     },
@@ -1028,11 +1032,11 @@
       ],
       "variant": [
         {
-          "pattern": "TUAC[-MAC]",
+          "pattern": "TUAK[-MAC]",
           "primitive": "mac"
         },
         {
-          "pattern": "TUAC[-KDF]",
+          "pattern": "TUAK[-KDF]",
           "primitive": "kdf"
         }
       ]
@@ -1417,7 +1421,7 @@
       ],
       "variant": [
         {
-          "pattern": "bcrypt[-{cost)]",
+          "pattern": "bcrypt[-{cost}]",
           "primitive": "hash"
         }
       ]

tools/src/test/js/package.json

@@ -8,7 +8,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
     "ajv-formats-draft2019": "^1.6.1",
-    "glob": "^11.0.0",
+    "glob": "^13.0.0",
     "npm-run-all": "^4.1.5"
   },
   "devDependencies": {