perlasm: delimit AESNI `set_encrypt_key_base` function properly Signed-off-by: Xiangfei Ding <xfding@google.com> Change-Id: I9cb9b615dd075cf40256d6c8ff2fbfcb6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/97447 Reviewed-by: Adam Langley <agl@google.com> Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/crypto/fipsmodule/aes/asm/aesni-x86_64.pl b/crypto/fipsmodule/aes/asm/aesni-x86_64.pl index 71f35e6..c166b4e 100644 --- a/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +++ b/crypto/fipsmodule/aes/asm/aesni-x86_64.pl
@@ -3387,7 +3387,8 @@ ret .cfi_endproc .seh_endproc - +.size ${PREFIX}_set_encrypt_key_base,.-${PREFIX}_set_encrypt_key_base + .align 16 .Lkey_expansion_128: .cfi_startproc @@ -3466,7 +3467,6 @@ xorps %xmm1,%xmm2 ret .cfi_endproc -.size ${PREFIX}_set_encrypt_key_base,.-${PREFIX}_set_encrypt_key_base .globl ${PREFIX}_set_encrypt_key_alt .type ${PREFIX}_set_encrypt_key_alt,\@abi-omnipotent
diff --git a/gen/bcm/aesni-x86_64-apple.S b/gen/bcm/aesni-x86_64-apple.S index 00ba503..256a323 100644 --- a/gen/bcm/aesni-x86_64-apple.S +++ b/gen/bcm/aesni-x86_64-apple.S
@@ -2096,6 +2096,7 @@ + .p2align 4 L$key_expansion_128: @@ -2175,7 +2176,6 @@ ret - .globl _aes_hw_set_encrypt_key_alt .private_extern _aes_hw_set_encrypt_key_alt
diff --git a/gen/bcm/aesni-x86_64-linux.S b/gen/bcm/aesni-x86_64-linux.S index a5d92e6..5093961 100644 --- a/gen/bcm/aesni-x86_64-linux.S +++ b/gen/bcm/aesni-x86_64-linux.S
@@ -2080,6 +2080,7 @@ ret .cfi_endproc +.size aes_hw_set_encrypt_key_base,.-aes_hw_set_encrypt_key_base .align 16 .Lkey_expansion_128: @@ -2159,7 +2160,6 @@ xorps %xmm1,%xmm2 ret .cfi_endproc -.size aes_hw_set_encrypt_key_base,.-aes_hw_set_encrypt_key_base .globl aes_hw_set_encrypt_key_alt .hidden aes_hw_set_encrypt_key_alt
diff --git a/gen/bcm/aesni-x86_64-win.asm b/gen/bcm/aesni-x86_64-win.asm index 69d6835..18daf9a 100644 --- a/gen/bcm/aesni-x86_64-win.asm +++ b/gen/bcm/aesni-x86_64-win.asm
@@ -2185,6 +2185,7 @@ $L$SEH_end_aes_hw_set_encrypt_key_base_4: + ALIGN 16 $L$key_expansion_128: @@ -2264,7 +2265,6 @@ ret - global aes_hw_set_encrypt_key_alt ALIGN 16