From efdca85aec400d0e1d3edfd1b0917ccd63188d4d Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Mon, 14 Jul 2025 14:53:37 -0500 Subject: [PATCH 1/2] Fix blake2 final coverity issue --- wolfcrypt/src/blake2b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/blake2b.c b/wolfcrypt/src/blake2b.c index 311d19148..a974c0931 100644 --- a/wolfcrypt/src/blake2b.c +++ b/wolfcrypt/src/blake2b.c @@ -356,7 +356,7 @@ int blake2b_final( blake2b_state *S, byte *out, byte outlen ) } S->buflen -= BLAKE2B_BLOCKBYTES; - if ( S->buflen >= (BLAKE2B_BLOCKBYTES * 2) ) + if ( S->buflen > BLAKE2B_BLOCKBYTES ) return BAD_LENGTH_E; XMEMCPY( S->buf, S->buf + BLAKE2B_BLOCKBYTES, (wolfssl_word)S->buflen ); } From 9c2ea1256370f2b500d1e151f0164f895f1d2998 Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Mon, 14 Jul 2025 15:04:15 -0500 Subject: [PATCH 2/2] Fix blake2 final coverity issue --- wolfcrypt/src/blake2b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/blake2b.c b/wolfcrypt/src/blake2b.c index a974c0931..debcfa38e 100644 --- a/wolfcrypt/src/blake2b.c +++ b/wolfcrypt/src/blake2b.c @@ -358,7 +358,7 @@ int blake2b_final( blake2b_state *S, byte *out, byte outlen ) S->buflen -= BLAKE2B_BLOCKBYTES; if ( S->buflen > BLAKE2B_BLOCKBYTES ) return BAD_LENGTH_E; - XMEMCPY( S->buf, S->buf + BLAKE2B_BLOCKBYTES, (wolfssl_word)S->buflen ); + XMEMMOVE( S->buf, S->buf + BLAKE2B_BLOCKBYTES, (wolfssl_word)S->buflen ); } blake2b_increment_counter( S, S->buflen );