Consistent use of kdf for password-based key derivation algorithms, add hashAlgorithm prefix for yescrypt

bhess · bhess · commit ca4d2f62984f · 2026-03-05T14:13:17.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
@@ -1653,7 +1653,7 @@
       "variant": [
         {
           "pattern": "bcrypt[-{cost}]",
-          "primitive": "hash"
+          "primitive": "kdf"
         }
       ]
     },
@@ -1668,7 +1668,7 @@
       "variant": [
         {
           "pattern": "scrypt[-{N}][-{r}][-{p}][-{dkLen}]",
-          "primitive": "hash"
+          "primitive": "kdf"
         }
       ]
     },
@@ -1682,8 +1682,8 @@
       ],
       "variant": [
         {
-          "pattern": "[(gost-|sm3-)]yescrypt[-{N_log2}][-{r}][-{p}][-{t}]",
-          "primitive": "hash"
+          "pattern": "[{hashAlgorithm}-]yescrypt[-{N_log2}][-{r}][-{p}][-{t}]",
+          "primitive": "kdf"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -1653,7 +1653,7 @@`
`1653`	`1653`	`"variant": [`
`1654`	`1654`	`{`
`1655`	`1655`	`"pattern": "bcrypt[-{cost}]",`
`1656`		`- "primitive": "hash"`
	`1656`	`+ "primitive": "kdf"`
`1657`	`1657`	`}`
`1658`	`1658`	`]`
`1659`	`1659`	`},`
`@@ -1668,7 +1668,7 @@`
`1668`	`1668`	`"variant": [`
`1669`	`1669`	`{`
`1670`	`1670`	`"pattern": "scrypt[-{N}][-{r}][-{p}][-{dkLen}]",`
`1671`		`- "primitive": "hash"`
	`1671`	`+ "primitive": "kdf"`
`1672`	`1672`	`}`
`1673`	`1673`	`]`
`1674`	`1674`	`},`
`@@ -1682,8 +1682,8 @@`
`1682`	`1682`	`],`
`1683`	`1683`	`"variant": [`
`1684`	`1684`	`{`
`1685`		`- "pattern": "[(gost-\|sm3-)]yescrypt[-{N_log2}][-{r}][-{p}][-{t}]",`
`1686`		`- "primitive": "hash"`
	`1685`	`+ "pattern": "[{hashAlgorithm}-]yescrypt[-{N_log2}][-{r}][-{p}][-{t}]",`
	`1686`	`+ "primitive": "kdf"`
`1687`	`1687`	`}`
`1688`	`1688`	`]`
`1689`	`1689`	`},`