git: 454c425dbed1 - main - ossl: Add missing labels to bsaes-armv7.S

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=454c425dbed1d341025c71a8645011a980e20ccd

commit 454c425dbed1d341025c71a8645011a980e20ccd
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-08-07 14:17:16 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-08-07 14:17:16 +0000

    ossl: Add missing labels to bsaes-armv7.S
    
    There is a bug in the OpenSSL script which generates this file; the bug
    is in the process of being fixed upstream.
    
    Specifically, when generating the output, bsaes-armv7.pl strips some
    labels that are used when the output asm is compiled with __KERNEL__
    defined, resulting in a build error.  As a step towards adding armv7
    support to ossl(4), manually patch the generated asm.  The upstream fix
    will be imported later.
    
    Reviewed by:    andrew, jhb, emaste
    MFC after:      1 week
    Sponsored by:   Klara, Inc.
    Sponsored by:   Stormshield
    Differential Revision:  https://reviews.freebsd.org/D41303
---
 sys/crypto/openssl/arm/bsaes-armv7.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/crypto/openssl/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S
index 2e452f75a643..b9ef9881e3e5 100644
--- a/sys/crypto/openssl/arm/bsaes-armv7.S
+++ b/sys/crypto/openssl/arm/bsaes-armv7.S
@@ -1130,7 +1130,7 @@ bsaes_cbc_encrypt:
 	vstmia	r4, {q7}
 
 .align	2
-
+0:
 #endif
 
 	vld1.8	{q15}, [r8]		@ load IV
@@ -1390,7 +1390,7 @@ bsaes_ctr32_encrypt_blocks:
 	vstmia	r12, {q7}			@ save last round key
 
 .align	2
-	add	r12, r3, #248
+0:	add	r12, r3, #248
 	vld1.8	{q0}, [r8]		@ load counter
 	add	r8, r6, #.LREVM0SR-.LM0	@ borrow r8
 	vldmia	r12, {q4}			@ load round0 key
@@ -1625,7 +1625,7 @@ bsaes_xts_encrypt:
 	vstmia	r12, {q7}
 
 .align	2
-	sub	sp, #0x90			@ place for tweak[9]
+0:	sub	sp, #0x90			@ place for tweak[9]
 #endif
 
 	vld1.8	{q8}, [r0]			@ initial tweak
@@ -2111,7 +2111,7 @@ bsaes_xts_decrypt:
 	vstmia	r4, {q7}
 
 .align	2
-	sub	sp, #0x90			@ place for tweak[9]
+0:	sub	sp, #0x90			@ place for tweak[9]
 #endif
 	vld1.8	{q8}, [r0]			@ initial tweak
 	adr	r2, .Lxts_magic