diff options
| author | Adam Langley <agl@google.com> | 2015-10-01 00:46:38 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-10-01 01:09:52 +0300 |
| commit | 0dd93002ddf5adce17db88f1212ca2e14eba6e9c (patch) | |
| tree | cdcb474ea9b8945ba8e95d53d36ce77b84cd1a34 /crypto/aes | |
| parent | f4e554e438753bff8b56de7049ac6bcc9dbc83ca (diff) | |
Revert section changes for ASM.
This change reverts the following commits:
72d9cba7cb78ddc9c8ec3f27a9367c407f7d0915
5b61b9ebc5ad0e25475f2aa633d3a6592dd65ba1
3f85e04f40c12282021241b393d94901e5c1027b
2ab24a2d40fd193a25d7c94072596a1180cbb460
Change-Id: I669b83f2269cf96aa71a649a346147b9407a811e
Reviewed-on: https://boringssl-review.googlesource.com/6056
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 6 | ||||
| -rw-r--r-- | crypto/aes/asm/aesv8-armx.pl | 2 | ||||
| -rw-r--r-- | crypto/aes/asm/bsaes-armv7.pl | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 16ff9909..882017a6 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -82,7 +82,6 @@ $code=<<___; # endif #endif -.pushsection .text.asm_AES_encrypt,"ax",%progbits .type AES_Te,%object .align 5 AES_Te: @@ -188,7 +187,6 @@ AES_Te: .word 0x10000000, 0x20000000, 0x40000000, 0x80000000 .word 0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0 .size AES_Te,.-AES_Te -.popsection @ void asm_AES_encrypt(const unsigned char *in, unsigned char *out, @ const AES_KEY *key) { @@ -442,7 +440,7 @@ _armv4_AES_encrypt: ldr pc,[sp],#4 @ pop and return .size _armv4_AES_encrypt,.-_armv4_AES_encrypt -.global_with_section asm_AES_set_encrypt_key, asm_AES_encrypt +.global asm_AES_set_encrypt_key .hidden asm_AES_set_encrypt_key .type asm_AES_set_encrypt_key,%function .align 5 @@ -868,7 +866,6 @@ $code.=<<___; #endif .size AES_set_enc2dec_key,.-AES_set_enc2dec_key -.pushsection .text.asm_AES_decrypt,"ax",%progbits .type AES_Td,%object .align 5 AES_Td: @@ -970,7 +967,6 @@ AES_Td: .byte 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26 .byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d .size AES_Td,.-AES_Td -.popsection @ void asm_AES_decrypt(const unsigned char *in, unsigned char *out, @ const AES_KEY *key) { diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index 4aa699e1..121154a4 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -71,13 +71,11 @@ my ($zero,$rcon,$mask,$in0,$in1,$tmp,$key)= $code.=<<___; -.pushsection .text.${prefix}_set_encrypt_key,"ax",%progbits .align 5 .Lrcon: .long 0x01,0x01,0x01,0x01 .long 0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d // rotate-n-splat .long 0x1b,0x1b,0x1b,0x1b -.popsection .globl ${prefix}_set_encrypt_key .type ${prefix}_set_encrypt_key,%function diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl index 5fa30059..2617fef7 100644 --- a/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/aes/asm/bsaes-armv7.pl @@ -2049,7 +2049,7 @@ $code.=<<___; .size bsaes_xts_encrypt,.-bsaes_xts_encrypt -.global_with_section bsaes_xts_decrypt, bsaes_xts_encrypt +.globl bsaes_xts_decrypt .hidden bsaes_xts_decrypt .type bsaes_xts_decrypt,%function .align 4 |