system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ossl: Add missing labels to bsaes-armv7.S

Browse source 
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
This commit is contained in:
Mark Johnston 2023-08-07 10:17:16 -04:00
parent 2ea65afbd1
commit 454c425dbe
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/crypto/openssl/arm/bsaes-armv7.S
View file

@ -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