Remove duplicate KDF, merge with kdf with SP800-108r1

bhess · bhess · commit 3c92ef0ec714 · 2026-02-26T14:48:49.000+01:00
Signed-off-by: Basil Hess &lt;bhe@zurich.ibm.com&gt;
diff --git a/schema/cryptography-defs.json b/schema/cryptography-defs.json
@@ -504,21 +504,6 @@
         }
       ]
     },
-    {
-      "family": "KMAC",
-      "standard": [
-        {
-          "name": "SP800-108r1",
-          "url": "https://doi.org/10.6028/NIST.SP.800-108r1-upd1"
-        }
-      ],
-      "variant": [
-        {
-          "pattern": "KMAC[-(128|256)]",
-          "primitive": "mac"
-        }
-      ]
-    },
     {
       "family": "UMAC",
       "standard": [
@@ -1108,7 +1093,7 @@
       ],
       "variant": [
         {
-          "pattern": "SP800_108_(CounterKDF|FeedbackKDF|DoublePipelineKDF)[-{prfFunction}][-{dkmLength}]",
+          "pattern": "SP800_108_(CounterKDF|FeedbackKDF|DoublePipelineKDF|KMAC)[-{prfFunction}][-{dkmLength}]",
           "primitive": "key-derive"
         }
       ]

Original file line number	Diff line number	Diff line change
`@@ -504,21 +504,6 @@`
`504`	`504`	`}`
`505`	`505`	`]`
`506`	`506`	`},`
`507`		`- {`
`508`		`- "family": "KMAC",`
`509`		`- "standard": [`
`510`		`- {`
`511`		`- "name": "SP800-108r1",`
`512`		`- "url": "https://doi.org/10.6028/NIST.SP.800-108r1-upd1"`
`513`		`- }`
`514`		`- ],`
`515`		`- "variant": [`
`516`		`- {`
`517`		`- "pattern": "KMAC[-(128\|256)]",`
`518`		`- "primitive": "mac"`
`519`		`- }`
`520`		`- ]`
`521`		`- },`
`522`	`507`	`{`
`523`	`508`	`"family": "UMAC",`
`524`	`509`	`"standard": [`
`@@ -1108,7 +1093,7 @@`
`1108`	`1093`	`],`
`1109`	`1094`	`"variant": [`
`1110`	`1095`	`{`
`1111`		`- "pattern": "SP800_108_(CounterKDF\|FeedbackKDF\|DoublePipelineKDF)[-{prfFunction}][-{dkmLength}]",`
	`1096`	`+ "pattern": "SP800_108_(CounterKDF\|FeedbackKDF\|DoublePipelineKDF\|KMAC)[-{prfFunction}][-{dkmLength}]",`
`1112`	`1097`	`"primitive": "key-derive"`
`1113`	`1098`	`}`
`1114`	`1099`	`]`