Skip to content

Commit a353785

Browse files
committed
Merge branch 'bugfix/fix_sha_data_overflow' into 'master'
util: fix sha384/512 data calculation overflow See merge request sdk/ESP8266_RTOS_SDK!1233
2 parents ca35376 + e0b7376 commit a353785

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

components/util/src/sha512.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,10 @@ int esp_sha384_finish(esp_sha384_t *ctx, void *dest)
256256

257257
ctx->buffer[used++] = 0x80;
258258

259-
memset(ctx->buffer + used, 0, 112 - used);
260-
261-
if (used > 112) {
259+
if (used <= 112)
260+
memset(ctx->buffer + used, 0, 112 - used);
261+
else {
262+
memset(ctx->buffer + used, 0, 128 - used);
262263
esp_sha512_transform(ctx, ctx->buffer);
263264
memset(ctx->buffer, 0, 112);
264265
}

0 commit comments

Comments
 (0)