diff options
| author | davidben <davidben@chromium.org> | 2015-10-01 11:07:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-01 18:08:15 +0000 |
| commit | 9540d653659324017b3ca06085bbbc063a1d3e94 (patch) | |
| tree | 4e9b0d77ef22030b9db15383f6b4d1c1fbce9dd0 /third_party/boringssl | |
| parent | 18f75b6db1b2002d8708677e76dea2581c2d9e53 (diff) | |
| download | chromium_src-9540d653659324017b3ca06085bbbc063a1d3e94.zip chromium_src-9540d653659324017b3ca06085bbbc063a1d3e94.tar.gz chromium_src-9540d653659324017b3ca06085bbbc063a1d3e94.tar.bz2 | |
Roll src/third_party/boringssl/src 8c9b8783e..0dd93002d
https://boringssl.googlesource.com/boringssl/+log/8c9b8783e26c3fbfc6d111017796256df6ea93dd..0dd93002ddf5adce17db88f1212ca2e14eba6e9c
BUG=none
Review URL: https://codereview.chromium.org/1383623002
Cr-Commit-Position: refs/heads/master@{#351840}
Diffstat (limited to 'third_party/boringssl')
| -rw-r--r-- | third_party/boringssl/boringssl.gypi | 1 | ||||
| -rw-r--r-- | third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S | 2 | ||||
| -rw-r--r-- | third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/third_party/boringssl/boringssl.gypi b/third_party/boringssl/boringssl.gypi index cb109d0..2f98c90 100644 --- a/third_party/boringssl/boringssl.gypi +++ b/third_party/boringssl/boringssl.gypi @@ -202,7 +202,6 @@ 'src/crypto/poly1305/poly1305.c', 'src/crypto/poly1305/poly1305_arm.c', 'src/crypto/poly1305/poly1305_vec.c', - 'src/crypto/rand/hwrand.c', 'src/crypto/rand/rand.c', 'src/crypto/rand/urandom.c', 'src/crypto/rand/windows.c', diff --git a/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S b/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S index 85262d5..a3ebec8 100644 --- a/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S +++ b/third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S @@ -47,7 +47,6 @@ @ @ <ard.biesheuvel@linaro.org> -#if defined(__arm__) #ifndef __KERNEL__ # include <openssl/arm_arch.h> @@ -2575,5 +2574,4 @@ bsaes_xts_decrypt: .size bsaes_xts_decrypt,.-bsaes_xts_decrypt #endif -#endif #endif
\ No newline at end of file diff --git a/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S b/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S index f868c2d..0a43989 100644 --- a/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S +++ b/third_party/boringssl/linux-arm/crypto/modes/ghash-armv4.S @@ -1,5 +1,4 @@ #if defined(__arm__) -#if defined(__arm__) #include <openssl/arm_arch.h> .syntax unified @@ -536,6 +535,4 @@ gcm_ghash_neon: .byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 - -#endif #endif
\ No newline at end of file |