From: Nikola Pajkovsky <nikolap@openssl.org>
Date: Mon, 25 May 2026 07:33:00 +0000 (+0200)
Subject: crypto/aes/asm/asm-sha{1,256}-armv8.pl: add missing function alignment
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94fbc0254fb9b04b528bcd1660420367b346f43f;p=thirdparty%2Fopenssl.git

crypto/aes/asm/asm-sha{1,256}-armv8.pl: add missing function alignment

clang-22 reported missing alignment on MacOS:

    ld: warning: arm64 function not 4-byte aligned: _asm_sha1_hmac_aescbc_dec from libcrypto.a(libcrypto-lib-aes-sha1-armv8.o)
    ld: warning: arm64 function not 4-byte aligned: _asm_sha256_hmac_aescbc_dec from libcrypto.a(libcrypto-lib-aes-sha256-armv8.o)

Add ".align 4" directives to the affected functions.

Signed-off-by: Nikola Pajkovsky <nikolap@openssl.org>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Thu May 28 08:31:59 2026
(Merged from https://github.com/openssl/openssl/pull/31284)
---

diff --git a/crypto/aes/asm/aes-sha1-armv8.pl b/crypto/aes/asm/aes-sha1-armv8.pl
index e965811b718..251c9bff3ca 100644
--- a/crypto/aes/asm/aes-sha1-armv8.pl
+++ b/crypto/aes/asm/aes-sha1-armv8.pl
@@ -2395,6 +2395,7 @@ $code.=<<___;
 
 .global asm_sha1_hmac_aescbc_dec
 .type	asm_sha1_hmac_aescbc_dec,%function
+.align 4
 
 asm_sha1_hmac_aescbc_dec:
 	AARCH64_VALID_CALL_TARGET
diff --git a/crypto/aes/asm/aes-sha256-armv8.pl b/crypto/aes/asm/aes-sha256-armv8.pl
index f81f590090a..9e403c3abfd 100644
--- a/crypto/aes/asm/aes-sha256-armv8.pl
+++ b/crypto/aes/asm/aes-sha256-armv8.pl
@@ -2555,6 +2555,7 @@ $code.=<<___;
 
 .global	asm_sha256_hmac_aescbc_dec
 .type	asm_sha256_hmac_aescbc_dec,%function
+.align  4
 
 asm_sha256_hmac_aescbc_dec:
 	AARCH64_VALID_CALL_TARGET
@@ -4655,4 +4656,4 @@ if ($flavour =~ /64/) {
 	}
 }
 
-close STDOUT or die "error closing STDOUT: $!";
\ No newline at end of file
+close STDOUT or die "error closing STDOUT: $!";