From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 20 Nov 2023 16:46:26 +0000 (+0100)
Subject: SHA3_squeeze(): The next argument is int
X-Git-Tag: openssl-3.3.0-alpha1~577
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f58d39fb9f6072b58f14faa8d6df40c4fdd83113;p=thirdparty%2Fopenssl.git

SHA3_squeeze(): The next argument is int

Amend the assembler so it uses only 32bit value.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22750)
---

diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl
index 72f8c3adb57..7566a7e3ece 100755
--- a/crypto/sha/asm/keccak1600-armv8.pl
+++ b/crypto/sha/asm/keccak1600-armv8.pl
@@ -483,7 +483,7 @@ SHA3_squeeze:
 	mov	$out,x1
 	mov	$len,x2
 	mov	$bsz,x3
-	cmp	x4, #0				// x4 = 'next' argument
+	cmp	w4, #0				// w4 = 'next' argument
 	bne	.Lnext_block
 
 .Loop_squeeze:
diff --git a/crypto/sha/asm/keccak1600-ppc64.pl b/crypto/sha/asm/keccak1600-ppc64.pl
index fe7d6db20e4..54f32e8c929 100755
--- a/crypto/sha/asm/keccak1600-ppc64.pl
+++ b/crypto/sha/asm/keccak1600-ppc64.pl
@@ -668,7 +668,7 @@ SHA3_squeeze:
 	subi	$out,r4,1		; prepare for stbu
 	mr	$len,r5
 	mr	$bsz,r6
-	${UCMP}i r7,0                   ; r7 = 'next' argument
+	cmplwi	r7,0                    ; r7 = 'next' argument
 	bne	.Lnext_block
 	b	.Loop_squeeze
 
diff --git a/crypto/sha/asm/keccak1600-x86_64.pl b/crypto/sha/asm/keccak1600-x86_64.pl
index bddcaf82941..78aa5c64aff 100755
--- a/crypto/sha/asm/keccak1600-x86_64.pl
+++ b/crypto/sha/asm/keccak1600-x86_64.pl
@@ -524,7 +524,7 @@ SHA3_squeeze:
 	mov	%rsi,$out
 	mov	%rdx,$len
 	mov	%rcx,$bsz
-	bt	\$0,$next
+	bt	\$0,${next}d
 	jc	.Lnext_block
 	jmp	.Loop_squeeze