git: 3beee54141b3 - stable/12 - OpenSSL: Regen assembly file for OpenSSSL 1.1.1s
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Nov 2022 03:20:34 UTC
The branch stable/12 has been updated by jkim:
URL: https://cgit.FreeBSD.org/src/commit/?id=3beee54141b3afacb830c515e8ca82a79a7ee81c
commit 3beee54141b3afacb830c515e8ca82a79a7ee81c
Author: Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2022-11-01 23:12:09 +0000
Commit: Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2022-11-18 03:16:20 +0000
OpenSSL: Regen assembly file for OpenSSSL 1.1.1s
(cherry picked from commit f443d0802a21279387596ec2c9644d3e91ca0431)
---
secure/lib/libcrypto/aarch64/aesv8-armx.S | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/secure/lib/libcrypto/aarch64/aesv8-armx.S b/secure/lib/libcrypto/aarch64/aesv8-armx.S
index cd33ebf8e258..42478451e9f8 100644
--- a/secure/lib/libcrypto/aarch64/aesv8-armx.S
+++ b/secure/lib/libcrypto/aarch64/aesv8-armx.S
@@ -600,17 +600,17 @@ aes_v8_ctr32_encrypt_blocks:
#ifndef __ARMEB__
rev w8, w8
#endif
+ orr v1.16b,v0.16b,v0.16b
add w10, w8, #1
+ orr v18.16b,v0.16b,v0.16b
+ add w8, w8, #2
orr v6.16b,v0.16b,v0.16b
rev w10, w10
- mov v6.s[3],w10
- add w8, w8, #2
- orr v1.16b,v6.16b,v6.16b
+ mov v1.s[3],w10
b.ls .Lctr32_tail
rev w12, w8
- mov v6.s[3],w12
sub x2,x2,#3 // bias
- orr v18.16b,v6.16b,v6.16b
+ mov v18.s[3],w12
b .Loop3x_ctr32
.align 4
@@ -637,11 +637,11 @@ aes_v8_ctr32_encrypt_blocks:
aese v1.16b,v16.16b
aesmc v5.16b,v1.16b
ld1 {v2.16b},[x0],#16
- add w9,w8,#1
+ orr v0.16b,v6.16b,v6.16b
aese v18.16b,v16.16b
aesmc v18.16b,v18.16b
ld1 {v3.16b},[x0],#16
- rev w9,w9
+ orr v1.16b,v6.16b,v6.16b
aese v4.16b,v17.16b
aesmc v4.16b,v4.16b
aese v5.16b,v17.16b
@@ -650,6 +650,8 @@ aes_v8_ctr32_encrypt_blocks:
mov x7,x3
aese v18.16b,v17.16b
aesmc v17.16b,v18.16b
+ orr v18.16b,v6.16b,v6.16b
+ add w9,w8,#1
aese v4.16b,v20.16b
aesmc v4.16b,v4.16b
aese v5.16b,v20.16b
@@ -665,22 +667,20 @@ aes_v8_ctr32_encrypt_blocks:
aese v5.16b,v21.16b
aesmc v5.16b,v5.16b
eor v19.16b,v19.16b,v7.16b
- mov v6.s[3], w9
+ rev w9,w9
aese v17.16b,v21.16b
aesmc v17.16b,v17.16b
- orr v0.16b,v6.16b,v6.16b
+ mov v0.s[3], w9
rev w10,w10
aese v4.16b,v22.16b
aesmc v4.16b,v4.16b
- mov v6.s[3], w10
- rev w12,w8
aese v5.16b,v22.16b
aesmc v5.16b,v5.16b
- orr v1.16b,v6.16b,v6.16b
- mov v6.s[3], w12
+ mov v1.s[3], w10
+ rev w12,w8
aese v17.16b,v22.16b
aesmc v17.16b,v17.16b
- orr v18.16b,v6.16b,v6.16b
+ mov v18.s[3], w12
subs x2,x2,#3
aese v4.16b,v23.16b
aese v5.16b,v23.16b