Skip to content

Commit 5aba3b0

Browse files
committed
Guard KBKDF memcpy for NULL IV
1 parent 9542ad5 commit 5aba3b0

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/wp_kbkdf.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,9 @@ static int wp_kdf_kbkdf_derive(wp_KbkdfCtx* ctx, unsigned char* key,
623623
ok = 0;
624624
}
625625
else {
626-
XMEMCPY(k_i, ctx->iv, ctx->ivLen);
626+
if (ctx->ivLen > 0) {
627+
XMEMCPY(k_i, ctx->iv, ctx->ivLen);
628+
}
627629
k_i_len = ctx->ivLen;
628630
/* Prep [L]2 */
629631
wp_c32toa((word32)(keyLen * 8), (byte *)&beL);

0 commit comments

Comments
 (0)