12 files changed, 22 insertions, 12 deletions
diff --git a/sys/crypto/openssl/arm/aesv8-armx.S b/sys/crypto/openssl/arm/aesv8-armx.S
index b59badae62af..cf6d7a6ed4f0 100644
--- a/sys/crypto/openssl/arm/aesv8-armx.S
+++ b/sys/crypto/openssl/arm/aesv8-armx.S
@@ -19,7 +19,6 @@
 .long	0x01,0x01,0x01,0x01
 .long	0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d	@ rotate-n-splat
 .long	0x1b,0x1b,0x1b,0x1b
-
 .globl	aes_v8_set_encrypt_key
 .type	aes_v8_set_encrypt_key,%function
 .align	5
diff --git a/sys/crypto/openssl/arm/armv4-gf2m.S b/sys/crypto/openssl/arm/armv4-gf2m.S
index ccf6212f6eb1..5704388b037a 100644
--- a/sys/crypto/openssl/arm/armv4-gf2m.S
+++ b/sys/crypto/openssl/arm/armv4-gf2m.S
@@ -232,5 +232,6 @@ bn_GF2m_mul_2x2:
 .align	5
 
 #if __ARM_MAX_ARCH__>=7
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/armv4-mont.S b/sys/crypto/openssl/arm/armv4-mont.S
index 460d5cb400cb..004ea3469e0b 100644
--- a/sys/crypto/openssl/arm/armv4-mont.S
+++ b/sys/crypto/openssl/arm/armv4-mont.S
@@ -957,5 +957,6 @@ bn_mul8x_mont_neon:
 .align	2
 .align	2
 #if __ARM_MAX_ARCH__>=7
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/armv4cpuid.S b/sys/crypto/openssl/arm/armv4cpuid.S
index 8436d1f079c4..97cfffe500bf 100644
--- a/sys/crypto/openssl/arm/armv4cpuid.S
+++ b/sys/crypto/openssl/arm/armv4cpuid.S
@@ -269,5 +269,5 @@ atomic_add_spinlock:
 .word	0
 #endif
 
-.comm	OPENSSL_armcap_P,4,4
+
 .hidden	OPENSSL_armcap_P
diff --git a/sys/crypto/openssl/arm/chacha-armv4.S b/sys/crypto/openssl/arm/chacha-armv4.S
index 9b673c4c981e..80b1d0097dec 100644
--- a/sys/crypto/openssl/arm/chacha-armv4.S
+++ b/sys/crypto/openssl/arm/chacha-armv4.S
@@ -1474,5 +1474,6 @@ ChaCha20_neon:
 	add	sp,sp,#4*(16+3)
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
 .size	ChaCha20_neon,.-ChaCha20_neon
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/ghashv8-armx.S b/sys/crypto/openssl/arm/ghashv8-armx.S
index 3234cc9ba497..e404b7ca18dd 100644
--- a/sys/crypto/openssl/arm/ghashv8-armx.S
+++ b/sys/crypto/openssl/arm/ghashv8-armx.S
@@ -238,6 +238,7 @@ gcm_ghash_v8:
 	vldmia	sp!,{d8,d9,d10,d11,d12,d13,d14,d15}		@ 32-bit ABI says so
 	bx	lr
 .size	gcm_ghash_v8,.-gcm_ghash_v8
+.section	.rodata
 .byte	71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2
 .align	2
diff --git a/sys/crypto/openssl/arm/keccak1600-armv4.S b/sys/crypto/openssl/arm/keccak1600-armv4.S
index ddad05acad64..bb50e41f523a 100644
--- a/sys/crypto/openssl/arm/keccak1600-armv4.S
+++ b/sys/crypto/openssl/arm/keccak1600-armv4.S
@@ -2044,6 +2044,7 @@ SHA3_squeeze:
 	mov	r4,r1
 	mov	r5,r2
 	mov	r12,r3
+	ldr	r0, [sp, #40]  @ next is after the 10 pushed registers (10*4)
 
 #ifdef	__thumb2__
 	mov	r9,#0x00ff00ff
@@ -2065,6 +2066,8 @@ SHA3_squeeze:
 	stmdb	sp!,{r6,r7,r8,r9}
 
 	mov	r14,r10
+	cmp	r0, #1
+	beq	.Lnext_block
 	b	.Loop_squeeze
 
 .align	4
@@ -2136,7 +2139,7 @@ SHA3_squeeze:
 
 	subs	r12,r12,#8		@ bsz -= 8
 	bhi	.Loop_squeeze
-
+.Lnext_block:
 	mov	r0,r14			@ original r10
 
 	bl	KeccakF1600
diff --git a/sys/crypto/openssl/arm/ossl_aes_gcm.c b/sys/crypto/openssl/arm/ossl_aes_gcm_neon.c
index e51b7b4fbc04..e51b7b4fbc04 100644
--- a/sys/crypto/openssl/arm/ossl_aes_gcm.c
+++ b/sys/crypto/openssl/arm/ossl_aes_gcm_neon.c
diff --git a/sys/crypto/openssl/arm/poly1305-armv4.S b/sys/crypto/openssl/arm/poly1305-armv4.S
index 41b7caf06cc6..00ff3d94237e 100644
--- a/sys/crypto/openssl/arm/poly1305-armv4.S
+++ b/sys/crypto/openssl/arm/poly1305-armv4.S
@@ -1165,5 +1165,6 @@ poly1305_emit_neon:
 .align	2
 .align	2
 #if	__ARM_MAX_ARCH__>=7
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/sha1-armv4-large.S b/sys/crypto/openssl/arm/sha1-armv4-large.S
index c23e1df6e38e..186938b61be4 100644
--- a/sys/crypto/openssl/arm/sha1-armv4-large.S
+++ b/sys/crypto/openssl/arm/sha1-armv4-large.S
@@ -1495,5 +1495,6 @@ sha1_block_data_order_armv8:
 .size	sha1_block_data_order_armv8,.-sha1_block_data_order_armv8
 #endif
 #if __ARM_MAX_ARCH__>=7
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/sha256-armv4.S b/sys/crypto/openssl/arm/sha256-armv4.S
index c1b775f767c8..822bc81b3054 100644
--- a/sys/crypto/openssl/arm/sha256-armv4.S
+++ b/sys/crypto/openssl/arm/sha256-armv4.S
@@ -1,5 +1,5 @@
 /* Do not modify. This file is auto-generated from sha256-armv4.pl. */
-@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the Apache License 2.0 (the "License").  You may not use
 @ this file except in compliance with the License.  You can obtain a copy
@@ -2819,5 +2819,6 @@ sha256_block_data_order_armv8:
 .align	2
 .align	2
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif
diff --git a/sys/crypto/openssl/arm/sha512-armv4.S b/sys/crypto/openssl/arm/sha512-armv4.S
index 1f84a8ff93fe..11c1cb287d34 100644
--- a/sys/crypto/openssl/arm/sha512-armv4.S
+++ b/sys/crypto/openssl/arm/sha512-armv4.S
@@ -1,5 +1,5 @@
 /* Do not modify. This file is auto-generated from sha512-armv4.pl. */
-@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the Apache License 2.0 (the "License").  You may not use
 @ this file except in compliance with the License.  You can obtain a copy
@@ -1873,5 +1873,6 @@ sha512_block_data_order_neon:
 .align	2
 .align	2
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
-.comm	OPENSSL_armcap_P,4,4
+
+.hidden	OPENSSL_armcap_P
 #endif