From bf844116ce40746f4ffd2946fd12773a1d8d12e8 Mon Sep 17 00:00:00 2001 From: Bill Yang Date: Thu, 20 Jul 2023 14:38:50 -0700 Subject: [PATCH] update generated-src againn --- .../crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S | 2 +- generated-src/ios-aarch64/crypto/fipsmodule/sha256-armv8.S | 7 +++++++ generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S | 7 +++++++ .../crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S | 2 +- .../linux-aarch64/crypto/fipsmodule/sha256-armv8.S | 7 +++++++ .../linux-aarch64/crypto/fipsmodule/sha512-armv8.S | 7 +++++++ .../crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S | 2 +- generated-src/win-aarch64/crypto/fipsmodule/sha256-armv8.S | 7 +++++++ generated-src/win-aarch64/crypto/fipsmodule/sha512-armv8.S | 7 +++++++ 9 files changed, 45 insertions(+), 3 deletions(-) diff --git a/generated-src/ios-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S b/generated-src/ios-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S index 671953e2e4d..ddcc221ed0a 100644 --- a/generated-src/ios-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S +++ b/generated-src/ios-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S @@ -27,7 +27,7 @@ _aesv8_gcm_8x_enc_128: adrp x6,_BORINGSSL_function_hit@PAGE add x6, x6, _BORINGSSL_function_hit@PAGEOFF mov w7, #1 - strb w7, [x6,#6] // kFlag_aesv8_gcm_8x_enc_128 + strb w7, [x6,#7] // kFlag_aesv8_gcm_8x_enc_128 #endif AARCH64_VALID_CALL_TARGET cbz x1, L128_enc_ret diff --git a/generated-src/ios-aarch64/crypto/fipsmodule/sha256-armv8.S b/generated-src/ios-aarch64/crypto/fipsmodule/sha256-armv8.S index f4a5283cfd9..a8ea7951c2b 100644 --- a/generated-src/ios-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/generated-src/ios-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1072,6 +1072,13 @@ LK256: .align 6 sha256_block_armv8: Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,_BORINGSSL_function_hit@PAGE + add x6, x6, _BORINGSSL_function_hit@PAGEOFF + mov w7, #1 + strb w7, [x6,#6] // kFlag_sha256_hw +#endif // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later. stp x29,x30,[sp,#-16]! add x29,sp,#0 diff --git a/generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S b/generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S index d005b0d0932..2d795fe0497 100644 --- a/generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1096,6 +1096,13 @@ LK512: .align 6 sha512_block_armv8: Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,_BORINGSSL_function_hit@PAGE + add x6, x6, _BORINGSSL_function_hit@PAGEOFF + mov w7, #1 + strb w7, [x6,#8] // kFlag_sha512_hw +#endif stp x29,x30,[sp,#-16]! add x29,sp,#0 diff --git a/generated-src/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S b/generated-src/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S index 02a701970ce..52ab18276e8 100644 --- a/generated-src/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S +++ b/generated-src/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S @@ -27,7 +27,7 @@ aesv8_gcm_8x_enc_128: adrp x6,BORINGSSL_function_hit add x6, x6, :lo12:BORINGSSL_function_hit mov w7, #1 - strb w7, [x6,#6] // kFlag_aesv8_gcm_8x_enc_128 + strb w7, [x6,#7] // kFlag_aesv8_gcm_8x_enc_128 #endif AARCH64_VALID_CALL_TARGET cbz x1, .L128_enc_ret diff --git a/generated-src/linux-aarch64/crypto/fipsmodule/sha256-armv8.S b/generated-src/linux-aarch64/crypto/fipsmodule/sha256-armv8.S index 98a685f13cd..fd801b4e0e4 100644 --- a/generated-src/linux-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/generated-src/linux-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1072,6 +1072,13 @@ sha256_block_data_order: .align 6 sha256_block_armv8: .Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,BORINGSSL_function_hit + add x6, x6, :lo12:BORINGSSL_function_hit + mov w7, #1 + strb w7, [x6,#6] // kFlag_sha256_hw +#endif // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later. stp x29,x30,[sp,#-16]! add x29,sp,#0 diff --git a/generated-src/linux-aarch64/crypto/fipsmodule/sha512-armv8.S b/generated-src/linux-aarch64/crypto/fipsmodule/sha512-armv8.S index 5e2f88574f4..24e59622f0d 100644 --- a/generated-src/linux-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/generated-src/linux-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1096,6 +1096,13 @@ sha512_block_data_order: .align 6 sha512_block_armv8: .Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,BORINGSSL_function_hit + add x6, x6, :lo12:BORINGSSL_function_hit + mov w7, #1 + strb w7, [x6,#8] // kFlag_sha512_hw +#endif stp x29,x30,[sp,#-16]! add x29,sp,#0 diff --git a/generated-src/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S b/generated-src/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S index 40aea4145cb..8763eb3cf0b 100644 --- a/generated-src/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S +++ b/generated-src/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-unroll8.S @@ -29,7 +29,7 @@ aesv8_gcm_8x_enc_128: adrp x6,BORINGSSL_function_hit add x6, x6, :lo12:BORINGSSL_function_hit mov w7, #1 - strb w7, [x6,#6] // kFlag_aesv8_gcm_8x_enc_128 + strb w7, [x6,#7] // kFlag_aesv8_gcm_8x_enc_128 #endif AARCH64_VALID_CALL_TARGET cbz x1, L128_enc_ret diff --git a/generated-src/win-aarch64/crypto/fipsmodule/sha256-armv8.S b/generated-src/win-aarch64/crypto/fipsmodule/sha256-armv8.S index 9af62ec5405..5d4bceb1c5a 100644 --- a/generated-src/win-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/generated-src/win-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1076,6 +1076,13 @@ LK256: .align 6 sha256_block_armv8: Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,BORINGSSL_function_hit + add x6, x6, :lo12:BORINGSSL_function_hit + mov w7, #1 + strb w7, [x6,#6] // kFlag_sha256_hw +#endif // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later. stp x29,x30,[sp,#-16]! add x29,sp,#0 diff --git a/generated-src/win-aarch64/crypto/fipsmodule/sha512-armv8.S b/generated-src/win-aarch64/crypto/fipsmodule/sha512-armv8.S index 8fac36e7283..7cca7ef2da9 100644 --- a/generated-src/win-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/generated-src/win-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1100,6 +1100,13 @@ LK512: .align 6 sha512_block_armv8: Lv8_entry: +#ifdef BORINGSSL_DISPATCH_TEST + + adrp x6,BORINGSSL_function_hit + add x6, x6, :lo12:BORINGSSL_function_hit + mov w7, #1 + strb w7, [x6,#8] // kFlag_sha512_hw +#endif stp x29,x30,[sp,#-16]! add x29,sp,#0