added gen-src files for keccak arm

aws · Sep 10, 2024 · a8c5c5d · a8c5c5d
1 parent 379ff03
commit a8c5c5d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/generated-src/ios-aarch64/crypto/fipsmodule/keccak1600-armv8.S b/generated-src/ios-aarch64/crypto/fipsmodule/keccak1600-armv8.S
@@ -489,23 +489,27 @@ _SHA3_Squeeze_hw:
 	mov	x20,x1
 	mov	x21,x2
 	mov	x22,x3
-Loop_squeeze:
+	cmp	x4, #0
+	bne	Lfirst_squeeze    // if (first != 0) -> first block -> skip first Keccak
+Loop_squeeze:	//	Squeeze loop (Keccak & Store)
+	mov	x0,x19
+	bl	KeccakF1600
+Lfirst_squeeze:
+	mov	x0,x19
+	mov	x3,x22
+L_squeeze:	//	Store loop
 	ldr	x4,[x0],#8
 	cmp	x21,#8
-	blo	Lsqueeze_tail
+	blo	Lsqueeze_tail	   // Store tail only
 #ifdef	__AARCH64EB__
 	rev	x4,x4
 #endif
 	str	x4,[x20],#8
 	subs	x21,x21,#8
-	beq	Lsqueeze_done
+	ble	Lsqueeze_done
 	subs	x3,x3,#8
-	bhi	Loop_squeeze
-	mov	x0,x19
-	bl	KeccakF1600
-	mov	x0,x19
-	mov	x3,x22
-	b	Loop_squeeze
+	bhi	L_squeeze		   // End store loop
+	b	Loop_squeeze      // End Squeeze loop (Keccak & Store)
 .align	4
 Lsqueeze_tail:
 	strb	w4,[x20],#1

diff --git a/generated-src/linux-aarch64/crypto/fipsmodule/keccak1600-armv8.S b/generated-src/linux-aarch64/crypto/fipsmodule/keccak1600-armv8.S
@@ -489,23 +489,27 @@ SHA3_Squeeze_hw:
 	mov	x20,x1
 	mov	x21,x2
 	mov	x22,x3
-.Loop_squeeze:
+	cmp	x4, #0
+	bne	.Lfirst_squeeze    // if (first != 0) -> first block -> skip first Keccak
+.Loop_squeeze:	//	Squeeze loop (Keccak & Store)
+	mov	x0,x19
+	bl	KeccakF1600
+.Lfirst_squeeze:
+	mov	x0,x19
+	mov	x3,x22
+.L_squeeze:	//	Store loop
 	ldr	x4,[x0],#8
 	cmp	x21,#8
-	blo	.Lsqueeze_tail
+	blo	.Lsqueeze_tail	   // Store tail only
 #ifdef	__AARCH64EB__
 	rev	x4,x4
 #endif
 	str	x4,[x20],#8
 	subs	x21,x21,#8
-	beq	.Lsqueeze_done
+	ble	.Lsqueeze_done
 	subs	x3,x3,#8
-	bhi	.Loop_squeeze
-	mov	x0,x19
-	bl	KeccakF1600
-	mov	x0,x19
-	mov	x3,x22
-	b	.Loop_squeeze
+	bhi	.L_squeeze		   // End store loop
+	b	.Loop_squeeze      // End Squeeze loop (Keccak & Store)
 .align	4
 .Lsqueeze_tail:
 	strb	w4,[x20],#1

diff --git a/generated-src/win-aarch64/crypto/fipsmodule/keccak1600-armv8.S b/generated-src/win-aarch64/crypto/fipsmodule/keccak1600-armv8.S
@@ -497,23 +497,27 @@ SHA3_Squeeze_hw:
 	mov	x20,x1
 	mov	x21,x2
 	mov	x22,x3
-Loop_squeeze:
+	cmp	x4, #0
+	bne	Lfirst_squeeze    // if (first != 0) -> first block -> skip first Keccak
+Loop_squeeze:	//	Squeeze loop (Keccak & Store)
+	mov	x0,x19
+	bl	KeccakF1600
+Lfirst_squeeze:
+	mov	x0,x19
+	mov	x3,x22
+L_squeeze:	//	Store loop
 	ldr	x4,[x0],#8
 	cmp	x21,#8
-	blo	Lsqueeze_tail
+	blo	Lsqueeze_tail	   // Store tail only
 #ifdef	__AARCH64EB__
 	rev	x4,x4
 #endif
 	str	x4,[x20],#8
 	subs	x21,x21,#8
-	beq	Lsqueeze_done
+	ble	Lsqueeze_done
 	subs	x3,x3,#8
-	bhi	Loop_squeeze
-	mov	x0,x19
-	bl	KeccakF1600
-	mov	x0,x19
-	mov	x3,x22
-	b	Loop_squeeze
+	bhi	L_squeeze		   // End store loop
+	b	Loop_squeeze      // End Squeeze loop (Keccak & Store)
 .align	4
 Lsqueeze_tail:
 	strb	w4,[x20],#1