Merge branch 'master' into fix/crypto-registry-blake2-dup

Author: stevespringett

schema/cryptography-defs.json

@@ -122,6 +122,21 @@
           "primitive": "pke"
         }
       ]
+    },   
+    {
+      "family": "HPKE",
+      "standard": [
+        {
+          "name": "RFC9180",
+          "url": "https://doi.org/10.17487/RFC9180"
+        }
+      ],
+      "variant": [
+        {
+          "pattern": "HPKE[-(mode_base|mode_psk|mode_auth|mode_auth_psk)]-{kem}-{kdf}-{aead}",
+          "primitive": "pke"
+        }
+      ]
     },
     {
       "family": "MQV",
@@ -331,13 +346,23 @@
               "url": "https://doi.org/10.6028/NIST.SP.800-38D"
             },
             {
-              "name": "RFC 3610",
-              "url": "https://doi.org/10.17487/RFC5116"
+              "name": "RFC3610",
+              "url": "https://doi.org/10.17487/RFC3610"
             }
           ],
           "pattern": "AES[-(128|192|256)][-(GCM|CCM)][-{tagLength}][-{ivLength}]",
           "primitive": "ae"
         },
+        {
+          "standard": [
+            {
+              "name": "RFC 3686",
+              "url": "https://doi.org/10.17487/RFC3686"
+            }
+          ],
+          "pattern": "AES[-(128|192|256)]-CTR-HMAC-SHA1[-96]",
+          "primitive": "ae"
+        },
         {
           "standard": [
             {
@@ -352,6 +377,16 @@
           "pattern": "AES[-(128|192|256)][-(GMAC|CMAC)]",
           "primitive": "mac"
         },
+        {
+          "standard": [
+            {
+              "name": "RFC4615",
+              "url": "https://doi.org/10.17487/RFC4615"
+            }
+          ],
+          "pattern": "AES-CMAC-PRF-128",
+          "primitive": "mac"
+        },        
         {
           "pattern": "AES[-(128|192|256)][-(XCBC_MAC[_96])]",
           "primitive": "mac"