diff options
| author | Robert Sloan <varomodt@google.com> | 2017-04-03 09:16:40 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2017-04-03 10:01:30 -0700 |
| commit | 6f79a50fbad5817b8fc7a07c5657d8249c57a0f7 (patch) | |
| tree | 1dd4855cacce1b01341ed8b8e1557bedf0c2aa0b /linux-arm | |
| parent | 6d0d00e090b753250659b9a2d67dab7467257900 (diff) | |
| download | boringssl-6f79a50fbad5817b8fc7a07c5657d8249c57a0f7.tar.gz | |
external/boringssl: Sync to faa539f877432814d0f2de19846eb99f2ea1e207.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/bbfe603519bc54fbc4c8dd87efe1ed385df550b4..faa539f877432814d0f2de19846eb99f2ea1e207
Test: BoringSSL CTS Presubmits
Change-Id: I3ea66c6a16d30b31f9a51e8154fa581a7d386918
Diffstat (limited to 'linux-arm')
| -rw-r--r-- | linux-arm/crypto/aes/bsaes-armv7.S | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux-arm/crypto/aes/bsaes-armv7.S b/linux-arm/crypto/aes/bsaes-armv7.S index 1db7bbe1..0b1a9f7a 100644 --- a/linux-arm/crypto/aes/bsaes-armv7.S +++ b/linux-arm/crypto/aes/bsaes-armv7.S @@ -1,4 +1,11 @@ #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 @@ -77,6 +84,7 @@ .thumb #else .code 32 +# undef __thumb2__ #endif .type _bsaes_decrypt8,%function @@ -1313,7 +1321,7 @@ bsaes_cbc_encrypt: 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 |