Merge branch 'master' into feat/crypto-registry-shangmi-sm2-sm3-sm4-sm9

Author: stevespringett

schema/cryptography-defs.json

@@ -297,7 +297,7 @@
           "primitive": "mac"
         },
         {
-          "pattern": "HMACXOF(128|256)",
+          "pattern": "KMACXOF(128|256)",
           "primitive": "mac"
         },
         {