Merge branch 'master' into feat/crypto-registry-srp-jpake

Author: stevespringett

schema/cryptography-defs.json

@@ -1070,6 +1070,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": [
@@ -1089,6 +1104,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": [
@@ -1399,6 +1444,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": [

schema/cryptography-defs.schema.json

@@ -248,6 +248,7 @@
         "A5/2",
         "AES",
         "ARIA",
+        "Argon2",
         "Ascon",
         "BLAKE2",
         "BLAKE3",
@@ -286,6 +287,7 @@
         "ML-DSA",
         "ML-KEM",
         "MQV",
+        "OPAQUE",
         "PBES1",
         "PBES2",
         "PBKDF1",