Skip to content

Cherry-pick: Harden bound checking tests of AES-XTS and replace SSE instructions that degraded performance for certain input lengths #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2025
Merged

Cherry-pick: Harden bound checking tests of AES-XTS and replace SSE instructions that degraded performance for certain input lengths #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c21a0c
Adding detection of out-of-bound pre-bound memory read to AES-XTS tes…
nebeid Mar 28, 2025
ba866da
Avoid mixing SSE and AVX in XTS-mode AVX512 implementation (#2140)
torben-hansen Jan 27, 2025
01653f2
Update BoringSSL benchmark to use C++17 (#2063)
andrewhop Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto/fipsmodule/aes/asm/aesni-xts-avx512.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,7 @@
vmovdqu8 %zmm1,($output)
vmovdqu %xmm2,0x40($output)
add \$0x50,$output
movdqa %xmm2,%xmm8
vmovdqa %xmm2,%xmm8
vextracti32x4 \$0x1,%zmm10,%xmm0
and \$0xf,$length
je .L_ret_${rndsuffix}
Expand Down
251 changes: 188 additions & 63 deletions crypto/fipsmodule/modes/xts_test.cc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion generated-src/linux-x86_64/crypto/fipsmodule/aesni-xts-avx512.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ aes_hw_xts_encrypt_avx512:
vmovdqu8 %zmm1,(%rsi)
vmovdqu %xmm2,64(%rsi)
addq $0x50,%rsi
movdqa %xmm2,%xmm8
vmovdqa %xmm2,%xmm8
vextracti32x4 $0x1,%zmm10,%xmm0
andq $0xf,%rdx
je .L_ret_hEgxyDlCngwrfFe
Expand Down
2 changes: 1 addition & 1 deletion generated-src/mac-x86_64/crypto/fipsmodule/aesni-xts-avx512.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ L$_remaining_num_blocks_is_5_hEgxyDlCngwrfFe:
vmovdqu8 %zmm1,(%rsi)
vmovdqu %xmm2,64(%rsi)
addq $0x50,%rsi
movdqa %xmm2,%xmm8
vmovdqa %xmm2,%xmm8
vextracti32x4 $0x1,%zmm10,%xmm0
andq $0xf,%rdx
je L$_ret_hEgxyDlCngwrfFe
Expand Down
2 changes: 1 addition & 1 deletion generated-src/win-x86_64/crypto/fipsmodule/aesni-xts-avx512.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ $L$_remaining_num_blocks_is_5_hEgxyDlCngwrfFe:
vmovdqu8 ZMMWORD[rdx],zmm1
vmovdqu XMMWORD[64+rdx],xmm2
add rdx,0x50
movdqa xmm8,xmm2
vmovdqa xmm8,xmm2
vextracti32x4 xmm0,zmm10,0x1
and r8,0xf
je NEAR $L$_ret_hEgxyDlCngwrfFe
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/run_benchmark_build_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ build_openssl $openssl_3_2_branch
build_openssl $openssl_master_branch
build_boringssl

run_build -DASAN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_STANDARD=14 -DCMAKE_C_STANDARD=11 -DENABLE_DILITHIUM=ON -DBENCHMARK_LIBS="\
run_build -DASAN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_STANDARD=17 -DCMAKE_C_STANDARD=11 -DENABLE_DILITHIUM=ON -DBENCHMARK_LIBS="\
Copy link
Member

@skmcgrail skmcgrail Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this because the test changes require 17 now then?

aws-lc-fips-2021:${install_dir}/aws-lc-fips-2021-10-20;\
aws-lc-fips-2022:${install_dir}/aws-lc-fips-2022-11-02;\
open102:${install_dir}/openssl-${openssl_1_0_2_branch};\
Expand Down
Loading