From 3010b1730e1de86a29dd68eba8c6ab5c8e096345 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 2 Dec 2004 17:05:38 +0000 Subject: [PATCH] sha1_block_asm_data_order can't hash if message crosses 2GB boundary. [back-port from HEAD branch] --- crypto/sha/asm/sha1-586.pl | 2 +- fips/sha1/asm/sx86-elf.s | 2 +- fips/sha1/fingerprint.sha1 | 2 +- fips/sha1/standalone.sha1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/sha/asm/sha1-586.pl b/crypto/sha/asm/sha1-586.pl index e00f709553..041acc0348 100644 --- a/crypto/sha/asm/sha1-586.pl +++ b/crypto/sha/asm/sha1-586.pl @@ -405,7 +405,7 @@ sub sha1_block_data &mov(&DWP(16,$tmp1,"",0),$E); &cmp("esi","eax"); &mov(&DWP( 4,$tmp1,"",0),$B); - &jl(&label("start")); + &jb(&label("start")); &stack_pop(18+9); &pop("edi"); diff --git a/fips/sha1/asm/sx86-elf.s b/fips/sha1/asm/sx86-elf.s index 2cdd009a24..a9799688a9 100644 --- a/fips/sha1/asm/sx86-elf.s +++ b/fips/sha1/asm/sx86-elf.s @@ -1500,7 +1500,7 @@ sha1_block_asm_data_order: movl %edi, 16(%ebp) cmpl %eax, %esi movl %ecx, 4(%ebp) - jl .L000start + jb .L000start addl $108, %esp popl %edi popl %ebx diff --git a/fips/sha1/fingerprint.sha1 b/fips/sha1/fingerprint.sha1 index e8593f2ef8..2f2d0896c0 100644 --- a/fips/sha1/fingerprint.sha1 +++ b/fips/sha1/fingerprint.sha1 @@ -1,5 +1,5 @@ HMAC-SHA1(fips_sha1dgst.c)= 10575600a9540eb15188a7d3b0b031e60aedbc18 HMAC-SHA1(fips_sha1_selftest.c)= 98910a0c85eff1688bd7adb23e738dc75b39546e -HMAC-SHA1(asm/sx86-elf.s)= 6286cba0ea3b071e67ab5c1e607d1387de6a871d +HMAC-SHA1(asm/sx86-elf.s)= cb91f86229e31e8093174604a3191321b23aac33 HMAC-SHA1(fips_sha_locl.h)= 4a83a6c5181483244e0f44a902225425835f54bc HMAC-SHA1(fips_md32_common.h)= 1c7e761db430067391b1b7b86da5d2bf6df92834 diff --git a/fips/sha1/standalone.sha1 b/fips/sha1/standalone.sha1 index 054987516f..075b150b93 100644 --- a/fips/sha1/standalone.sha1 +++ b/fips/sha1/standalone.sha1 @@ -1,6 +1,6 @@ HMAC-SHA1(fips_sha1dgst.c)= 10575600a9540eb15188a7d3b0b031e60aedbc18 HMAC-SHA1(fips_sha1_selftest.c)= 98910a0c85eff1688bd7adb23e738dc75b39546e -HMAC-SHA1(asm/sx86-elf.s)= 6286cba0ea3b071e67ab5c1e607d1387de6a871d +HMAC-SHA1(asm/sx86-elf.s)= cb91f86229e31e8093174604a3191321b23aac33 HMAC-SHA1(fips_standalone_sha1.c)= 93203c569097189b47a0085bc9fc55193867d4ce HMAC-SHA1(fips_sha_locl.h)= 4a83a6c5181483244e0f44a902225425835f54bc HMAC-SHA1(fips_md32_common.h)= 1c7e761db430067391b1b7b86da5d2bf6df92834 -- 2.25.1