diff options
| author | Robert Sloan <varomodt@google.com> | 2017-11-13 09:22:12 -0800 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-11-13 09:57:33 -0800 |
| commit | d5c2215355e1ae960be386b0d69aed228102cdae (patch) | |
| tree | 01d22198606e08848ff16e5171145b9f6d8b1bd6 /linux-arm | |
| parent | b1b54b8cac71baef44b92c79271f26d50819b2f7 (diff) | |
| download | boringssl-d5c2215355e1ae960be386b0d69aed228102cdae.tar.gz | |
external/boringssl: Sync to ba8f1864c15ec938ce0851f416663511c89f454a.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/b1cbe1979008debd0541621584b00e010d9935dd..ba8f1864c15ec938ce0851f416663511c89f454a
Test: BoringSSL CTS Presubmits
Change-Id: I58da2508fd608988d3d14d7219a104da7ed0f4b7
Diffstat (limited to 'linux-arm')
| -rw-r--r-- | linux-arm/crypto/fipsmodule/aes-armv4.S | 6 | ||||
| -rw-r--r-- | linux-arm/crypto/fipsmodule/bsaes-armv7.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/linux-arm/crypto/fipsmodule/aes-armv4.S b/linux-arm/crypto/fipsmodule/aes-armv4.S index f11bc7e1..d401fc78 100644 --- a/linux-arm/crypto/fipsmodule/aes-armv4.S +++ b/linux-arm/crypto/fipsmodule/aes-armv4.S @@ -170,7 +170,7 @@ asm_AES_encrypt: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_encrypt #else - adr r3,asm_AES_encrypt + adr r3,. #endif stmdb sp!,{r1,r4-r12,lr} #ifdef __APPLE__ @@ -421,7 +421,7 @@ _armv4_AES_set_encrypt_key: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_set_encrypt_key #else - adr r3,asm_AES_set_encrypt_key + adr r3,. #endif teq r0,#0 #ifdef __thumb2__ @@ -945,7 +945,7 @@ asm_AES_decrypt: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_decrypt #else - adr r3,asm_AES_decrypt + adr r3,. #endif stmdb sp!,{r1,r4-r12,lr} #ifdef __APPLE__ diff --git a/linux-arm/crypto/fipsmodule/bsaes-armv7.S b/linux-arm/crypto/fipsmodule/bsaes-armv7.S index 0b1a9f7a..f9c6de73 100644 --- a/linux-arm/crypto/fipsmodule/bsaes-armv7.S +++ b/linux-arm/crypto/fipsmodule/bsaes-armv7.S @@ -90,7 +90,7 @@ .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8: - adr r6,_bsaes_decrypt8 + adr r6,. vldmia r4!, {q9} @ round 0 key #ifdef __APPLE__ adr r6,.LM0ISR @@ -581,7 +581,7 @@ _bsaes_const: .type _bsaes_encrypt8,%function .align 4 _bsaes_encrypt8: - adr r6,_bsaes_encrypt8 + adr r6,. vldmia r4!, {q9} @ round 0 key #ifdef __APPLE__ adr r6,.LM0SR @@ -1016,7 +1016,7 @@ _bsaes_encrypt8_bitslice: .type _bsaes_key_convert,%function .align 4 _bsaes_key_convert: - adr r6,_bsaes_key_convert + adr r6,. vld1.8 {q7}, [r4]! @ load round 0 key #ifdef __APPLE__ adr r6,.LM0 |