Add constant size check in wp_kdf_krb5kdf_derive

padelsbach · padelsbach · commit 464e45d49587 · 2026-04-01T22:20:16.000-07:00
diff --git a/src/wp_krb5kdf.c b/src/wp_krb5kdf.c
@@ -469,6 +469,9 @@ static int wp_kdf_krb5kdf_derive(wp_Krb5kdfCtx* ctx, unsigned char* key,
     if (ok && (wp_kdf_krb5kdf_expected_key_size(ctx) != (int)ctx->keySz)) {
         ok = 0;
     }
+    if (ok && (ctx->constant == NULL || ctx->constantSz == 0)) {
+        ok = 0;
+    }
     if (ok) {
         XMEMSET(key, 0, keyLen);
 

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,9 @@ static int wp_kdf_krb5kdf_derive(wp_Krb5kdfCtx* ctx, unsigned char* key,`
`469`	`469`	`if (ok && (wp_kdf_krb5kdf_expected_key_size(ctx) != (int)ctx->keySz)) {`
`470`	`470`	`ok = 0;`
`471`	`471`	`}`
	`472`	`+ if (ok && (ctx->constant == NULL \|\| ctx->constantSz == 0)) {`
	`473`	`+ ok = 0;`
	`474`	`+ }`
`472`	`475`	`if (ok) {`
`473`	`476`	`XMEMSET(key, 0, keyLen);`
`474`	`477`