Skip to content

Commit

Permalink
Roll src/third_party/boringssl/src 085955c56..672f6fc24
Browse files Browse the repository at this point in the history
https://boringssl.googlesource.com/boringssl/+log/085955c56744a9cc82f98ed850deca2165252d2c..672f6fc2486745d0cabc3aaeb4e0a3cd13b37b12

BUG=none

Change-Id: I44a792ba4d7341f2d2eb912787d7cef0b2e711e1
Reviewed-on: https://chromium-review.googlesource.com/933161
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538825}
  • Loading branch information
davidben authored and Commit Bot committed Feb 23, 2018
1 parent c93b585 commit 02e48eb
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
'boringssl_revision': '085955c56744a9cc82f98ed850deca2165252d2c',
'boringssl_revision': '672f6fc2486745d0cabc3aaeb4e0a3cd13b37b12',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
Expand Down
6 changes: 3 additions & 3 deletions third_party/boringssl/ios-arm/crypto/fipsmodule/aes-armv4.S
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ _asm_AES_encrypt:
adr r3,.
#endif
stmdb sp!,{r1,r4-r12,lr}
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te
#else
sub r10,r3,#_asm_AES_encrypt-AES_Te @ Te
Expand Down Expand Up @@ -462,7 +462,7 @@ Lok: stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
mov lr,r1 @ bits
mov r11,r2 @ key

#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te+1024 @ Te4
#else
sub r10,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024 @ Te4
Expand Down Expand Up @@ -964,7 +964,7 @@ _asm_AES_decrypt:
adr r3,.
#endif
stmdb sp!,{r1,r4-r12,lr}
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Td
#else
sub r10,r3,#_asm_AES_decrypt-AES_Td @ Td
Expand Down
6 changes: 3 additions & 3 deletions third_party/boringssl/ios-arm/crypto/fipsmodule/bsaes-armv7.S
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
_bsaes_decrypt8:
adr r6,.
vldmia r4!, {q9} @ round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,LM0ISR
#else
add r6,r6,#LM0ISR-_bsaes_decrypt8
Expand Down Expand Up @@ -582,7 +582,7 @@ LREVM0SR:
_bsaes_encrypt8:
adr r6,.
vldmia r4!, {q9} @ round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,LM0SR
#else
sub r6,r6,#_bsaes_encrypt8-LM0SR
Expand Down Expand Up @@ -1019,7 +1019,7 @@ Lenc_done:
_bsaes_key_convert:
adr r6,.
vld1.8 {q7}, [r4]! @ load round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,LM0
#else
sub r6,r6,#_bsaes_key_convert-LM0
Expand Down
6 changes: 3 additions & 3 deletions third_party/boringssl/linux-arm/crypto/fipsmodule/aes-armv4.S
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ asm_AES_encrypt:
adr r3,.
#endif
stmdb sp!,{r1,r4-r12,lr}
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te
#else
sub r10,r3,#asm_AES_encrypt-AES_Te @ Te
Expand Down Expand Up @@ -457,7 +457,7 @@ _armv4_AES_set_encrypt_key:
mov lr,r1 @ bits
mov r11,r2 @ key

#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te+1024 @ Te4
#else
sub r10,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024 @ Te4
Expand Down Expand Up @@ -953,7 +953,7 @@ asm_AES_decrypt:
adr r3,.
#endif
stmdb sp!,{r1,r4-r12,lr}
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Td
#else
sub r10,r3,#asm_AES_decrypt-AES_Td @ Td
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
_bsaes_decrypt8:
adr r6,.
vldmia r4!, {q9} @ round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,.LM0ISR
#else
add r6,r6,#.LM0ISR-_bsaes_decrypt8
Expand Down Expand Up @@ -579,7 +579,7 @@ _bsaes_const:
_bsaes_encrypt8:
adr r6,.
vldmia r4!, {q9} @ round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,.LM0SR
#else
sub r6,r6,#_bsaes_encrypt8-.LM0SR
Expand Down Expand Up @@ -1014,7 +1014,7 @@ _bsaes_encrypt8_bitslice:
_bsaes_key_convert:
adr r6,.
vld1.8 {q7}, [r4]! @ load round 0 key
#ifdef __APPLE__
#if defined(__thumb2__) || defined(__APPLE__)
adr r6,.LM0
#else
sub r6,r6,#_bsaes_key_convert-.LM0
Expand Down

0 comments on commit 02e48eb

Please sign in to comment.