ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 07:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/crypto/sha2: Fix overflow for large amounts of hashed data

Browse Source
This commit is contained in:
Yawning Angel
2023-11-17 19:31:51 +09:00
parent 582bd760b7
commit 71da3ef925
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/crypto/sha2/sha2.odin
+6 -5
View File
@@ -427,7 +427,8 @@ update :: proc(ctx: ^$T, data: []byte) {
} }
final :: proc(ctx: ^$T, hash: []byte) { final :: proc(ctx: ^$T, hash: []byte) {
block_nb, pm_len, len_b: u32 block_nb, pm_len: uint
len_b: u64
if len(hash) * 8 < ctx.md_bits { if len(hash) * 8 < ctx.md_bits {
panic("crypto/sha2: invalid destination digest size") panic("crypto/sha2: invalid destination digest size")
@@ -437,15 +438,15 @@ final :: proc(ctx: ^$T, hash: []byte) {
when T == Sha256_Context {block_nb = 1 + ((CURR_BLOCK_SIZE - 9) < (ctx.length % CURR_BLOCK_SIZE) ? 1 : 0)} else when T == Sha512_Context {block_nb = 1 + ((CURR_BLOCK_SIZE - 17) < (ctx.length % CURR_BLOCK_SIZE) ? 1 : 0)} when T == Sha256_Context {block_nb = 1 + ((CURR_BLOCK_SIZE - 9) < (ctx.length % CURR_BLOCK_SIZE) ? 1 : 0)} else when T == Sha512_Context {block_nb = 1 + ((CURR_BLOCK_SIZE - 17) < (ctx.length % CURR_BLOCK_SIZE) ? 1 : 0)}
len_b = u32(ctx.tot_len + ctx.length) << 3 len_b = u64(ctx.tot_len + ctx.length) << 3
when T == Sha256_Context {pm_len = block_nb << 6} else when T == Sha512_Context {pm_len = block_nb << 7} when T == Sha256_Context {pm_len = block_nb << 6} else when T == Sha512_Context {pm_len = block_nb << 7}
mem.set(rawptr(&(ctx.block[ctx.length:])[0]), 0, int(uint(pm_len) - ctx.length)) mem.set(rawptr(&(ctx.block[ctx.length:])[0]), 0, int(pm_len - ctx.length))
ctx.block[ctx.length] = 0x80 ctx.block[ctx.length] = 0x80
endian.unchecked_put_u32be(ctx.block[pm_len - 4:], len_b) endian.unchecked_put_u64be(ctx.block[pm_len - 8:], len_b)
sha2_transf(ctx, ctx.block[:], uint(block_nb)) sha2_transf(ctx, ctx.block[:], block_nb)
when T == Sha256_Context { when T == Sha256_Context {
for i := 0; i < ctx.md_bits / 32; i += 1 { for i := 0; i < ctx.md_bits / 32; i += 1 {