Add hashAlgorithm to IKE-PRF

jvdsn · web-flow · commit 7c03de546e1c · 2026-03-11T16:02:26.000-07:00
fixes CycloneDX#872 Also changes primitive to "kdf" since this is a KDF, not a key agreement function. Signed-off-by: Joachim Vandersmissen <git@jvdsn.com>
diff --git a/schema/cryptography-defs.json b/schema/cryptography-defs.json
@@ -821,16 +821,16 @@
       ],
       "variant": [
         {
-          "pattern": "IKE_PRF_DERIVE",
-          "primitive": "key-agree"
+          "pattern": "IKE_PRF_DERIVE[-{hashAlgorithm}]",
+          "primitive": "kdf"
         },
         {
-          "pattern": "IKE1_(PRF|Extended)_DERIVE",
-          "primitive": "key-agree"
+          "pattern": "IKE1_(PRF|Extended)_DERIVE[-{hashAlgorithm}]",
+          "primitive": "kdf"
         },
         {
-          "pattern": "IKE2_PRF_PLUS_DERIVE",
-          "primitive": "key-agree"
+          "pattern": "IKE2_PRF_PLUS_DERIVE[-{hashAlgorithm}]",
+          "primitive": "kdf"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -821,16 +821,16 @@`
`821`	`821`	`],`
`822`	`822`	`"variant": [`
`823`	`823`	`{`
`824`		`- "pattern": "IKE_PRF_DERIVE",`
`825`		`- "primitive": "key-agree"`
	`824`	`+ "pattern": "IKE_PRF_DERIVE[-{hashAlgorithm}]",`
	`825`	`+ "primitive": "kdf"`
`826`	`826`	`},`
`827`	`827`	`{`
`828`		`- "pattern": "IKE1_(PRF\|Extended)_DERIVE",`
`829`		`- "primitive": "key-agree"`
	`828`	`+ "pattern": "IKE1_(PRF\|Extended)_DERIVE[-{hashAlgorithm}]",`
	`829`	`+ "primitive": "kdf"`
`830`	`830`	`},`
`831`	`831`	`{`
`832`		`- "pattern": "IKE2_PRF_PLUS_DERIVE",`
`833`		`- "primitive": "key-agree"`
	`832`	`+ "pattern": "IKE2_PRF_PLUS_DERIVE[-{hashAlgorithm}]",`
	`833`	`+ "primitive": "kdf"`
`834`	`834`	`}`
`835`	`835`	`]`
`836`	`836`	`},`