diff --git a/crypto/chacha/asm/chacha-x86_64.pl b/crypto/chacha/asm/chacha-x86_64.pl index d212d5fdc5..3cbf10e634 100755 --- a/crypto/chacha/asm/chacha-x86_64.pl +++ b/crypto/chacha/asm/chacha-x86_64.pl @@ -235,7 +235,6 @@ sub ROUND { # critical path is 24 cycles per round .align 64 ChaCha20_ctr32: .cfi_startproc - _CET_ENDBR cmp \$0,$len je .Lno_data mov OPENSSL_ia32cap_P+4(%rip),%r10 diff --git a/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl b/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl index 50621a755a..cbab44095d 100644 --- a/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl +++ b/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl @@ -140,7 +140,6 @@ sub aesgcmsiv_htable_init { .align 16 aesgcmsiv_htable_init: .cfi_startproc - _CET_ENDBR vmovdqa ($H), $T vmovdqa $T, $TMP0 vmovdqa $T, ($Htbl) # H @@ -181,7 +180,6 @@ sub aesgcmsiv_htable6_init { .align 16 aesgcmsiv_htable6_init: .cfi_startproc - _CET_ENDBR vmovdqa ($H), $T vmovdqa $T, $TMP0 vmovdqa $T, ($Htbl) # H @@ -243,7 +241,6 @@ sub aesgcmsiv_htable_polyval { .align 16 aesgcmsiv_htable_polyval: .cfi_startproc - _CET_ENDBR test $len, $len jnz .Lhtable_polyval_start ret @@ -429,7 +426,6 @@ sub aesgcmsiv_polyval_horner { .align 16 aesgcmsiv_polyval_horner: .cfi_startproc - _CET_ENDBR test $L, $L jnz .Lpolyval_horner_start ret @@ -470,7 +466,6 @@ sub aesgcmsiv_polyval_horner { .align 16 aes128gcmsiv_aes_ks: .cfi_startproc - _CET_ENDBR vmovdqu (%rdi), %xmm1 # xmm1 = user key vmovdqa %xmm1, (%rsi) # rsi points to output @@ -532,7 +527,6 @@ sub aesgcmsiv_polyval_horner { .align 16 aes256gcmsiv_aes_ks: .cfi_startproc - _CET_ENDBR vmovdqu (%rdi), %xmm1 vmovdqu 16(%rdi), %xmm3 vmovdqa %xmm1, (%rsi) @@ -626,7 +620,6 @@ sub aes128gcmsiv_aes_ks_enc_x1 { .align 16 aes128gcmsiv_aes_ks_enc_x1: .cfi_startproc - _CET_ENDBR vmovdqa (%rcx), %xmm1 # xmm1 = first 16 bytes of random key vmovdqa 0*16(%rdi), $BLOCK1 @@ -700,7 +693,6 @@ sub aes128gcmsiv_kdf { .align 16 aes128gcmsiv_kdf: .cfi_startproc - _CET_ENDBR # parameter 1: %rdi Pointer to NONCE # parameter 2: %rsi Pointer to CT # parameter 4: %rdx Pointer to keys @@ -801,7 +793,6 @@ sub aes128gcmsiv_enc_msg_x4 { .align 16 aes128gcmsiv_enc_msg_x4: .cfi_startproc - _CET_ENDBR test $LEN, $LEN jnz .L128_enc_msg_x4_start ret @@ -999,7 +990,6 @@ sub aes128gcmsiv_enc_msg_x8 { .align 16 aes128gcmsiv_enc_msg_x8: .cfi_startproc - _CET_ENDBR test $LEN, $LEN jnz .L128_enc_msg_x8_start ret @@ -1255,7 +1245,6 @@ sub aesgcmsiv_dec { $code.=<<___; .cfi_startproc - _CET_ENDBR test \$~15, $LEN jnz .L${labelPrefix}_dec_start ret @@ -1595,7 +1584,6 @@ sub aes128gcmsiv_ecb_enc_block { .align 16 aes128gcmsiv_ecb_enc_block: .cfi_startproc - _CET_ENDBR vmovdqa (%rdi), $STATE_1 vpxor ($KSp), $STATE_1, $STATE_1 @@ -1688,7 +1676,6 @@ sub aes256gcmsiv_aes_ks_enc_x1 { .align 16 aes256gcmsiv_aes_ks_enc_x1: .cfi_startproc - _CET_ENDBR vmovdqa con1(%rip), $CON_MASK # CON_MASK = 1,1,1,1 vmovdqa mask(%rip), $MASK_256 # MASK_256 vmovdqa ($PT), $BLOCK1 @@ -1730,7 +1717,6 @@ sub aes256gcmsiv_ecb_enc_block { .align 16 aes256gcmsiv_ecb_enc_block: .cfi_startproc - _CET_ENDBR vmovdqa (%rdi), $STATE_1 vpxor ($KSp), $STATE_1, $STATE_1 vaesenc 1*16($KSp), $STATE_1, $STATE_1 @@ -1814,7 +1800,6 @@ sub aes256gcmsiv_enc_msg_x4 { .align 16 aes256gcmsiv_enc_msg_x4: .cfi_startproc - _CET_ENDBR test $LEN, $LEN jnz .L256_enc_msg_x4_start ret @@ -2015,7 +2000,6 @@ () .align 16 aes256gcmsiv_enc_msg_x8: .cfi_startproc - _CET_ENDBR test $LEN, $LEN jnz .L256_enc_msg_x8_start ret @@ -2222,7 +2206,6 @@ sub aes256gcmsiv_kdf { .align 16 aes256gcmsiv_kdf: .cfi_startproc - _CET_ENDBR # parameter 1: %rdi Pointer to NONCE # parameter 2: %rsi Pointer to CT # parameter 4: %rdx Pointer to keys diff --git a/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl b/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl index cd99f94c2d..a533e2a1e9 100644 --- a/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl +++ b/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl @@ -453,7 +453,6 @@ sub emit_body { .align 64 chacha20_poly1305_open: .cfi_startproc - _CET_ENDBR push %rbp .cfi_push %rbp push %rbx @@ -876,7 +875,6 @@ sub emit_body { .align 64 chacha20_poly1305_seal: .cfi_startproc - _CET_ENDBR push %rbp .cfi_push %rbp push %rbx diff --git a/crypto/fipsmodule/aes/asm/aesni-x86_64.pl b/crypto/fipsmodule/aes/asm/aesni-x86_64.pl index f64dacdec4..e0da1c75d6 100644 --- a/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +++ b/crypto/fipsmodule/aes/asm/aesni-x86_64.pl @@ -278,7 +278,6 @@ sub aesni_generate1 { .align 16 ${PREFIX}_encrypt: .cfi_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit movb \$1,BORINGSSL_function_hit+1(%rip) @@ -301,7 +300,6 @@ sub aesni_generate1 { .align 16 ${PREFIX}_decrypt: .cfi_startproc - _CET_ENDBR movups ($inp),$inout0 # load input mov 240($key),$rounds # key->rounds ___ @@ -622,7 +620,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_ecb_encrypt: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($win64); lea -0x58(%rsp),%rsp @@ -1209,7 +1206,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_ctr32_encrypt_blocks: .cfi_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb \$1,BORINGSSL_function_hit(%rip) #endif @@ -1788,7 +1784,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_xts_encrypt: .cfi_startproc - _CET_ENDBR lea (%rsp),%r11 # frame pointer .cfi_def_cfa_register %r11 push %rbp @@ -2272,7 +2267,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_xts_decrypt: .cfi_startproc - _CET_ENDBR lea (%rsp),%r11 # frame pointer .cfi_def_cfa_register %r11 push %rbp @@ -2791,7 +2785,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_cbc_encrypt: .cfi_startproc - _CET_ENDBR test $len,$len # check length jz .Lcbc_ret @@ -3341,7 +3334,6 @@ sub aesni_generate8 { .align 16 ${PREFIX}_set_decrypt_key: .cfi_startproc - _CET_ENDBR .byte 0x48,0x83,0xEC,0x08 # sub rsp,8 .cfi_adjust_cfa_offset 8 call __aesni_set_encrypt_key @@ -3414,7 +3406,6 @@ sub aesni_generate8 { ${PREFIX}_set_encrypt_key: __aesni_set_encrypt_key: .cfi_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb \$1,BORINGSSL_function_hit+3(%rip) #endif diff --git a/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl b/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl index 78e546d146..50db29c55b 100644 --- a/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl +++ b/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl @@ -874,7 +874,6 @@ .align 16 ${PREFIX}_set_encrypt_key: .cfi_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit movb \$1, BORINGSSL_function_hit+5(%rip) @@ -930,7 +929,6 @@ .align 16 ${PREFIX}_set_decrypt_key: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($win64); lea -0xb8(%rsp),%rsp @@ -986,7 +984,6 @@ .align 16 ${PREFIX}_encrypt: .cfi_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit movb \$1, BORINGSSL_function_hit+4(%rip) @@ -1036,7 +1033,6 @@ .align 16 ${PREFIX}_decrypt: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($win64); lea -0xb8(%rsp),%rsp @@ -1088,7 +1084,6 @@ .align 16 ${PREFIX}_cbc_encrypt: .cfi_startproc - _CET_ENDBR xchg $key,$len ___ ($len,$key)=($key,$len); @@ -1174,7 +1169,6 @@ .align 16 ${PREFIX}_ctr32_encrypt_blocks: .cfi_startproc - _CET_ENDBR # _vpaes_encrypt_core and _vpaes_encrypt_core_2x expect the key in %rdx. xchg $key, $blocks ___ diff --git a/crypto/fipsmodule/bn/asm/rsaz-avx2.pl b/crypto/fipsmodule/bn/asm/rsaz-avx2.pl index 593f6b1ea6..a3d130eca9 100755 --- a/crypto/fipsmodule/bn/asm/rsaz-avx2.pl +++ b/crypto/fipsmodule/bn/asm/rsaz-avx2.pl @@ -116,7 +116,6 @@ .align 64 rsaz_1024_sqr_avx2: # 702 cycles, 14% faster than rsaz_1024_mul_avx2 .cfi_startproc - _CET_ENDBR lea (%rsp), %rax .cfi_def_cfa_register %rax push %rbx @@ -868,7 +867,6 @@ .align 64 rsaz_1024_mul_avx2: .cfi_startproc - _CET_ENDBR lea (%rsp), %rax .cfi_def_cfa_register %rax push %rbx @@ -1480,7 +1478,6 @@ .align 32 rsaz_1024_red2norm_avx2: .cfi_startproc - _CET_ENDBR sub \$-128,$inp # size optimization xor %rax,%rax ___ @@ -1522,7 +1519,6 @@ .align 32 rsaz_1024_norm2red_avx2: .cfi_startproc - _CET_ENDBR sub \$-128,$out # size optimization mov ($inp),@T[0] mov \$0x1fffffff,%eax @@ -1567,7 +1563,6 @@ .align 32 rsaz_1024_scatter5_avx2: .cfi_startproc - _CET_ENDBR vzeroupper vmovdqu .Lscatter_permd(%rip),%ymm5 shl \$4,$power @@ -1595,7 +1590,6 @@ .align 32 rsaz_1024_gather5_avx2: .cfi_startproc - _CET_ENDBR vzeroupper mov %rsp,%r11 .cfi_def_cfa_register %r11 diff --git a/crypto/fipsmodule/bn/asm/x86_64-mont.pl b/crypto/fipsmodule/bn/asm/x86_64-mont.pl index d8472aebe5..3367475b29 100755 --- a/crypto/fipsmodule/bn/asm/x86_64-mont.pl +++ b/crypto/fipsmodule/bn/asm/x86_64-mont.pl @@ -96,7 +96,6 @@ .align 16 bn_mul_mont: .cfi_startproc - _CET_ENDBR mov ${num}d,${num}d mov %rsp,%rax .cfi_def_cfa_register %rax diff --git a/crypto/fipsmodule/bn/asm/x86_64-mont5.pl b/crypto/fipsmodule/bn/asm/x86_64-mont5.pl index 793689d239..b3797b36aa 100755 --- a/crypto/fipsmodule/bn/asm/x86_64-mont5.pl +++ b/crypto/fipsmodule/bn/asm/x86_64-mont5.pl @@ -83,7 +83,6 @@ .align 64 bn_mul_mont_gather5: .cfi_startproc - _CET_ENDBR mov ${num}d,${num}d mov %rsp,%rax .cfi_def_cfa_register %rax @@ -1103,7 +1102,6 @@ .align 32 bn_power5: .cfi_startproc - _CET_ENDBR mov %rsp,%rax .cfi_def_cfa_register %rax ___ @@ -1246,7 +1244,6 @@ bn_sqr8x_internal: __bn_sqr8x_internal: .cfi_startproc - _CET_ENDBR ############################################################## # Squaring part: # @@ -2744,7 +2741,6 @@ bn_sqrx8x_internal: __bn_sqrx8x_internal: .cfi_startproc - _CET_ENDBR ################################################################## # Squaring part: # @@ -3456,7 +3452,6 @@ .align 16 bn_scatter5: .cfi_startproc - _CET_ENDBR cmp \$0, $num jz .Lscatter_epilogue @@ -3487,7 +3482,6 @@ bn_gather5: .cfi_startproc .LSEH_begin_bn_gather5: # Win64 thing, but harmless in other cases - _CET_ENDBR # I can't trust assembler to use specific encoding:-( .byte 0x4c,0x8d,0x14,0x24 #lea (%rsp),%r10 .cfi_def_cfa_register %r10 diff --git a/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl b/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl index 483a87f6dc..711cc8348b 100755 --- a/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl +++ b/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl @@ -102,7 +102,6 @@ .align 32 ecp_nistz256_neg: .cfi_startproc - _CET_ENDBR push %r12 .cfi_push %r12 push %r13 @@ -171,7 +170,6 @@ .align 32 ecp_nistz256_ord_mul_mont: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -503,7 +501,6 @@ .align 32 ecp_nistz256_ord_sqr_mont: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -1254,7 +1251,6 @@ .align 32 ecp_nistz256_mul_mont: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -1557,7 +1553,6 @@ .align 32 ecp_nistz256_sqr_mont: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -2107,7 +2102,6 @@ .align 32 ecp_nistz256_select_w5: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($avx>1); leaq OPENSSL_ia32cap_P(%rip), %rax @@ -2208,7 +2202,6 @@ .align 32 ecp_nistz256_select_w7: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($avx>1); leaq OPENSSL_ia32cap_P(%rip), %rax @@ -2414,7 +2407,6 @@ ecp_nistz256_avx2_select_w7: .cfi_startproc .Lavx2_select_w7: - _CET_ENDBR vzeroupper ___ $code.=<<___ if ($win64); @@ -2526,7 +2518,6 @@ .type ecp_nistz256_avx2_select_w7,\@function,3 .align 32 ecp_nistz256_avx2_select_w7: - _CET_ENDBR .byte 0x0f,0x0b # ud2 ret .size ecp_nistz256_avx2_select_w7,.-ecp_nistz256_avx2_select_w7 @@ -2731,7 +2722,6 @@ () .align 32 ecp_nistz256_point_double: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -2984,7 +2974,6 @@ () .align 32 ecp_nistz256_point_add: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx @@ -3383,7 +3372,6 @@ () .align 32 ecp_nistz256_point_add_affine: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($addx); leaq OPENSSL_ia32cap_P(%rip), %rcx diff --git a/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl b/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl index 7cbcb4694d..6918dadaa8 100644 --- a/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl +++ b/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl @@ -160,7 +160,6 @@ sub SHIFT256 { .align 32 beeu_mod_inverse_vartime: .cfi_startproc - _CET_ENDBR push %rbp .cfi_push rbp push %r12 diff --git a/crypto/fipsmodule/md5/asm/md5-x86_64.pl b/crypto/fipsmodule/md5/asm/md5-x86_64.pl index c10e5c3b94..c21913dfe2 100644 --- a/crypto/fipsmodule/md5/asm/md5-x86_64.pl +++ b/crypto/fipsmodule/md5/asm/md5-x86_64.pl @@ -135,7 +135,6 @@ sub round4_step .type md5_block_asm_data_order,\@function,3 md5_block_asm_data_order: .cfi_startproc - _CET_ENDBR push %rbp .cfi_push rbp push %rbx diff --git a/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl b/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl index 2d6a98b1fa..faea927aa6 100644 --- a/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl @@ -446,7 +446,6 @@ aesni_gcm_decrypt: .cfi_startproc .seh_startproc - _CET_ENDBR xor %rax,%rax # We call |_aesni_ctr32_ghash_6x|, which requires at least 96 (0x60) @@ -720,7 +719,6 @@ aesni_gcm_encrypt: .cfi_startproc .seh_startproc - _CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit movb \$1,BORINGSSL_function_hit+2(%rip) @@ -1095,7 +1093,6 @@ .globl aesni_gcm_encrypt .type aesni_gcm_encrypt,\@abi-omnipotent aesni_gcm_encrypt: - _CET_ENDBR xor %eax,%eax ret .size aesni_gcm_encrypt,.-aesni_gcm_encrypt @@ -1103,7 +1100,6 @@ .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,\@abi-omnipotent aesni_gcm_decrypt: - _CET_ENDBR xor %eax,%eax ret .size aesni_gcm_decrypt,.-aesni_gcm_decrypt diff --git a/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl b/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl index 7966913b0c..0bc786c63b 100644 --- a/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl +++ b/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl @@ -107,7 +107,6 @@ gcm_gmult_ssse3: .cfi_startproc .seh_startproc - _CET_ENDBR ____ $code .= <<____ if ($win64); subq \$40, %rsp @@ -250,7 +249,6 @@ sub process_rows { gcm_ghash_ssse3: .cfi_startproc .seh_startproc - _CET_ENDBR ____ $code .= <<____ if ($win64); subq \$56, %rsp diff --git a/crypto/fipsmodule/modes/asm/ghash-x86_64.pl b/crypto/fipsmodule/modes/asm/ghash-x86_64.pl index be7ac4f8c0..2bfa3c0a02 100644 --- a/crypto/fipsmodule/modes/asm/ghash-x86_64.pl +++ b/crypto/fipsmodule/modes/asm/ghash-x86_64.pl @@ -210,7 +210,6 @@ sub reduction_alg9 { # 17/11 times faster than Intel version gcm_init_clmul: .cfi_startproc .seh_startproc - _CET_ENDBR .L_init_clmul: ___ $code.=<<___ if ($win64); @@ -293,7 +292,6 @@ sub reduction_alg9 { # 17/11 times faster than Intel version .align 16 gcm_gmult_clmul: .cfi_startproc - _CET_ENDBR .L_gmult_clmul: movdqu ($Xip),$Xi movdqa .Lbswap_mask(%rip),$T3 @@ -346,7 +344,6 @@ sub reduction_alg9 { # 17/11 times faster than Intel version gcm_ghash_clmul: .cfi_startproc .seh_startproc - _CET_ENDBR .L_ghash_clmul: ___ $code.=<<___ if ($win64); @@ -715,7 +712,6 @@ sub reduction_alg9 { # 17/11 times faster than Intel version .align 32 gcm_init_avx: .cfi_startproc - _CET_ENDBR ___ if ($avx) { my ($Htbl,$Xip)=@_4args; @@ -862,7 +858,6 @@ sub reduction_avx { .align 32 gcm_gmult_avx: .cfi_startproc - _CET_ENDBR jmp .L_gmult_clmul .cfi_endproc .size gcm_gmult_avx,.-gcm_gmult_avx @@ -874,7 +869,6 @@ sub reduction_avx { .align 32 gcm_ghash_avx: .cfi_startproc - _CET_ENDBR ___ if ($avx) { my ($Xip,$Htbl,$inp,$len)=@_4args; diff --git a/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl b/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl index fb4dbc5be9..de2776a1b5 100644 --- a/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl +++ b/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl @@ -49,7 +49,6 @@ .align 16 CRYPTO_rdrand: .cfi_startproc - _CET_ENDBR xorq %rax, %rax rdrand $tmp1 test $tmp1, $tmp1 # OLD cpu's: can use all 0s in output as error signal @@ -75,7 +74,6 @@ .align 16 CRYPTO_rdrand_multiple8_buf: .cfi_startproc - _CET_ENDBR test $len, $len jz .Lout movq \$8, $tmp1 diff --git a/crypto/fipsmodule/sha/asm/sha1-x86_64.pl b/crypto/fipsmodule/sha/asm/sha1-x86_64.pl index e1a4f7f278..60891143ce 100755 --- a/crypto/fipsmodule/sha/asm/sha1-x86_64.pl +++ b/crypto/fipsmodule/sha/asm/sha1-x86_64.pl @@ -248,7 +248,6 @@ sub BODY_40_59 { .align 16 sha1_block_data_order: .cfi_startproc - _CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%r10 mov 0(%r10),%r9d mov 4(%r10),%r8d diff --git a/crypto/fipsmodule/sha/asm/sha512-x86_64.pl b/crypto/fipsmodule/sha/asm/sha512-x86_64.pl index 48872e6d18..d4ec46fce4 100755 --- a/crypto/fipsmodule/sha/asm/sha512-x86_64.pl +++ b/crypto/fipsmodule/sha/asm/sha512-x86_64.pl @@ -267,7 +267,6 @@ () .align 16 $func: .cfi_startproc - _CET_ENDBR ___ $code.=<<___ if ($SZ==4 || $avx); leaq OPENSSL_ia32cap_P(%rip),%r11 diff --git a/crypto/hrss/asm/poly_rq_mul.S b/crypto/hrss/asm/poly_rq_mul.S index 6ce7e02254..373ac5c5c1 100644 --- a/crypto/hrss/asm/poly_rq_mul.S +++ b/crypto/hrss/asm/poly_rq_mul.S @@ -302,7 +302,6 @@ mask_mod8192: .att_syntax prefix poly_Rq_mul: .cfi_startproc -_CET_ENDBR push %rbp .cfi_adjust_cfa_offset 8 .cfi_offset rbp, -16 diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 2d295d3201..edda3a72c9 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -1499,7 +1499,6 @@ sub rxb { \%define XMMWORD \%define YMMWORD \%define ZMMWORD -\%define _CET_ENDBR \%include "openssl/boringssl_prefix_symbols_nasm.inc" ___ diff --git a/crypto/test/asm/trampoline-x86_64.pl b/crypto/test/asm/trampoline-x86_64.pl index 355c934b10..4ddbe4712e 100755 --- a/crypto/test/asm/trampoline-x86_64.pl +++ b/crypto/test/asm/trampoline-x86_64.pl @@ -140,7 +140,6 @@ sub store_caller_state { abi_test_trampoline: .cfi_startproc .seh_startproc - _CET_ENDBR # Stack layout: # 8 bytes - align # $caller_state_size bytes - saved caller registers @@ -307,7 +306,6 @@ sub store_caller_state { .globl abi_test_clobber_r$_ .align 16 abi_test_clobber_r$_: - _CET_ENDBR xorq %r$_, %r$_ ret .size abi_test_clobber_r$_,.-abi_test_clobber_r$_ @@ -320,7 +318,6 @@ sub store_caller_state { .globl abi_test_clobber_xmm$_ .align 16 abi_test_clobber_xmm$_: - _CET_ENDBR pxor %xmm$_, %xmm$_ ret .size abi_test_clobber_xmm$_,.-abi_test_clobber_xmm$_ @@ -337,7 +334,6 @@ sub store_caller_state { abi_test_bad_unwind_wrong_register: .cfi_startproc .seh_startproc - _CET_ENDBR pushq %r12 .cfi_push %r13 # This should be %r13 .seh_pushreg %r13 # This should be %r13 @@ -361,7 +357,6 @@ sub store_caller_state { abi_test_bad_unwind_temporary: .cfi_startproc .seh_startproc - _CET_ENDBR pushq %r12 .cfi_push %r12 .seh_pushreg %r12 @@ -388,7 +383,6 @@ sub store_caller_state { .type abi_test_set_direction_flag, \@abi-omnipotent .globl abi_test_get_and_clear_direction_flag abi_test_get_and_clear_direction_flag: - _CET_ENDBR pushfq popq %rax andq \$0x400, %rax @@ -402,7 +396,6 @@ sub store_caller_state { .type abi_test_set_direction_flag, \@abi-omnipotent .globl abi_test_set_direction_flag abi_test_set_direction_flag: - _CET_ENDBR std ret .size abi_test_set_direction_flag,.-abi_test_set_direction_flag diff --git a/generated-src/linux-x86_64/crypto/chacha/chacha-x86_64.S b/generated-src/linux-x86_64/crypto/chacha/chacha-x86_64.S index eac7a00fbc..f937fb41e7 100644 --- a/generated-src/linux-x86_64/crypto/chacha/chacha-x86_64.S +++ b/generated-src/linux-x86_64/crypto/chacha/chacha-x86_64.S @@ -46,7 +46,6 @@ .align 64 ChaCha20_ctr32: .cfi_startproc -_CET_ENDBR cmpq $0,%rdx je .Lno_data movq OPENSSL_ia32cap_P+4(%rip),%r10 diff --git a/generated-src/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S b/generated-src/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S index 61cad75d9d..256248c86a 100644 --- a/generated-src/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S +++ b/generated-src/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S @@ -71,7 +71,6 @@ GFMUL: .align 16 aesgcmsiv_htable_init: .cfi_startproc -_CET_ENDBR vmovdqa (%rsi),%xmm0 vmovdqa %xmm0,%xmm1 vmovdqa %xmm0,(%rdi) @@ -98,7 +97,6 @@ _CET_ENDBR .align 16 aesgcmsiv_htable6_init: .cfi_startproc -_CET_ENDBR vmovdqa (%rsi),%xmm0 vmovdqa %xmm0,%xmm1 vmovdqa %xmm0,(%rdi) @@ -121,7 +119,6 @@ _CET_ENDBR .align 16 aesgcmsiv_htable_polyval: .cfi_startproc -_CET_ENDBR testq %rdx,%rdx jnz .Lhtable_polyval_start .byte 0xf3,0xc3 @@ -339,7 +336,6 @@ _CET_ENDBR .align 16 aesgcmsiv_polyval_horner: .cfi_startproc -_CET_ENDBR testq %rcx,%rcx jnz .Lpolyval_horner_start .byte 0xf3,0xc3 @@ -373,7 +369,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_aes_ks: .cfi_startproc -_CET_ENDBR vmovdqu (%rdi),%xmm1 vmovdqa %xmm1,(%rsi) @@ -430,7 +425,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_aes_ks: .cfi_startproc -_CET_ENDBR vmovdqu (%rdi),%xmm1 vmovdqu 16(%rdi),%xmm3 vmovdqa %xmm1,(%rsi) @@ -478,7 +472,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_aes_ks_enc_x1: .cfi_startproc -_CET_ENDBR vmovdqa (%rcx),%xmm1 vmovdqa 0(%rdi),%xmm4 @@ -621,7 +614,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_kdf: .cfi_startproc -_CET_ENDBR @@ -715,7 +707,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_enc_msg_x4: .cfi_startproc -_CET_ENDBR testq %r8,%r8 jnz .L128_enc_msg_x4_start .byte 0xf3,0xc3 @@ -895,7 +886,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_enc_msg_x8: .cfi_startproc -_CET_ENDBR testq %r8,%r8 jnz .L128_enc_msg_x8_start .byte 0xf3,0xc3 @@ -1157,7 +1147,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_dec: .cfi_startproc -_CET_ENDBR testq $~15,%r9 jnz .L128_dec_start .byte 0xf3,0xc3 @@ -1650,7 +1639,6 @@ _CET_ENDBR .align 16 aes128gcmsiv_ecb_enc_block: .cfi_startproc -_CET_ENDBR vmovdqa (%rdi),%xmm1 vpxor (%rdx),%xmm1,%xmm1 @@ -1676,7 +1664,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_aes_ks_enc_x1: .cfi_startproc -_CET_ENDBR vmovdqa con1(%rip),%xmm0 vmovdqa mask(%rip),%xmm15 vmovdqa (%rdi),%xmm8 @@ -1860,7 +1847,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_ecb_enc_block: .cfi_startproc -_CET_ENDBR vmovdqa (%rdi),%xmm1 vpxor (%rdx),%xmm1,%xmm1 vaesenc 16(%rdx),%xmm1,%xmm1 @@ -1887,7 +1873,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_enc_msg_x4: .cfi_startproc -_CET_ENDBR testq %r8,%r8 jnz .L256_enc_msg_x4_start .byte 0xf3,0xc3 @@ -2089,7 +2074,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_enc_msg_x8: .cfi_startproc -_CET_ENDBR testq %r8,%r8 jnz .L256_enc_msg_x8_start .byte 0xf3,0xc3 @@ -2379,7 +2363,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_dec: .cfi_startproc -_CET_ENDBR testq $~15,%r9 jnz .L256_dec_start .byte 0xf3,0xc3 @@ -2940,7 +2923,6 @@ _CET_ENDBR .align 16 aes256gcmsiv_kdf: .cfi_startproc -_CET_ENDBR diff --git a/generated-src/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S b/generated-src/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S index 97a2ce24ed..2239142ae7 100644 --- a/generated-src/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S +++ b/generated-src/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S @@ -223,7 +223,6 @@ poly_hash_ad_internal: .align 64 chacha20_poly1305_open: .cfi_startproc -_CET_ENDBR pushq %rbp .cfi_adjust_cfa_offset 8 .cfi_offset %rbp,-16 @@ -2109,7 +2108,6 @@ _CET_ENDBR .align 64 chacha20_poly1305_seal: .cfi_startproc -_CET_ENDBR pushq %rbp .cfi_adjust_cfa_offset 8 .cfi_offset %rbp,-16 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S index a5209d462e..057b0a3cb4 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S @@ -346,7 +346,6 @@ _aesni_ctr32_ghash_6x: aesni_gcm_decrypt: .cfi_startproc -_CET_ENDBR xorq %rax,%rax @@ -570,7 +569,6 @@ _aesni_ctr32_6x: aesni_gcm_encrypt: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S index ff7185f8c5..41fbd7a269 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S @@ -13,7 +13,6 @@ .align 16 aes_hw_encrypt: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit @@ -46,7 +45,6 @@ _CET_ENDBR .align 16 aes_hw_decrypt: .cfi_startproc -_CET_ENDBR movups (%rdi),%xmm2 movl 240(%rdx),%eax movups (%rdx),%xmm0 @@ -535,7 +533,6 @@ _aesni_decrypt8: .align 16 aes_hw_ecb_encrypt: .cfi_startproc -_CET_ENDBR andq $-16,%rdx jz .Lecb_ret @@ -881,7 +878,6 @@ _CET_ENDBR .align 16 aes_hw_ctr32_encrypt_blocks: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,BORINGSSL_function_hit(%rip) #endif @@ -1467,7 +1463,6 @@ _CET_ENDBR .align 16 aes_hw_xts_encrypt: .cfi_startproc -_CET_ENDBR leaq (%rsp),%r11 .cfi_def_cfa_register %r11 pushq %rbp @@ -1939,7 +1934,6 @@ _CET_ENDBR .align 16 aes_hw_xts_decrypt: .cfi_startproc -_CET_ENDBR leaq (%rsp),%r11 .cfi_def_cfa_register %r11 pushq %rbp @@ -2448,7 +2442,6 @@ _CET_ENDBR .align 16 aes_hw_cbc_encrypt: .cfi_startproc -_CET_ENDBR testq %rdx,%rdx jz .Lcbc_ret @@ -3042,7 +3035,6 @@ _CET_ENDBR .align 16 aes_hw_set_decrypt_key: .cfi_startproc -_CET_ENDBR .byte 0x48,0x83,0xEC,0x08 .cfi_adjust_cfa_offset 8 call __aesni_set_encrypt_key @@ -3089,7 +3081,6 @@ _CET_ENDBR aes_hw_set_encrypt_key: __aesni_set_encrypt_key: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,BORINGSSL_function_hit+3(%rip) #endif diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S index 3b87b47959..0f34b08bb4 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S @@ -17,7 +17,6 @@ gcm_gmult_ssse3: .cfi_startproc -_CET_ENDBR movdqu (%rdi),%xmm0 movdqa .Lreverse_bytes(%rip),%xmm10 movdqa .Llow4_mask(%rip),%xmm2 @@ -208,7 +207,6 @@ _CET_ENDBR gcm_ghash_ssse3: .cfi_startproc -_CET_ENDBR movdqu (%rdi),%xmm0 movdqa .Lreverse_bytes(%rip),%xmm10 movdqa .Llow4_mask(%rip),%xmm11 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S index 5921f1f3c4..c743b11681 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/ghash-x86_64.S @@ -14,7 +14,6 @@ gcm_init_clmul: .cfi_startproc -_CET_ENDBR .L_init_clmul: movdqu (%rsi),%xmm2 pshufd $78,%xmm2,%xmm2 @@ -175,7 +174,6 @@ _CET_ENDBR .align 16 gcm_gmult_clmul: .cfi_startproc -_CET_ENDBR .L_gmult_clmul: movdqu (%rdi),%xmm0 movdqa .Lbswap_mask(%rip),%xmm5 @@ -231,7 +229,6 @@ _CET_ENDBR gcm_ghash_clmul: .cfi_startproc -_CET_ENDBR .L_ghash_clmul: movdqa .Lbswap_mask(%rip),%xmm10 @@ -620,7 +617,6 @@ _CET_ENDBR .align 32 gcm_init_avx: .cfi_startproc -_CET_ENDBR vzeroupper vmovdqu (%rsi),%xmm2 @@ -732,7 +728,6 @@ _CET_ENDBR .align 32 gcm_gmult_avx: .cfi_startproc -_CET_ENDBR jmp .L_gmult_clmul .cfi_endproc .size gcm_gmult_avx,.-gcm_gmult_avx @@ -742,7 +737,6 @@ _CET_ENDBR .align 32 gcm_ghash_avx: .cfi_startproc -_CET_ENDBR vzeroupper vmovdqu (%rdi),%xmm10 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/md5-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/md5-x86_64.S index 43a786cb9a..17292208ce 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/md5-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/md5-x86_64.S @@ -12,7 +12,6 @@ .type md5_block_asm_data_order,@function md5_block_asm_data_order: .cfi_startproc -_CET_ENDBR pushq %rbp .cfi_adjust_cfa_offset 8 .cfi_offset rbp,-16 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S b/generated-src/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S index 2914d92543..cd67d24337 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm.S @@ -38,7 +38,6 @@ .align 32 ecp_nistz256_neg: .cfi_startproc -_CET_ENDBR pushq %r12 .cfi_adjust_cfa_offset 8 .cfi_offset %r12,-16 @@ -101,7 +100,6 @@ _CET_ENDBR .align 32 ecp_nistz256_ord_mul_mont: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -436,7 +434,6 @@ _CET_ENDBR .align 32 ecp_nistz256_ord_sqr_mont: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -1196,7 +1193,6 @@ ecp_nistz256_ord_sqr_montx: .align 32 ecp_nistz256_mul_mont: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -1494,7 +1490,6 @@ __ecp_nistz256_mul_montq: .align 32 ecp_nistz256_sqr_mont: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -2025,7 +2020,6 @@ __ecp_nistz256_sqr_montx: .align 32 ecp_nistz256_select_w5: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rax movq 8(%rax),%rax testl $32,%eax @@ -2093,7 +2087,6 @@ _CET_ENDBR .align 32 ecp_nistz256_select_w7: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rax movq 8(%rax),%rax testl $32,%eax @@ -2214,7 +2207,6 @@ ecp_nistz256_avx2_select_w5: ecp_nistz256_avx2_select_w7: .cfi_startproc .Lavx2_select_w7: -_CET_ENDBR vzeroupper vmovdqa .LThree(%rip),%ymm0 @@ -2421,7 +2413,6 @@ __ecp_nistz256_mul_by_2q: .align 32 ecp_nistz256_point_double: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -2656,7 +2647,6 @@ _CET_ENDBR .align 32 ecp_nistz256_point_add: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -3094,7 +3084,6 @@ _CET_ENDBR .align 32 ecp_nistz256_point_add_affine: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S b/generated-src/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S index a04d80bcc5..4ac7574b11 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S @@ -13,7 +13,6 @@ .align 32 beeu_mod_inverse_vartime: .cfi_startproc -_CET_ENDBR pushq %rbp .cfi_adjust_cfa_offset 8 .cfi_offset rbp,-16 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S index f760fcb909..a4f183bec8 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/rdrand-x86_64.S @@ -15,7 +15,6 @@ .align 16 CRYPTO_rdrand: .cfi_startproc -_CET_ENDBR xorq %rax,%rax .byte 72,15,199,242 testq %rdx,%rdx @@ -42,7 +41,6 @@ _CET_ENDBR .align 16 CRYPTO_rdrand_multiple8_buf: .cfi_startproc -_CET_ENDBR testq %rsi,%rsi jz .Lout movq $8,%rdx diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S b/generated-src/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S index ee47d4fd7f..815f6a0a69 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/rsaz-avx2.S @@ -12,7 +12,6 @@ .align 64 rsaz_1024_sqr_avx2: .cfi_startproc -_CET_ENDBR leaq (%rsp),%rax .cfi_def_cfa_register %rax pushq %rbx @@ -667,7 +666,6 @@ _CET_ENDBR .align 64 rsaz_1024_mul_avx2: .cfi_startproc -_CET_ENDBR leaq (%rsp),%rax .cfi_def_cfa_register %rax pushq %rbx @@ -1224,7 +1222,6 @@ _CET_ENDBR .align 32 rsaz_1024_red2norm_avx2: .cfi_startproc -_CET_ENDBR subq $-128,%rsi xorq %rax,%rax movq -128(%rsi),%r8 @@ -1425,7 +1422,6 @@ _CET_ENDBR .align 32 rsaz_1024_norm2red_avx2: .cfi_startproc -_CET_ENDBR subq $-128,%rdi movq (%rsi),%r8 movl $0x1fffffff,%eax @@ -1586,7 +1582,6 @@ _CET_ENDBR .align 32 rsaz_1024_scatter5_avx2: .cfi_startproc -_CET_ENDBR vzeroupper vmovdqu .Lscatter_permd(%rip),%ymm5 shll $4,%edx @@ -1615,7 +1610,6 @@ _CET_ENDBR .align 32 rsaz_1024_gather5_avx2: .cfi_startproc -_CET_ENDBR vzeroupper movq %rsp,%r11 .cfi_def_cfa_register %r11 diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S index 1b64f02014..7ac3b26529 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/sha1-x86_64.S @@ -14,7 +14,6 @@ .align 16 sha1_block_data_order: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%r10 movl 0(%r10),%r9d movl 4(%r10),%r8d diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S index 554d3e4d19..d9f1e7dee4 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/sha256-x86_64.S @@ -14,7 +14,6 @@ .align 16 sha256_block_data_order: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S index 66a60d73d0..9a581da78f 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/sha512-x86_64.S @@ -14,7 +14,6 @@ .align 16 sha512_block_data_order: .cfi_startproc -_CET_ENDBR leaq OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S b/generated-src/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S index ad8922473b..623d19011b 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S @@ -805,7 +805,6 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit @@ -831,7 +830,6 @@ _CET_ENDBR .align 16 vpaes_set_decrypt_key: .cfi_startproc -_CET_ENDBR movl %esi,%eax shrl $5,%eax addl $5,%eax @@ -856,7 +854,6 @@ _CET_ENDBR .align 16 vpaes_encrypt: .cfi_startproc -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit @@ -876,7 +873,6 @@ _CET_ENDBR .align 16 vpaes_decrypt: .cfi_startproc -_CET_ENDBR movdqu (%rdi),%xmm0 call _vpaes_preheat call _vpaes_decrypt_core @@ -890,7 +886,6 @@ _CET_ENDBR .align 16 vpaes_cbc_encrypt: .cfi_startproc -_CET_ENDBR xchgq %rcx,%rdx subq $16,%rcx jc .Lcbc_abort @@ -934,7 +929,6 @@ _CET_ENDBR .align 16 vpaes_ctr32_encrypt_blocks: .cfi_startproc -_CET_ENDBR xchgq %rcx,%rdx testq %rcx,%rcx diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont.S b/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont.S index 85c592c077..9febd7d51f 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont.S @@ -15,7 +15,6 @@ .align 16 bn_mul_mont: .cfi_startproc -_CET_ENDBR movl %r9d,%r9d movq %rsp,%rax .cfi_def_cfa_register %rax diff --git a/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S b/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S index 1f15e9fb7f..9b531c74cc 100644 --- a/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S +++ b/generated-src/linux-x86_64/crypto/fipsmodule/x86_64-mont5.S @@ -15,7 +15,6 @@ .align 64 bn_mul_mont_gather5: .cfi_startproc -_CET_ENDBR movl %r9d,%r9d movq %rsp,%rax .cfi_def_cfa_register %rax @@ -1094,7 +1093,6 @@ mul4x_internal: .align 32 bn_power5: .cfi_startproc -_CET_ENDBR movq %rsp,%rax .cfi_def_cfa_register %rax leaq OPENSSL_ia32cap_P(%rip),%r11 @@ -1234,7 +1232,6 @@ _CET_ENDBR bn_sqr8x_internal: __bn_sqr8x_internal: .cfi_startproc -_CET_ENDBR @@ -2747,7 +2744,6 @@ bn_powerx5: bn_sqrx8x_internal: __bn_sqrx8x_internal: .cfi_startproc -_CET_ENDBR @@ -3420,7 +3416,6 @@ __bn_postx4x_internal: .align 16 bn_scatter5: .cfi_startproc -_CET_ENDBR cmpl $0,%esi jz .Lscatter_epilogue @@ -3452,7 +3447,6 @@ _CET_ENDBR bn_gather5: .cfi_startproc .LSEH_begin_bn_gather5: -_CET_ENDBR .byte 0x4c,0x8d,0x14,0x24 .cfi_def_cfa_register %r10 diff --git a/generated-src/linux-x86_64/crypto/test/trampoline-x86_64.S b/generated-src/linux-x86_64/crypto/test/trampoline-x86_64.S index 38cd8d5225..1577042033 100644 --- a/generated-src/linux-x86_64/crypto/test/trampoline-x86_64.S +++ b/generated-src/linux-x86_64/crypto/test/trampoline-x86_64.S @@ -20,7 +20,6 @@ abi_test_trampoline: .cfi_startproc -_CET_ENDBR @@ -182,7 +181,6 @@ abi_test_unwind_stop: .hidden abi_test_clobber_rax .align 16 abi_test_clobber_rax: -_CET_ENDBR xorq %rax,%rax .byte 0xf3,0xc3 .size abi_test_clobber_rax,.-abi_test_clobber_rax @@ -191,7 +189,6 @@ _CET_ENDBR .hidden abi_test_clobber_rbx .align 16 abi_test_clobber_rbx: -_CET_ENDBR xorq %rbx,%rbx .byte 0xf3,0xc3 .size abi_test_clobber_rbx,.-abi_test_clobber_rbx @@ -200,7 +197,6 @@ _CET_ENDBR .hidden abi_test_clobber_rcx .align 16 abi_test_clobber_rcx: -_CET_ENDBR xorq %rcx,%rcx .byte 0xf3,0xc3 .size abi_test_clobber_rcx,.-abi_test_clobber_rcx @@ -209,7 +205,6 @@ _CET_ENDBR .hidden abi_test_clobber_rdx .align 16 abi_test_clobber_rdx: -_CET_ENDBR xorq %rdx,%rdx .byte 0xf3,0xc3 .size abi_test_clobber_rdx,.-abi_test_clobber_rdx @@ -218,7 +213,6 @@ _CET_ENDBR .hidden abi_test_clobber_rdi .align 16 abi_test_clobber_rdi: -_CET_ENDBR xorq %rdi,%rdi .byte 0xf3,0xc3 .size abi_test_clobber_rdi,.-abi_test_clobber_rdi @@ -227,7 +221,6 @@ _CET_ENDBR .hidden abi_test_clobber_rsi .align 16 abi_test_clobber_rsi: -_CET_ENDBR xorq %rsi,%rsi .byte 0xf3,0xc3 .size abi_test_clobber_rsi,.-abi_test_clobber_rsi @@ -236,7 +229,6 @@ _CET_ENDBR .hidden abi_test_clobber_rbp .align 16 abi_test_clobber_rbp: -_CET_ENDBR xorq %rbp,%rbp .byte 0xf3,0xc3 .size abi_test_clobber_rbp,.-abi_test_clobber_rbp @@ -245,7 +237,6 @@ _CET_ENDBR .hidden abi_test_clobber_r8 .align 16 abi_test_clobber_r8: -_CET_ENDBR xorq %r8,%r8 .byte 0xf3,0xc3 .size abi_test_clobber_r8,.-abi_test_clobber_r8 @@ -254,7 +245,6 @@ _CET_ENDBR .hidden abi_test_clobber_r9 .align 16 abi_test_clobber_r9: -_CET_ENDBR xorq %r9,%r9 .byte 0xf3,0xc3 .size abi_test_clobber_r9,.-abi_test_clobber_r9 @@ -263,7 +253,6 @@ _CET_ENDBR .hidden abi_test_clobber_r10 .align 16 abi_test_clobber_r10: -_CET_ENDBR xorq %r10,%r10 .byte 0xf3,0xc3 .size abi_test_clobber_r10,.-abi_test_clobber_r10 @@ -272,7 +261,6 @@ _CET_ENDBR .hidden abi_test_clobber_r11 .align 16 abi_test_clobber_r11: -_CET_ENDBR xorq %r11,%r11 .byte 0xf3,0xc3 .size abi_test_clobber_r11,.-abi_test_clobber_r11 @@ -281,7 +269,6 @@ _CET_ENDBR .hidden abi_test_clobber_r12 .align 16 abi_test_clobber_r12: -_CET_ENDBR xorq %r12,%r12 .byte 0xf3,0xc3 .size abi_test_clobber_r12,.-abi_test_clobber_r12 @@ -290,7 +277,6 @@ _CET_ENDBR .hidden abi_test_clobber_r13 .align 16 abi_test_clobber_r13: -_CET_ENDBR xorq %r13,%r13 .byte 0xf3,0xc3 .size abi_test_clobber_r13,.-abi_test_clobber_r13 @@ -299,7 +285,6 @@ _CET_ENDBR .hidden abi_test_clobber_r14 .align 16 abi_test_clobber_r14: -_CET_ENDBR xorq %r14,%r14 .byte 0xf3,0xc3 .size abi_test_clobber_r14,.-abi_test_clobber_r14 @@ -308,7 +293,6 @@ _CET_ENDBR .hidden abi_test_clobber_r15 .align 16 abi_test_clobber_r15: -_CET_ENDBR xorq %r15,%r15 .byte 0xf3,0xc3 .size abi_test_clobber_r15,.-abi_test_clobber_r15 @@ -317,7 +301,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm0 .align 16 abi_test_clobber_xmm0: -_CET_ENDBR pxor %xmm0,%xmm0 .byte 0xf3,0xc3 .size abi_test_clobber_xmm0,.-abi_test_clobber_xmm0 @@ -326,7 +309,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm1 .align 16 abi_test_clobber_xmm1: -_CET_ENDBR pxor %xmm1,%xmm1 .byte 0xf3,0xc3 .size abi_test_clobber_xmm1,.-abi_test_clobber_xmm1 @@ -335,7 +317,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm2 .align 16 abi_test_clobber_xmm2: -_CET_ENDBR pxor %xmm2,%xmm2 .byte 0xf3,0xc3 .size abi_test_clobber_xmm2,.-abi_test_clobber_xmm2 @@ -344,7 +325,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm3 .align 16 abi_test_clobber_xmm3: -_CET_ENDBR pxor %xmm3,%xmm3 .byte 0xf3,0xc3 .size abi_test_clobber_xmm3,.-abi_test_clobber_xmm3 @@ -353,7 +333,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm4 .align 16 abi_test_clobber_xmm4: -_CET_ENDBR pxor %xmm4,%xmm4 .byte 0xf3,0xc3 .size abi_test_clobber_xmm4,.-abi_test_clobber_xmm4 @@ -362,7 +341,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm5 .align 16 abi_test_clobber_xmm5: -_CET_ENDBR pxor %xmm5,%xmm5 .byte 0xf3,0xc3 .size abi_test_clobber_xmm5,.-abi_test_clobber_xmm5 @@ -371,7 +349,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm6 .align 16 abi_test_clobber_xmm6: -_CET_ENDBR pxor %xmm6,%xmm6 .byte 0xf3,0xc3 .size abi_test_clobber_xmm6,.-abi_test_clobber_xmm6 @@ -380,7 +357,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm7 .align 16 abi_test_clobber_xmm7: -_CET_ENDBR pxor %xmm7,%xmm7 .byte 0xf3,0xc3 .size abi_test_clobber_xmm7,.-abi_test_clobber_xmm7 @@ -389,7 +365,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm8 .align 16 abi_test_clobber_xmm8: -_CET_ENDBR pxor %xmm8,%xmm8 .byte 0xf3,0xc3 .size abi_test_clobber_xmm8,.-abi_test_clobber_xmm8 @@ -398,7 +373,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm9 .align 16 abi_test_clobber_xmm9: -_CET_ENDBR pxor %xmm9,%xmm9 .byte 0xf3,0xc3 .size abi_test_clobber_xmm9,.-abi_test_clobber_xmm9 @@ -407,7 +381,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm10 .align 16 abi_test_clobber_xmm10: -_CET_ENDBR pxor %xmm10,%xmm10 .byte 0xf3,0xc3 .size abi_test_clobber_xmm10,.-abi_test_clobber_xmm10 @@ -416,7 +389,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm11 .align 16 abi_test_clobber_xmm11: -_CET_ENDBR pxor %xmm11,%xmm11 .byte 0xf3,0xc3 .size abi_test_clobber_xmm11,.-abi_test_clobber_xmm11 @@ -425,7 +397,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm12 .align 16 abi_test_clobber_xmm12: -_CET_ENDBR pxor %xmm12,%xmm12 .byte 0xf3,0xc3 .size abi_test_clobber_xmm12,.-abi_test_clobber_xmm12 @@ -434,7 +405,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm13 .align 16 abi_test_clobber_xmm13: -_CET_ENDBR pxor %xmm13,%xmm13 .byte 0xf3,0xc3 .size abi_test_clobber_xmm13,.-abi_test_clobber_xmm13 @@ -443,7 +413,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm14 .align 16 abi_test_clobber_xmm14: -_CET_ENDBR pxor %xmm14,%xmm14 .byte 0xf3,0xc3 .size abi_test_clobber_xmm14,.-abi_test_clobber_xmm14 @@ -452,7 +421,6 @@ _CET_ENDBR .hidden abi_test_clobber_xmm15 .align 16 abi_test_clobber_xmm15: -_CET_ENDBR pxor %xmm15,%xmm15 .byte 0xf3,0xc3 .size abi_test_clobber_xmm15,.-abi_test_clobber_xmm15 @@ -466,7 +434,6 @@ _CET_ENDBR abi_test_bad_unwind_wrong_register: .cfi_startproc -_CET_ENDBR pushq %r12 .cfi_adjust_cfa_offset 8 .cfi_offset %r13,-16 @@ -493,7 +460,6 @@ _CET_ENDBR abi_test_bad_unwind_temporary: .cfi_startproc -_CET_ENDBR pushq %r12 .cfi_adjust_cfa_offset 8 .cfi_offset %r12,-16 @@ -523,7 +489,6 @@ _CET_ENDBR .globl abi_test_get_and_clear_direction_flag .hidden abi_test_get_and_clear_direction_flag abi_test_get_and_clear_direction_flag: -_CET_ENDBR pushfq popq %rax andq $0x400,%rax @@ -538,7 +503,6 @@ _CET_ENDBR .globl abi_test_set_direction_flag .hidden abi_test_set_direction_flag abi_test_set_direction_flag: -_CET_ENDBR std .byte 0xf3,0xc3 .size abi_test_set_direction_flag,.-abi_test_set_direction_flag diff --git a/generated-src/mac-x86_64/crypto/chacha/chacha-x86_64.S b/generated-src/mac-x86_64/crypto/chacha/chacha-x86_64.S index b80364b7a4..b9d21ffbd7 100644 --- a/generated-src/mac-x86_64/crypto/chacha/chacha-x86_64.S +++ b/generated-src/mac-x86_64/crypto/chacha/chacha-x86_64.S @@ -45,7 +45,6 @@ L$sixteen: .p2align 6 _ChaCha20_ctr32: -_CET_ENDBR cmpq $0,%rdx je L$no_data movq _OPENSSL_ia32cap_P+4(%rip),%r10 diff --git a/generated-src/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S b/generated-src/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S index df3a561d32..8d940a0d88 100644 --- a/generated-src/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S +++ b/generated-src/mac-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S @@ -71,7 +71,6 @@ GFMUL: .p2align 4 _aesgcmsiv_htable_init: -_CET_ENDBR vmovdqa (%rsi),%xmm0 vmovdqa %xmm0,%xmm1 vmovdqa %xmm0,(%rdi) @@ -98,7 +97,6 @@ _CET_ENDBR .p2align 4 _aesgcmsiv_htable6_init: -_CET_ENDBR vmovdqa (%rsi),%xmm0 vmovdqa %xmm0,%xmm1 vmovdqa %xmm0,(%rdi) @@ -121,7 +119,6 @@ _CET_ENDBR .p2align 4 _aesgcmsiv_htable_polyval: -_CET_ENDBR testq %rdx,%rdx jnz L$htable_polyval_start .byte 0xf3,0xc3 @@ -339,7 +336,6 @@ L$htable_polyval_out: .p2align 4 _aesgcmsiv_polyval_horner: -_CET_ENDBR testq %rcx,%rcx jnz L$polyval_horner_start .byte 0xf3,0xc3 @@ -373,7 +369,6 @@ L$polyval_horner_loop: .p2align 4 _aes128gcmsiv_aes_ks: -_CET_ENDBR vmovdqu (%rdi),%xmm1 vmovdqa %xmm1,(%rsi) @@ -430,7 +425,6 @@ L$ks128_loop: .p2align 4 _aes256gcmsiv_aes_ks: -_CET_ENDBR vmovdqu (%rdi),%xmm1 vmovdqu 16(%rdi),%xmm3 vmovdqa %xmm1,(%rsi) @@ -478,7 +472,6 @@ L$ks256_loop: .p2align 4 _aes128gcmsiv_aes_ks_enc_x1: -_CET_ENDBR vmovdqa (%rcx),%xmm1 vmovdqa 0(%rdi),%xmm4 @@ -621,7 +614,6 @@ _CET_ENDBR .p2align 4 _aes128gcmsiv_kdf: -_CET_ENDBR @@ -715,7 +707,6 @@ _CET_ENDBR .p2align 4 _aes128gcmsiv_enc_msg_x4: -_CET_ENDBR testq %r8,%r8 jnz L$128_enc_msg_x4_start .byte 0xf3,0xc3 @@ -891,7 +882,6 @@ L$128_enc_msg_x4_out: .p2align 4 _aes128gcmsiv_enc_msg_x8: -_CET_ENDBR testq %r8,%r8 jnz L$128_enc_msg_x8_start .byte 0xf3,0xc3 @@ -1147,7 +1137,6 @@ L$128_enc_msg_x8_out: .p2align 4 _aes128gcmsiv_dec: -_CET_ENDBR testq $~15,%r9 jnz L$128_dec_start .byte 0xf3,0xc3 @@ -1640,7 +1629,6 @@ L$128_dec_out: .p2align 4 _aes128gcmsiv_ecb_enc_block: -_CET_ENDBR vmovdqa (%rdi),%xmm1 vpxor (%rdx),%xmm1,%xmm1 @@ -1666,7 +1654,6 @@ _CET_ENDBR .p2align 4 _aes256gcmsiv_aes_ks_enc_x1: -_CET_ENDBR vmovdqa con1(%rip),%xmm0 vmovdqa mask(%rip),%xmm15 vmovdqa (%rdi),%xmm8 @@ -1850,7 +1837,6 @@ _CET_ENDBR .p2align 4 _aes256gcmsiv_ecb_enc_block: -_CET_ENDBR vmovdqa (%rdi),%xmm1 vpxor (%rdx),%xmm1,%xmm1 vaesenc 16(%rdx),%xmm1,%xmm1 @@ -1877,7 +1863,6 @@ _CET_ENDBR .p2align 4 _aes256gcmsiv_enc_msg_x4: -_CET_ENDBR testq %r8,%r8 jnz L$256_enc_msg_x4_start .byte 0xf3,0xc3 @@ -2079,7 +2064,6 @@ L$256_enc_msg_x4_out: .p2align 4 _aes256gcmsiv_enc_msg_x8: -_CET_ENDBR testq %r8,%r8 jnz L$256_enc_msg_x8_start .byte 0xf3,0xc3 @@ -2369,7 +2353,6 @@ L$256_enc_msg_x8_out: .p2align 4 _aes256gcmsiv_dec: -_CET_ENDBR testq $~15,%r9 jnz L$256_dec_start .byte 0xf3,0xc3 @@ -2930,7 +2913,6 @@ L$256_dec_out: .p2align 4 _aes256gcmsiv_kdf: -_CET_ENDBR diff --git a/generated-src/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S b/generated-src/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S index efe05de3e9..41ac181ea6 100644 --- a/generated-src/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S +++ b/generated-src/mac-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.S @@ -222,7 +222,6 @@ L$hash_ad_done: .p2align 6 _chacha20_poly1305_open: -_CET_ENDBR pushq %rbp pushq %rbx @@ -2094,7 +2093,6 @@ L$open_sse_128_xor_hash: .p2align 6 _chacha20_poly1305_seal: -_CET_ENDBR pushq %rbp pushq %rbx diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S index c946f93f99..0c3b2964aa 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S @@ -346,7 +346,6 @@ L$6x_done: _aesni_gcm_decrypt: -_CET_ENDBR xorq %rax,%rax @@ -563,7 +562,6 @@ L$handle_ctr32_2: _aesni_gcm_encrypt: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit+2(%rip) diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S index 41263854ba..7863a20c59 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/aesni-x86_64.S @@ -12,7 +12,6 @@ .p2align 4 _aes_hw_encrypt: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit+1(%rip) @@ -44,7 +43,6 @@ L$oop_enc1_1: .p2align 4 _aes_hw_decrypt: -_CET_ENDBR movups (%rdi),%xmm2 movl 240(%rdx),%eax movups (%rdx),%xmm0 @@ -533,7 +531,6 @@ L$dec_loop8_enter: .p2align 4 _aes_hw_ecb_encrypt: -_CET_ENDBR andq $-16,%rdx jz L$ecb_ret @@ -879,7 +876,6 @@ L$ecb_ret: .p2align 4 _aes_hw_ctr32_encrypt_blocks: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit(%rip) #endif @@ -1465,7 +1461,6 @@ L$ctr32_epilogue: .p2align 4 _aes_hw_xts_encrypt: -_CET_ENDBR leaq (%rsp),%r11 pushq %rbp @@ -1937,7 +1932,6 @@ L$xts_enc_epilogue: .p2align 4 _aes_hw_xts_decrypt: -_CET_ENDBR leaq (%rsp),%r11 pushq %rbp @@ -2446,7 +2440,6 @@ L$xts_dec_epilogue: .p2align 4 _aes_hw_cbc_encrypt: -_CET_ENDBR testq %rdx,%rdx jz L$cbc_ret @@ -3040,7 +3033,6 @@ L$cbc_ret: .p2align 4 _aes_hw_set_decrypt_key: -_CET_ENDBR .byte 0x48,0x83,0xEC,0x08 call __aesni_set_encrypt_key @@ -3087,7 +3079,6 @@ L$SEH_end_set_decrypt_key: _aes_hw_set_encrypt_key: __aesni_set_encrypt_key: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit+3(%rip) #endif diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S index f7d5117c23..9d22addcb0 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.S @@ -17,7 +17,6 @@ _gcm_gmult_ssse3: -_CET_ENDBR movdqu (%rdi),%xmm0 movdqa L$reverse_bytes(%rip),%xmm10 movdqa L$low4_mask(%rip),%xmm2 @@ -208,7 +207,6 @@ L$oop_row_3: _gcm_ghash_ssse3: -_CET_ENDBR movdqu (%rdi),%xmm0 movdqa L$reverse_bytes(%rip),%xmm10 movdqa L$low4_mask(%rip),%xmm11 diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S index bcbea651c9..ab3b9756e2 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/ghash-x86_64.S @@ -13,7 +13,6 @@ _gcm_init_clmul: -_CET_ENDBR L$_init_clmul: movdqu (%rsi),%xmm2 pshufd $78,%xmm2,%xmm2 @@ -174,7 +173,6 @@ L$_init_clmul: .p2align 4 _gcm_gmult_clmul: -_CET_ENDBR L$_gmult_clmul: movdqu (%rdi),%xmm0 movdqa L$bswap_mask(%rip),%xmm5 @@ -230,7 +228,6 @@ L$_gmult_clmul: _gcm_ghash_clmul: -_CET_ENDBR L$_ghash_clmul: movdqa L$bswap_mask(%rip),%xmm10 @@ -619,7 +616,6 @@ L$done: .p2align 5 _gcm_init_avx: -_CET_ENDBR vzeroupper vmovdqu (%rsi),%xmm2 @@ -731,7 +727,6 @@ L$init_start_avx: .p2align 5 _gcm_gmult_avx: -_CET_ENDBR jmp L$_gmult_clmul @@ -741,7 +736,6 @@ _CET_ENDBR .p2align 5 _gcm_ghash_avx: -_CET_ENDBR vzeroupper vmovdqu (%rdi),%xmm10 diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/md5-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/md5-x86_64.S index 9170682312..7e90c955bd 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/md5-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/md5-x86_64.S @@ -12,7 +12,6 @@ _md5_block_asm_data_order: -_CET_ENDBR pushq %rbp pushq %rbx diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S b/generated-src/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S index b148ec47a9..b5215e41cd 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/p256-x86_64-asm.S @@ -37,7 +37,6 @@ L$ordK: .p2align 5 _ecp_nistz256_neg: -_CET_ENDBR pushq %r12 pushq %r13 @@ -98,7 +97,6 @@ L$neg_epilogue: .p2align 5 _ecp_nistz256_ord_mul_mont: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -427,7 +425,6 @@ L$ord_mul_epilogue: .p2align 5 _ecp_nistz256_ord_sqr_mont: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -1169,7 +1166,6 @@ L$ord_sqrx_epilogue: .p2align 5 _ecp_nistz256_mul_mont: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -1461,7 +1457,6 @@ __ecp_nistz256_mul_montq: .p2align 5 _ecp_nistz256_sqr_mont: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -1986,7 +1981,6 @@ __ecp_nistz256_sqr_montx: .p2align 5 _ecp_nistz256_select_w5: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rax movq 8(%rax),%rax testl $32,%eax @@ -2054,7 +2048,6 @@ L$SEH_end_ecp_nistz256_select_w5: .p2align 5 _ecp_nistz256_select_w7: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rax movq 8(%rax),%rax testl $32,%eax @@ -2175,7 +2168,6 @@ L$SEH_end_ecp_nistz256_avx2_select_w5: _ecp_nistz256_avx2_select_w7: L$avx2_select_w7: -_CET_ENDBR vzeroupper vmovdqa L$Three(%rip),%ymm0 @@ -2382,7 +2374,6 @@ __ecp_nistz256_mul_by_2q: .p2align 5 _ecp_nistz256_point_double: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -2611,7 +2602,6 @@ L$point_doubleq_epilogue: .p2align 5 _ecp_nistz256_point_add: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx @@ -3043,7 +3033,6 @@ L$point_addq_epilogue: .p2align 5 _ecp_nistz256_point_add_affine: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%rcx movq 8(%rcx),%rcx andl $0x80100,%ecx diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S b/generated-src/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S index 5f91bad704..66e0df7c87 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.S @@ -13,7 +13,6 @@ .p2align 5 _beeu_mod_inverse_vartime: -_CET_ENDBR pushq %rbp pushq %r12 diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S index 88d0376f20..3e76ddeb06 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/rdrand-x86_64.S @@ -15,7 +15,6 @@ .p2align 4 _CRYPTO_rdrand: -_CET_ENDBR xorq %rax,%rax .byte 72,15,199,242 testq %rdx,%rdx @@ -42,7 +41,6 @@ L$err: .p2align 4 _CRYPTO_rdrand_multiple8_buf: -_CET_ENDBR testq %rsi,%rsi jz L$out movq $8,%rdx diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S b/generated-src/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S index 09ce2caa0c..6c79f7f619 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/rsaz-avx2.S @@ -12,7 +12,6 @@ .p2align 6 _rsaz_1024_sqr_avx2: -_CET_ENDBR leaq (%rsp),%rax pushq %rbx @@ -667,7 +666,6 @@ L$sqr_1024_epilogue: .p2align 6 _rsaz_1024_mul_avx2: -_CET_ENDBR leaq (%rsp),%rax pushq %rbx @@ -1224,7 +1222,6 @@ L$mul_1024_epilogue: .p2align 5 _rsaz_1024_red2norm_avx2: -_CET_ENDBR subq $-128,%rsi xorq %rax,%rax movq -128(%rsi),%r8 @@ -1425,7 +1422,6 @@ _CET_ENDBR .p2align 5 _rsaz_1024_norm2red_avx2: -_CET_ENDBR subq $-128,%rdi movq (%rsi),%r8 movl $0x1fffffff,%eax @@ -1586,7 +1582,6 @@ _CET_ENDBR .p2align 5 _rsaz_1024_scatter5_avx2: -_CET_ENDBR vzeroupper vmovdqu L$scatter_permd(%rip),%ymm5 shll $4,%edx @@ -1615,7 +1610,6 @@ L$oop_scatter_1024: .p2align 5 _rsaz_1024_gather5_avx2: -_CET_ENDBR vzeroupper movq %rsp,%r11 diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S index 51bdebbf6f..bdf8425b74 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/sha1-x86_64.S @@ -13,7 +13,6 @@ .p2align 4 _sha1_block_data_order: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%r10 movl 0(%r10),%r9d movl 4(%r10),%r8d diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S index a7307cf777..4ce654d996 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/sha256-x86_64.S @@ -13,7 +13,6 @@ .p2align 4 _sha256_block_data_order: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S index 9adc202914..0854366fce 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/sha512-x86_64.S @@ -13,7 +13,6 @@ .p2align 4 _sha512_block_data_order: -_CET_ENDBR leaq _OPENSSL_ia32cap_P(%rip),%r11 movl 0(%r11),%r9d movl 4(%r11),%r10d diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S b/generated-src/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S index 041d504fb4..e0dcb74b2b 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/vpaes-x86_64.S @@ -805,7 +805,6 @@ L$schedule_mangle_both: .p2align 4 _vpaes_set_encrypt_key: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit+5(%rip) @@ -830,7 +829,6 @@ _CET_ENDBR .p2align 4 _vpaes_set_decrypt_key: -_CET_ENDBR movl %esi,%eax shrl $5,%eax addl $5,%eax @@ -855,7 +853,6 @@ _CET_ENDBR .p2align 4 _vpaes_encrypt: -_CET_ENDBR #ifdef BORINGSSL_DISPATCH_TEST movb $1,_BORINGSSL_function_hit+4(%rip) @@ -874,7 +871,6 @@ _CET_ENDBR .p2align 4 _vpaes_decrypt: -_CET_ENDBR movdqu (%rdi),%xmm0 call _vpaes_preheat call _vpaes_decrypt_core @@ -888,7 +884,6 @@ _CET_ENDBR .p2align 4 _vpaes_cbc_encrypt: -_CET_ENDBR xchgq %rcx,%rdx subq $16,%rcx jc L$cbc_abort @@ -932,7 +927,6 @@ L$cbc_abort: .p2align 4 _vpaes_ctr32_encrypt_blocks: -_CET_ENDBR xchgq %rcx,%rdx testq %rcx,%rcx diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont.S b/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont.S index 30f677737f..eae7778d9d 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont.S @@ -14,7 +14,6 @@ .p2align 4 _bn_mul_mont: -_CET_ENDBR movl %r9d,%r9d movq %rsp,%rax diff --git a/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S b/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S index 94ae140718..cd570012d3 100644 --- a/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S +++ b/generated-src/mac-x86_64/crypto/fipsmodule/x86_64-mont5.S @@ -14,7 +14,6 @@ .p2align 6 _bn_mul_mont_gather5: -_CET_ENDBR movl %r9d,%r9d movq %rsp,%rax @@ -1093,7 +1092,6 @@ L$inner4x: .p2align 5 _bn_power5: -_CET_ENDBR movq %rsp,%rax leaq _OPENSSL_ia32cap_P(%rip),%r11 @@ -1233,7 +1231,6 @@ L$power5_epilogue: _bn_sqr8x_internal: __bn_sqr8x_internal: -_CET_ENDBR @@ -2746,7 +2743,6 @@ L$powerx5_epilogue: _bn_sqrx8x_internal: __bn_sqrx8x_internal: -_CET_ENDBR @@ -3419,7 +3415,6 @@ L$sqrx4x_sub_entry: .p2align 4 _bn_scatter5: -_CET_ENDBR cmpl $0,%esi jz L$scatter_epilogue @@ -3451,7 +3446,6 @@ L$scatter_epilogue: _bn_gather5: L$SEH_begin_bn_gather5: -_CET_ENDBR .byte 0x4c,0x8d,0x14,0x24 diff --git a/generated-src/mac-x86_64/crypto/test/trampoline-x86_64.S b/generated-src/mac-x86_64/crypto/test/trampoline-x86_64.S index 693200825d..bda4a20263 100644 --- a/generated-src/mac-x86_64/crypto/test/trampoline-x86_64.S +++ b/generated-src/mac-x86_64/crypto/test/trampoline-x86_64.S @@ -20,7 +20,6 @@ _abi_test_trampoline: -_CET_ENDBR @@ -182,7 +181,6 @@ L$call_done: .private_extern _abi_test_clobber_rax .p2align 4 _abi_test_clobber_rax: -_CET_ENDBR xorq %rax,%rax .byte 0xf3,0xc3 @@ -191,7 +189,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rbx .p2align 4 _abi_test_clobber_rbx: -_CET_ENDBR xorq %rbx,%rbx .byte 0xf3,0xc3 @@ -200,7 +197,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rcx .p2align 4 _abi_test_clobber_rcx: -_CET_ENDBR xorq %rcx,%rcx .byte 0xf3,0xc3 @@ -209,7 +205,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rdx .p2align 4 _abi_test_clobber_rdx: -_CET_ENDBR xorq %rdx,%rdx .byte 0xf3,0xc3 @@ -218,7 +213,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rdi .p2align 4 _abi_test_clobber_rdi: -_CET_ENDBR xorq %rdi,%rdi .byte 0xf3,0xc3 @@ -227,7 +221,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rsi .p2align 4 _abi_test_clobber_rsi: -_CET_ENDBR xorq %rsi,%rsi .byte 0xf3,0xc3 @@ -236,7 +229,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_rbp .p2align 4 _abi_test_clobber_rbp: -_CET_ENDBR xorq %rbp,%rbp .byte 0xf3,0xc3 @@ -245,7 +237,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r8 .p2align 4 _abi_test_clobber_r8: -_CET_ENDBR xorq %r8,%r8 .byte 0xf3,0xc3 @@ -254,7 +245,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r9 .p2align 4 _abi_test_clobber_r9: -_CET_ENDBR xorq %r9,%r9 .byte 0xf3,0xc3 @@ -263,7 +253,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r10 .p2align 4 _abi_test_clobber_r10: -_CET_ENDBR xorq %r10,%r10 .byte 0xf3,0xc3 @@ -272,7 +261,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r11 .p2align 4 _abi_test_clobber_r11: -_CET_ENDBR xorq %r11,%r11 .byte 0xf3,0xc3 @@ -281,7 +269,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r12 .p2align 4 _abi_test_clobber_r12: -_CET_ENDBR xorq %r12,%r12 .byte 0xf3,0xc3 @@ -290,7 +277,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r13 .p2align 4 _abi_test_clobber_r13: -_CET_ENDBR xorq %r13,%r13 .byte 0xf3,0xc3 @@ -299,7 +285,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r14 .p2align 4 _abi_test_clobber_r14: -_CET_ENDBR xorq %r14,%r14 .byte 0xf3,0xc3 @@ -308,7 +293,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_r15 .p2align 4 _abi_test_clobber_r15: -_CET_ENDBR xorq %r15,%r15 .byte 0xf3,0xc3 @@ -317,7 +301,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm0 .p2align 4 _abi_test_clobber_xmm0: -_CET_ENDBR pxor %xmm0,%xmm0 .byte 0xf3,0xc3 @@ -326,7 +309,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm1 .p2align 4 _abi_test_clobber_xmm1: -_CET_ENDBR pxor %xmm1,%xmm1 .byte 0xf3,0xc3 @@ -335,7 +317,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm2 .p2align 4 _abi_test_clobber_xmm2: -_CET_ENDBR pxor %xmm2,%xmm2 .byte 0xf3,0xc3 @@ -344,7 +325,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm3 .p2align 4 _abi_test_clobber_xmm3: -_CET_ENDBR pxor %xmm3,%xmm3 .byte 0xf3,0xc3 @@ -353,7 +333,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm4 .p2align 4 _abi_test_clobber_xmm4: -_CET_ENDBR pxor %xmm4,%xmm4 .byte 0xf3,0xc3 @@ -362,7 +341,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm5 .p2align 4 _abi_test_clobber_xmm5: -_CET_ENDBR pxor %xmm5,%xmm5 .byte 0xf3,0xc3 @@ -371,7 +349,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm6 .p2align 4 _abi_test_clobber_xmm6: -_CET_ENDBR pxor %xmm6,%xmm6 .byte 0xf3,0xc3 @@ -380,7 +357,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm7 .p2align 4 _abi_test_clobber_xmm7: -_CET_ENDBR pxor %xmm7,%xmm7 .byte 0xf3,0xc3 @@ -389,7 +365,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm8 .p2align 4 _abi_test_clobber_xmm8: -_CET_ENDBR pxor %xmm8,%xmm8 .byte 0xf3,0xc3 @@ -398,7 +373,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm9 .p2align 4 _abi_test_clobber_xmm9: -_CET_ENDBR pxor %xmm9,%xmm9 .byte 0xf3,0xc3 @@ -407,7 +381,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm10 .p2align 4 _abi_test_clobber_xmm10: -_CET_ENDBR pxor %xmm10,%xmm10 .byte 0xf3,0xc3 @@ -416,7 +389,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm11 .p2align 4 _abi_test_clobber_xmm11: -_CET_ENDBR pxor %xmm11,%xmm11 .byte 0xf3,0xc3 @@ -425,7 +397,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm12 .p2align 4 _abi_test_clobber_xmm12: -_CET_ENDBR pxor %xmm12,%xmm12 .byte 0xf3,0xc3 @@ -434,7 +405,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm13 .p2align 4 _abi_test_clobber_xmm13: -_CET_ENDBR pxor %xmm13,%xmm13 .byte 0xf3,0xc3 @@ -443,7 +413,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm14 .p2align 4 _abi_test_clobber_xmm14: -_CET_ENDBR pxor %xmm14,%xmm14 .byte 0xf3,0xc3 @@ -452,7 +421,6 @@ _CET_ENDBR .private_extern _abi_test_clobber_xmm15 .p2align 4 _abi_test_clobber_xmm15: -_CET_ENDBR pxor %xmm15,%xmm15 .byte 0xf3,0xc3 @@ -466,7 +434,6 @@ _CET_ENDBR _abi_test_bad_unwind_wrong_register: -_CET_ENDBR pushq %r12 @@ -491,7 +458,6 @@ _CET_ENDBR _abi_test_bad_unwind_temporary: -_CET_ENDBR pushq %r12 @@ -519,7 +485,6 @@ _CET_ENDBR .globl _abi_test_get_and_clear_direction_flag .private_extern _abi_test_get_and_clear_direction_flag _abi_test_get_and_clear_direction_flag: -_CET_ENDBR pushfq popq %rax andq $0x400,%rax @@ -534,7 +499,6 @@ _CET_ENDBR .globl _abi_test_set_direction_flag .private_extern _abi_test_set_direction_flag _abi_test_set_direction_flag: -_CET_ENDBR std .byte 0xf3,0xc3 diff --git a/generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm b/generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm index 13e8f61f77..9126b1b79b 100644 --- a/generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm +++ b/generated-src/win-x86_64/crypto/chacha/chacha-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -66,7 +65,6 @@ $L$SEH_begin_ChaCha20_ctr32: -_CET_ENDBR cmp rdx,0 je NEAR $L$no_data mov r10,QWORD[((OPENSSL_ia32cap_P+4))] diff --git a/generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm b/generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm index 55d1e24ea2..84e4da4ade 100644 --- a/generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm +++ b/generated-src/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .rdata rdata align=8 @@ -84,7 +83,6 @@ $L$SEH_begin_aesgcmsiv_htable_init: -_CET_ENDBR vmovdqa xmm0,XMMWORD[rsi] vmovdqa xmm1,xmm0 vmovdqa XMMWORD[rdi],xmm0 @@ -120,7 +118,6 @@ $L$SEH_begin_aesgcmsiv_htable6_init: -_CET_ENDBR vmovdqa xmm0,XMMWORD[rsi] vmovdqa xmm1,xmm0 vmovdqa XMMWORD[rdi],xmm0 @@ -154,7 +151,6 @@ $L$SEH_begin_aesgcmsiv_htable_polyval: -_CET_ENDBR test rdx,rdx jnz NEAR $L$htable_polyval_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -385,7 +381,6 @@ $L$SEH_begin_aesgcmsiv_polyval_horner: -_CET_ENDBR test rcx,rcx jnz NEAR $L$polyval_horner_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -430,7 +425,6 @@ $L$SEH_begin_aes128gcmsiv_aes_ks: -_CET_ENDBR vmovdqu xmm1,XMMWORD[rdi] vmovdqa XMMWORD[rsi],xmm1 @@ -496,7 +490,6 @@ $L$SEH_begin_aes256gcmsiv_aes_ks: -_CET_ENDBR vmovdqu xmm1,XMMWORD[rdi] vmovdqu xmm3,XMMWORD[16+rdi] vmovdqa XMMWORD[rsi],xmm1 @@ -555,7 +548,6 @@ $L$SEH_begin_aes128gcmsiv_aes_ks_enc_x1: -_CET_ENDBR vmovdqa xmm1,XMMWORD[rcx] vmovdqa xmm4,XMMWORD[rdi] @@ -708,7 +700,6 @@ $L$SEH_begin_aes128gcmsiv_kdf: -_CET_ENDBR @@ -814,7 +805,6 @@ $L$SEH_begin_aes128gcmsiv_enc_msg_x4: -_CET_ENDBR test r8,r8 jnz NEAR $L$128_enc_msg_x4_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -1004,7 +994,6 @@ $L$SEH_begin_aes128gcmsiv_enc_msg_x8: -_CET_ENDBR test r8,r8 jnz NEAR $L$128_enc_msg_x8_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -1275,7 +1264,6 @@ $L$SEH_begin_aes128gcmsiv_dec: -_CET_ENDBR test r9,~15 jnz NEAR $L$128_dec_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -1780,7 +1768,6 @@ $L$SEH_begin_aes128gcmsiv_ecb_enc_block: -_CET_ENDBR vmovdqa xmm1,XMMWORD[rdi] vpxor xmm1,xmm1,XMMWORD[rdx] @@ -1817,7 +1804,6 @@ $L$SEH_begin_aes256gcmsiv_aes_ks_enc_x1: -_CET_ENDBR vmovdqa xmm0,XMMWORD[con1] vmovdqa xmm15,XMMWORD[mask] vmovdqa xmm8,XMMWORD[rdi] @@ -2011,7 +1997,6 @@ $L$SEH_begin_aes256gcmsiv_ecb_enc_block: -_CET_ENDBR vmovdqa xmm1,XMMWORD[rdi] vpxor xmm1,xmm1,XMMWORD[rdx] vaesenc xmm1,xmm1,XMMWORD[16+rdx] @@ -2050,7 +2035,6 @@ $L$SEH_begin_aes256gcmsiv_enc_msg_x4: -_CET_ENDBR test r8,r8 jnz NEAR $L$256_enc_msg_x4_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -2266,7 +2250,6 @@ $L$SEH_begin_aes256gcmsiv_enc_msg_x8: -_CET_ENDBR test r8,r8 jnz NEAR $L$256_enc_msg_x8_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -2571,7 +2554,6 @@ $L$SEH_begin_aes256gcmsiv_dec: -_CET_ENDBR test r9,~15 jnz NEAR $L$256_dec_start mov rdi,QWORD[8+rsp] ;WIN64 epilogue @@ -3144,7 +3126,6 @@ $L$SEH_begin_aes256gcmsiv_kdf: -_CET_ENDBR diff --git a/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha1-x86_64.asm b/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha1-x86_64.asm index 78d99b73a8..2c21ec6a8f 100644 --- a/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha1-x86_64.asm +++ b/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha1-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 diff --git a/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha256-x86_64.asm b/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha256-x86_64.asm index bf9a5f1979..3fad314f59 100644 --- a/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha256-x86_64.asm +++ b/generated-src/win-x86_64/crypto/cipher_extra/aesni-sha256-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 diff --git a/generated-src/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm b/generated-src/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm index f57ef71c86..143b51cab4 100644 --- a/generated-src/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm +++ b/generated-src/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -240,7 +239,6 @@ $L$SEH_begin_chacha20_poly1305_open: -_CET_ENDBR push rbp push rbx @@ -2147,7 +2145,6 @@ $L$SEH_begin_chacha20_poly1305_seal: -_CET_ENDBR push rbp push rbx diff --git a/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-avx512.asm b/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-avx512.asm index ce818c2757..919cc43a1d 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-avx512.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-avx512.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm index 799110c8c8..203222b090 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -351,7 +350,6 @@ ALIGN 32 aesni_gcm_decrypt: $L$SEH_begin_aesni_gcm_decrypt_1: -_CET_ENDBR xor rax,rax @@ -612,7 +610,6 @@ ALIGN 32 aesni_gcm_encrypt: $L$SEH_begin_aesni_gcm_encrypt_1: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST EXTERN BORINGSSL_function_hit mov BYTE[((BORINGSSL_function_hit+2))],1 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm index bd2c081d80..6a89d77ea6 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/aesni-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -17,7 +16,6 @@ global aes_hw_encrypt ALIGN 16 aes_hw_encrypt: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST EXTERN BORINGSSL_function_hit mov BYTE[((BORINGSSL_function_hit+1))],1 @@ -48,7 +46,6 @@ global aes_hw_decrypt ALIGN 16 aes_hw_decrypt: -_CET_ENDBR movups xmm2,XMMWORD[rcx] mov eax,DWORD[240+r8] movups xmm0,XMMWORD[r8] @@ -547,7 +544,6 @@ $L$SEH_begin_aes_hw_ecb_encrypt: -_CET_ENDBR lea rsp,[((-88))+rsp] movaps XMMWORD[rsp],xmm6 movaps XMMWORD[16+rsp],xmm7 @@ -921,7 +917,6 @@ $L$SEH_begin_aes_hw_ctr32_encrypt_blocks: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST mov BYTE[BORINGSSL_function_hit],1 %endif @@ -1541,7 +1536,6 @@ $L$SEH_begin_aes_hw_xts_encrypt: -_CET_ENDBR lea r11,[rsp] push rbp @@ -2047,7 +2041,6 @@ $L$SEH_begin_aes_hw_xts_decrypt: -_CET_ENDBR lea r11,[rsp] push rbp @@ -2590,7 +2583,6 @@ $L$SEH_begin_aes_hw_cbc_encrypt: -_CET_ENDBR test rdx,rdx jz NEAR $L$cbc_ret @@ -3212,7 +3204,6 @@ global aes_hw_set_decrypt_key ALIGN 16 aes_hw_set_decrypt_key: -_CET_ENDBR DB 0x48,0x83,0xEC,0x08 call __aesni_set_encrypt_key @@ -3258,7 +3249,6 @@ ALIGN 16 aes_hw_set_encrypt_key: __aesni_set_encrypt_key: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST mov BYTE[((BORINGSSL_function_hit+3))],1 %endif diff --git a/generated-src/win-x86_64/crypto/fipsmodule/aesni-xts-avx512.asm b/generated-src/win-x86_64/crypto/fipsmodule/aesni-xts-avx512.asm index 403266b196..ef1f5ada30 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/aesni-xts-avx512.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/aesni-xts-avx512.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm index 8a89f49966..23b0dd74dc 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -22,7 +21,6 @@ ALIGN 16 gcm_gmult_ssse3: $L$SEH_begin_gcm_gmult_ssse3_1: -_CET_ENDBR sub rsp,40 $L$SEH_prolog_gcm_gmult_ssse3_2: movdqa XMMWORD[rsp],xmm6 @@ -221,7 +219,6 @@ ALIGN 16 gcm_ghash_ssse3: $L$SEH_begin_gcm_ghash_ssse3_1: -_CET_ENDBR sub rsp,56 $L$SEH_prolog_gcm_ghash_ssse3_2: movdqa XMMWORD[rsp],xmm6 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm index 649f8a22b5..5ccc45b9bd 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/ghash-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -18,7 +17,6 @@ ALIGN 16 gcm_init_clmul: $L$SEH_begin_gcm_init_clmul_1: -_CET_ENDBR $L$_init_clmul: sub rsp,0x18 $L$SEH_prolog_gcm_init_clmul_2: @@ -184,7 +182,6 @@ global gcm_gmult_clmul ALIGN 16 gcm_gmult_clmul: -_CET_ENDBR $L$_gmult_clmul: movdqu xmm0,XMMWORD[rcx] movdqa xmm5,XMMWORD[$L$bswap_mask] @@ -239,7 +236,6 @@ ALIGN 32 gcm_ghash_clmul: $L$SEH_begin_gcm_ghash_clmul_1: -_CET_ENDBR $L$_ghash_clmul: lea rax,[((-136))+rsp] lea rsp,[((-32))+rax] @@ -661,7 +657,6 @@ global gcm_init_avx ALIGN 32 gcm_init_avx: -_CET_ENDBR $L$SEH_begin_gcm_init_avx_1: sub rsp,0x18 $L$SEH_prolog_gcm_init_avx_2: @@ -779,7 +774,6 @@ global gcm_gmult_avx ALIGN 32 gcm_gmult_avx: -_CET_ENDBR jmp NEAR $L$_gmult_clmul @@ -788,7 +782,6 @@ global gcm_ghash_avx ALIGN 32 gcm_ghash_avx: -_CET_ENDBR $L$SEH_begin_gcm_ghash_avx_1: lea rax,[((-136))+rsp] lea rsp,[((-32))+rax] diff --git a/generated-src/win-x86_64/crypto/fipsmodule/md5-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/md5-x86_64.asm index 492d6884e0..af196d71ba 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/md5-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/md5-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -26,7 +25,6 @@ $L$SEH_begin_md5_block_asm_data_order: -_CET_ENDBR push rbp push rbx diff --git a/generated-src/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm b/generated-src/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm index 83fe6c901a..f154ea6722 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/p256-x86_64-asm.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -51,7 +50,6 @@ $L$SEH_begin_ecp_nistz256_neg: -_CET_ENDBR push r12 push r13 @@ -122,7 +120,6 @@ $L$SEH_begin_ecp_nistz256_ord_mul_mont: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -461,7 +458,6 @@ $L$SEH_begin_ecp_nistz256_ord_sqr_mont: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -1235,7 +1231,6 @@ $L$SEH_begin_ecp_nistz256_mul_mont: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -1536,7 +1531,6 @@ $L$SEH_begin_ecp_nistz256_sqr_mont: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -2062,7 +2056,6 @@ global ecp_nistz256_select_w5 ALIGN 32 ecp_nistz256_select_w5: -_CET_ENDBR lea rax,[OPENSSL_ia32cap_P] mov rax,QWORD[8+rax] test eax,32 @@ -2153,7 +2146,6 @@ global ecp_nistz256_select_w7 ALIGN 32 ecp_nistz256_select_w7: -_CET_ENDBR lea rax,[OPENSSL_ia32cap_P] mov rax,QWORD[8+rax] test eax,32 @@ -2322,7 +2314,6 @@ ALIGN 32 ecp_nistz256_avx2_select_w7: $L$avx2_select_w7: -_CET_ENDBR vzeroupper mov r11,rsp lea rax,[((-136))+rsp] @@ -2561,7 +2552,6 @@ $L$SEH_begin_ecp_nistz256_point_double: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -2800,7 +2790,6 @@ $L$SEH_begin_ecp_nistz256_point_add: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 @@ -3242,7 +3231,6 @@ $L$SEH_begin_ecp_nistz256_point_add_affine: -_CET_ENDBR lea rcx,[OPENSSL_ia32cap_P] mov rcx,QWORD[8+rcx] and ecx,0x80100 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm b/generated-src/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm index 97b33aa24c..1ad3dcb9e1 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -30,7 +29,6 @@ $L$SEH_begin_beeu_mod_inverse_vartime: -_CET_ENDBR push rbp push r12 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm index af2cf7f154..f134b4b552 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/rdrand-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -20,7 +19,6 @@ global CRYPTO_rdrand ALIGN 16 CRYPTO_rdrand: -_CET_ENDBR xor rax,rax DB 73,15,199,240 test r8,r8 @@ -46,7 +44,6 @@ global CRYPTO_rdrand_multiple8_buf ALIGN 16 CRYPTO_rdrand_multiple8_buf: -_CET_ENDBR test rdx,rdx jz NEAR $L$out mov r8,8 diff --git a/generated-src/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm b/generated-src/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm index 1edc96c5f2..345b313a2f 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/rsaz-avx2.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -28,7 +27,6 @@ $L$SEH_begin_rsaz_1024_sqr_avx2: -_CET_ENDBR lea rax,[rsp] push rbx @@ -718,7 +716,6 @@ $L$SEH_begin_rsaz_1024_mul_avx2: -_CET_ENDBR lea rax,[rsp] push rbx @@ -1300,7 +1297,6 @@ global rsaz_1024_red2norm_avx2 ALIGN 32 rsaz_1024_red2norm_avx2: -_CET_ENDBR sub rdx,-128 xor rax,rax mov r8,QWORD[((-128))+rdx] @@ -1500,7 +1496,6 @@ global rsaz_1024_norm2red_avx2 ALIGN 32 rsaz_1024_norm2red_avx2: -_CET_ENDBR sub rcx,-128 mov r8,QWORD[rdx] mov eax,0x1fffffff @@ -1660,7 +1655,6 @@ global rsaz_1024_scatter5_avx2 ALIGN 32 rsaz_1024_scatter5_avx2: -_CET_ENDBR vzeroupper vmovdqu ymm5,YMMWORD[$L$scatter_permd] shl r8d,4 @@ -1688,7 +1682,6 @@ global rsaz_1024_gather5_avx2 ALIGN 32 rsaz_1024_gather5_avx2: -_CET_ENDBR vzeroupper mov r11,rsp diff --git a/generated-src/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm index bb9a775471..57aedbda87 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/sha1-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -27,7 +26,6 @@ $L$SEH_begin_sha1_block_data_order: -_CET_ENDBR lea r10,[OPENSSL_ia32cap_P] mov r9d,DWORD[r10] mov r8d,DWORD[4+r10] diff --git a/generated-src/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm index e7d366a132..387e9f20f5 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/sha256-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -27,7 +26,6 @@ $L$SEH_begin_sha256_block_data_order: -_CET_ENDBR lea r11,[OPENSSL_ia32cap_P] mov r9d,DWORD[r11] mov r10d,DWORD[4+r11] diff --git a/generated-src/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm index 2cfb76b762..fa3a407754 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/sha512-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -27,7 +26,6 @@ $L$SEH_begin_sha512_block_data_order: -_CET_ENDBR lea r11,[OPENSSL_ia32cap_P] mov r9d,DWORD[r11] mov r10d,DWORD[4+r11] diff --git a/generated-src/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm b/generated-src/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm index a0acf871a5..89b838e516 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/vpaes-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -819,7 +818,6 @@ $L$SEH_begin_vpaes_set_encrypt_key: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST EXTERN BORINGSSL_function_hit mov BYTE[((BORINGSSL_function_hit+5))],1 @@ -878,7 +876,6 @@ $L$SEH_begin_vpaes_set_decrypt_key: -_CET_ENDBR lea rsp,[((-184))+rsp] movaps XMMWORD[16+rsp],xmm6 movaps XMMWORD[32+rsp],xmm7 @@ -937,7 +934,6 @@ $L$SEH_begin_vpaes_encrypt: -_CET_ENDBR %ifdef BORINGSSL_DISPATCH_TEST EXTERN BORINGSSL_function_hit mov BYTE[((BORINGSSL_function_hit+4))],1 @@ -990,7 +986,6 @@ $L$SEH_begin_vpaes_decrypt: -_CET_ENDBR lea rsp,[((-184))+rsp] movaps XMMWORD[16+rsp],xmm6 movaps XMMWORD[32+rsp],xmm7 @@ -1041,7 +1036,6 @@ $L$SEH_begin_vpaes_cbc_encrypt: -_CET_ENDBR xchg rdx,rcx sub rcx,16 jc NEAR $L$cbc_abort @@ -1121,7 +1115,6 @@ $L$SEH_begin_vpaes_ctr32_encrypt_blocks: -_CET_ENDBR xchg rdx,rcx test rcx,rcx diff --git a/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont.asm b/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont.asm index 785ee6d4c5..fbf628c3de 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -31,7 +30,6 @@ $L$SEH_begin_bn_mul_mont: -_CET_ENDBR mov r9d,r9d mov rax,rsp diff --git a/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm b/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm index ef4ca2342b..cacc4f90d0 100644 --- a/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm +++ b/generated-src/win-x86_64/crypto/fipsmodule/x86_64-mont5.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -31,7 +30,6 @@ $L$SEH_begin_bn_mul_mont_gather5: -_CET_ENDBR mov r9d,r9d mov rax,rsp @@ -1137,7 +1135,6 @@ $L$SEH_begin_bn_power5: -_CET_ENDBR mov rax,rsp lea r11,[OPENSSL_ia32cap_P] @@ -1278,7 +1275,6 @@ ALIGN 32 bn_sqr8x_internal: __bn_sqr8x_internal: -_CET_ENDBR @@ -2818,7 +2814,6 @@ ALIGN 32 bn_sqrx8x_internal: __bn_sqrx8x_internal: -_CET_ENDBR @@ -3490,7 +3485,6 @@ global bn_scatter5 ALIGN 16 bn_scatter5: -_CET_ENDBR cmp edx,0 jz NEAR $L$scatter_epilogue @@ -3521,7 +3515,6 @@ ALIGN 32 bn_gather5: $L$SEH_begin_bn_gather5: -_CET_ENDBR DB 0x4c,0x8d,0x14,0x24 diff --git a/generated-src/win-x86_64/crypto/test/trampoline-x86_64.asm b/generated-src/win-x86_64/crypto/test/trampoline-x86_64.asm index 24ee50a9b0..d11ea0e78c 100644 --- a/generated-src/win-x86_64/crypto/test/trampoline-x86_64.asm +++ b/generated-src/win-x86_64/crypto/test/trampoline-x86_64.asm @@ -6,7 +6,6 @@ default rel %define XMMWORD %define YMMWORD %define ZMMWORD -%define _CET_ENDBR %include "openssl/boringssl_prefix_symbols_nasm.inc" section .text code align=64 @@ -25,7 +24,6 @@ ALIGN 16 abi_test_trampoline: $L$SEH_begin_abi_test_trampoline_1: -_CET_ENDBR @@ -258,7 +256,6 @@ $L$SEH_end_abi_test_trampoline_21: global abi_test_clobber_rax ALIGN 16 abi_test_clobber_rax: -_CET_ENDBR xor rax,rax DB 0F3h,0C3h ;repret @@ -266,7 +263,6 @@ _CET_ENDBR global abi_test_clobber_rbx ALIGN 16 abi_test_clobber_rbx: -_CET_ENDBR xor rbx,rbx DB 0F3h,0C3h ;repret @@ -274,7 +270,6 @@ _CET_ENDBR global abi_test_clobber_rcx ALIGN 16 abi_test_clobber_rcx: -_CET_ENDBR xor rcx,rcx DB 0F3h,0C3h ;repret @@ -282,7 +277,6 @@ _CET_ENDBR global abi_test_clobber_rdx ALIGN 16 abi_test_clobber_rdx: -_CET_ENDBR xor rdx,rdx DB 0F3h,0C3h ;repret @@ -290,7 +284,6 @@ _CET_ENDBR global abi_test_clobber_rdi ALIGN 16 abi_test_clobber_rdi: -_CET_ENDBR xor rdi,rdi DB 0F3h,0C3h ;repret @@ -298,7 +291,6 @@ _CET_ENDBR global abi_test_clobber_rsi ALIGN 16 abi_test_clobber_rsi: -_CET_ENDBR xor rsi,rsi DB 0F3h,0C3h ;repret @@ -306,7 +298,6 @@ _CET_ENDBR global abi_test_clobber_rbp ALIGN 16 abi_test_clobber_rbp: -_CET_ENDBR xor rbp,rbp DB 0F3h,0C3h ;repret @@ -314,7 +305,6 @@ _CET_ENDBR global abi_test_clobber_r8 ALIGN 16 abi_test_clobber_r8: -_CET_ENDBR xor r8,r8 DB 0F3h,0C3h ;repret @@ -322,7 +312,6 @@ _CET_ENDBR global abi_test_clobber_r9 ALIGN 16 abi_test_clobber_r9: -_CET_ENDBR xor r9,r9 DB 0F3h,0C3h ;repret @@ -330,7 +319,6 @@ _CET_ENDBR global abi_test_clobber_r10 ALIGN 16 abi_test_clobber_r10: -_CET_ENDBR xor r10,r10 DB 0F3h,0C3h ;repret @@ -338,7 +326,6 @@ _CET_ENDBR global abi_test_clobber_r11 ALIGN 16 abi_test_clobber_r11: -_CET_ENDBR xor r11,r11 DB 0F3h,0C3h ;repret @@ -346,7 +333,6 @@ _CET_ENDBR global abi_test_clobber_r12 ALIGN 16 abi_test_clobber_r12: -_CET_ENDBR xor r12,r12 DB 0F3h,0C3h ;repret @@ -354,7 +340,6 @@ _CET_ENDBR global abi_test_clobber_r13 ALIGN 16 abi_test_clobber_r13: -_CET_ENDBR xor r13,r13 DB 0F3h,0C3h ;repret @@ -362,7 +347,6 @@ _CET_ENDBR global abi_test_clobber_r14 ALIGN 16 abi_test_clobber_r14: -_CET_ENDBR xor r14,r14 DB 0F3h,0C3h ;repret @@ -370,7 +354,6 @@ _CET_ENDBR global abi_test_clobber_r15 ALIGN 16 abi_test_clobber_r15: -_CET_ENDBR xor r15,r15 DB 0F3h,0C3h ;repret @@ -378,7 +361,6 @@ _CET_ENDBR global abi_test_clobber_xmm0 ALIGN 16 abi_test_clobber_xmm0: -_CET_ENDBR pxor xmm0,xmm0 DB 0F3h,0C3h ;repret @@ -386,7 +368,6 @@ _CET_ENDBR global abi_test_clobber_xmm1 ALIGN 16 abi_test_clobber_xmm1: -_CET_ENDBR pxor xmm1,xmm1 DB 0F3h,0C3h ;repret @@ -394,7 +375,6 @@ _CET_ENDBR global abi_test_clobber_xmm2 ALIGN 16 abi_test_clobber_xmm2: -_CET_ENDBR pxor xmm2,xmm2 DB 0F3h,0C3h ;repret @@ -402,7 +382,6 @@ _CET_ENDBR global abi_test_clobber_xmm3 ALIGN 16 abi_test_clobber_xmm3: -_CET_ENDBR pxor xmm3,xmm3 DB 0F3h,0C3h ;repret @@ -410,7 +389,6 @@ _CET_ENDBR global abi_test_clobber_xmm4 ALIGN 16 abi_test_clobber_xmm4: -_CET_ENDBR pxor xmm4,xmm4 DB 0F3h,0C3h ;repret @@ -418,7 +396,6 @@ _CET_ENDBR global abi_test_clobber_xmm5 ALIGN 16 abi_test_clobber_xmm5: -_CET_ENDBR pxor xmm5,xmm5 DB 0F3h,0C3h ;repret @@ -426,7 +403,6 @@ _CET_ENDBR global abi_test_clobber_xmm6 ALIGN 16 abi_test_clobber_xmm6: -_CET_ENDBR pxor xmm6,xmm6 DB 0F3h,0C3h ;repret @@ -434,7 +410,6 @@ _CET_ENDBR global abi_test_clobber_xmm7 ALIGN 16 abi_test_clobber_xmm7: -_CET_ENDBR pxor xmm7,xmm7 DB 0F3h,0C3h ;repret @@ -442,7 +417,6 @@ _CET_ENDBR global abi_test_clobber_xmm8 ALIGN 16 abi_test_clobber_xmm8: -_CET_ENDBR pxor xmm8,xmm8 DB 0F3h,0C3h ;repret @@ -450,7 +424,6 @@ _CET_ENDBR global abi_test_clobber_xmm9 ALIGN 16 abi_test_clobber_xmm9: -_CET_ENDBR pxor xmm9,xmm9 DB 0F3h,0C3h ;repret @@ -458,7 +431,6 @@ _CET_ENDBR global abi_test_clobber_xmm10 ALIGN 16 abi_test_clobber_xmm10: -_CET_ENDBR pxor xmm10,xmm10 DB 0F3h,0C3h ;repret @@ -466,7 +438,6 @@ _CET_ENDBR global abi_test_clobber_xmm11 ALIGN 16 abi_test_clobber_xmm11: -_CET_ENDBR pxor xmm11,xmm11 DB 0F3h,0C3h ;repret @@ -474,7 +445,6 @@ _CET_ENDBR global abi_test_clobber_xmm12 ALIGN 16 abi_test_clobber_xmm12: -_CET_ENDBR pxor xmm12,xmm12 DB 0F3h,0C3h ;repret @@ -482,7 +452,6 @@ _CET_ENDBR global abi_test_clobber_xmm13 ALIGN 16 abi_test_clobber_xmm13: -_CET_ENDBR pxor xmm13,xmm13 DB 0F3h,0C3h ;repret @@ -490,7 +459,6 @@ _CET_ENDBR global abi_test_clobber_xmm14 ALIGN 16 abi_test_clobber_xmm14: -_CET_ENDBR pxor xmm14,xmm14 DB 0F3h,0C3h ;repret @@ -498,7 +466,6 @@ _CET_ENDBR global abi_test_clobber_xmm15 ALIGN 16 abi_test_clobber_xmm15: -_CET_ENDBR pxor xmm15,xmm15 DB 0F3h,0C3h ;repret @@ -511,7 +478,6 @@ ALIGN 16 abi_test_bad_unwind_wrong_register: $L$SEH_begin_abi_test_bad_unwind_wrong_register_1: -_CET_ENDBR push r12 $L$SEH_prolog_abi_test_bad_unwind_wrong_register_2: @@ -535,7 +501,6 @@ ALIGN 16 abi_test_bad_unwind_temporary: $L$SEH_begin_abi_test_bad_unwind_temporary_1: -_CET_ENDBR push r12 $L$SEH_prolog_abi_test_bad_unwind_temporary_2: @@ -562,7 +527,6 @@ $L$SEH_end_abi_test_bad_unwind_temporary_3: global abi_test_get_and_clear_direction_flag abi_test_get_and_clear_direction_flag: -_CET_ENDBR pushfq pop rax and rax,0x400 @@ -576,7 +540,6 @@ _CET_ENDBR global abi_test_set_direction_flag abi_test_set_direction_flag: -_CET_ENDBR std DB 0F3h,0C3h ;repret diff --git a/include/openssl/asm_base.h b/include/openssl/asm_base.h index 0d57969a9d..bf794a360e 100644 --- a/include/openssl/asm_base.h +++ b/include/openssl/asm_base.h @@ -32,10 +32,6 @@ // // - The file, on aarch64, uses the macros defined below to be compatible with // BTI and PAC. -// -// - The file, on x86_64, requires the program to be compatible with Intel IBT -// and SHSTK - #if defined(__ASSEMBLER__) #include @@ -47,23 +43,6 @@ .popsection #endif -#if defined(__CET__) && defined(OPENSSL_X86_64) && \ - !defined(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX) -// Clang and GCC define __CET__ and provide when they support Intel's -// Indirect Branch Tracking. -// https://lpc.events/event/7/contributions/729/attachments/496/903/CET-LPC-2020.pdf -// -// cet.h defines _CET_ENDBR which is used to mark function entry points for IBT. -// and adds the assembly marker. The value of _CET_ENDBR is made dependant on if -// '-fcf-protection' is passed to the compiler. _CET_ENDBR is only required when -// the function is the target of an indirect jump, but BoringSSL chooses to mark -// all assembly entry points because it is easier, and allows BoringSSL's ABI -// tester to call the assembly entry points via an indirect jump. -#include -#else -#define _CET_ENDBR -#endif - #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) // We require the ARM assembler provide |__ARM_ARCH| from Arm C Language