Roll src/third_party/boringssl/src d04ca9535..a0ba400c3

third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S

 #if defined(__arm__)
+@ Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+@
+@ Licensed under the OpenSSL license (the "License").  You may not use
+@ this file except in compliance with the License.  You can obtain a copy
+@ in the file LICENSE in the source distribution or at
+@ https://www.openssl.org/source/license.html
+
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
 @ project. The module is, however, dual licensed under OpenSSL and
 @ CRYPTOGAMS licenses depending on where you obtain it. For further
 @ details see http://www.openssl.org/~appro/cryptogams/.
 @
 @ Specific modes and adaptation for Linux kernel by Ard Biesheuvel
 @ <ard.biesheuvel@linaro.org>. Permission to use under GPL terms is
 @ granted.
@@ skipping 58 matching lines @@
 #if __ARM_MAX_ARCH__>=7
 .arch   armv7-a
 .fpu    neon
 
 .text
 .syntax unified         @ ARMv7-capable assembler is expected to handle this
 #if defined(__thumb2__) && !defined(__APPLE__)
 .thumb
 #else
 .code   32
+# undef __thumb2__
 #endif
 
 .type   _bsaes_decrypt8,%function
 .align  4
 _bsaes_decrypt8:
         adr     r6,_bsaes_decrypt8
         vldmia  r4!, {q9}               @ round 0 key
 #ifdef  __APPLE__
         adr     r6,.LM0ISR
 #else
@@ skipping 1216 matching lines @@
         b       .Lcbc_dec_done
 .align  4
 .Lcbc_dec_one:
         sub     r0, r0, #0x10
         mov     r10, r1                 @ save original out pointer
         mov     r1, r9                  @ use the iv scratch space as out buffer
         mov     r2, r3
         vmov    q4,q15          @ just in case ensure that IV
         vmov    q5,q0                   @ and input are preserved
         bl      AES_decrypt
-        vld1.8  {q0}, [r9,:64]          @ load result
+        vld1.8  {q0}, [r9]              @ load result
         veor    q0, q0, q4      @ ^= IV
         vmov    q15, q5         @ q5 holds input
         vst1.8  {q0}, [r10]             @ write output
 
 .Lcbc_dec_done:
 #ifndef BSAES_ASM_EXTENDED_KEY
         vmov.i32        q0, #0
         vmov.i32        q1, #0
 .Lcbc_dec_bzero:@ wipe key schedule [if any]
         vstmia  sp!, {q0,q1}
@@ skipping 1223 matching lines @@
         mov     sp, r3
 #ifdef  XTS_CHAIN_TWEAK
         vst1.8  {q8}, [r1]
 #endif
         VFP_ABI_POP
         ldmia   sp!, {r4,r5,r6,r7,r8,r9,r10, pc}        @ return
 
 .size   bsaes_xts_decrypt,.-bsaes_xts_decrypt
 #endif
 #endif