diff options
| author | davidben <davidben@chromium.org> | 2015-02-25 15:30:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 23:31:22 +0000 |
| commit | 6b8131cb4dc0fd88a454dc0ca12b8606e98b746d (patch) | |
| tree | cb26651afaed1f60f198353b22146e0de5fe4027 /third_party/boringssl | |
| parent | 64cc2d9a83d857fcb1be7855df168f050dd6185a (diff) | |
| download | chromium_src-6b8131cb4dc0fd88a454dc0ca12b8606e98b746d.zip chromium_src-6b8131cb4dc0fd88a454dc0ca12b8606e98b746d.tar.gz chromium_src-6b8131cb4dc0fd88a454dc0ca12b8606e98b746d.tar.bz2 | |
Roll BoringSSL b180ee9..09bdb2a
Summary of changes available at:
https://boringssl.googlesource.com/boringssl/+log/b180ee9..09bdb2a
BUG=none
Review URL: https://codereview.chromium.org/952293002
Cr-Commit-Position: refs/heads/master@{#318145}
Diffstat (limited to 'third_party/boringssl')
13 files changed, 4 insertions, 107 deletions
diff --git a/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S b/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S index fa30dab..aafc450 100644 --- a/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S +++ b/third_party/boringssl/linux-arm/crypto/bn/armv4-mont.S @@ -572,4 +572,5 @@ bn_mul8x_mont_neon: .align 2 #if __ARM_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S b/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S index b089335..5abc328 100644 --- a/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S +++ b/third_party/boringssl/linux-arm/crypto/sha/sha1-armv4-large.S @@ -1452,4 +1452,5 @@ sha1_block_data_order_armv8: #endif #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S b/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S index bf1ce4f..3c41010 100644 --- a/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S +++ b/third_party/boringssl/linux-arm/crypto/sha/sha256-armv4.S @@ -2692,4 +2692,5 @@ sha256_block_data_order_armv8: .align 2 #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif diff --git a/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S b/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S index 1889fc7..37cfca3 100644 --- a/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S +++ b/third_party/boringssl/linux-arm/crypto/sha/sha512-armv4.S @@ -1772,4 +1772,5 @@ sha512_block_data_order: .align 2 #if __ARM_MAX_ARCH__>=7 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif diff --git a/third_party/boringssl/linux-x86/crypto/cpu-x86-asm.S b/third_party/boringssl/linux-x86/crypto/cpu-x86-asm.S index b6f767b..2e52a2c 100644 --- a/third_party/boringssl/linux-x86/crypto/cpu-x86-asm.S +++ b/third_party/boringssl/linux-x86/crypto/cpu-x86-asm.S @@ -101,10 +101,6 @@ OPENSSL_ia32_cpuid: cmpl $0,%ebp jne .L005notintel orl $1073741824,%edx - andb $15,%ah - cmpb $15,%ah - jne .L005notintel - orl $1048576,%edx .L005notintel: btl $28,%edx jnc .L002generic diff --git a/third_party/boringssl/linux-x86_64/crypto/cpu-x86_64-asm.S b/third_party/boringssl/linux-x86_64/crypto/cpu-x86_64-asm.S index c664242..9eef154 100644 --- a/third_party/boringssl/linux-x86_64/crypto/cpu-x86_64-asm.S +++ b/third_party/boringssl/linux-x86_64/crypto/cpu-x86_64-asm.S @@ -104,10 +104,6 @@ OPENSSL_ia32_cpuid: cmpl $0,%r9d jne .Lnotintel orl $1073741824,%edx - andb $15,%ah - cmpb $15,%ah - jne .Lnotintel - orl $1048576,%edx .Lnotintel: btl $28,%edx jnc .Lgeneric diff --git a/third_party/boringssl/linux-x86_64/crypto/rc4/rc4-x86_64.S b/third_party/boringssl/linux-x86_64/crypto/rc4/rc4-x86_64.S index edd6565a..d546154 100644 --- a/third_party/boringssl/linux-x86_64/crypto/rc4/rc4-x86_64.S +++ b/third_party/boringssl/linux-x86_64/crypto/rc4/rc4-x86_64.S @@ -592,31 +592,4 @@ asm_RC4_set_key: movl %eax,-4(%rdi) .byte 0xf3,0xc3 .size asm_RC4_set_key,.-asm_RC4_set_key - -.globl RC4_options -.hidden RC4_options -.type RC4_options,@function -.align 16 -RC4_options: - leaq .Lopts(%rip),%rax - movq OPENSSL_ia32cap_P(%rip),%rdx - movl (%rdx),%edx - btl $20,%edx - jc .L8xchar - btl $30,%edx - jnc .Ldone - addq $25,%rax - .byte 0xf3,0xc3 -.L8xchar: - addq $12,%rax -.Ldone: - .byte 0xf3,0xc3 -.align 64 -.Lopts: -.byte 114,99,52,40,56,120,44,105,110,116,41,0 -.byte 114,99,52,40,56,120,44,99,104,97,114,41,0 -.byte 114,99,52,40,49,54,120,44,105,110,116,41,0 -.byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,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 64 -.size RC4_options,.-RC4_options #endif diff --git a/third_party/boringssl/mac-x86/crypto/cpu-x86-asm.S b/third_party/boringssl/mac-x86/crypto/cpu-x86-asm.S index 7e8c83a..54eb09a 100644 --- a/third_party/boringssl/mac-x86/crypto/cpu-x86-asm.S +++ b/third_party/boringssl/mac-x86/crypto/cpu-x86-asm.S @@ -100,10 +100,6 @@ L004nocacheinfo: cmpl $0,%ebp jne L005notintel orl $1073741824,%edx - andb $15,%ah - cmpb $15,%ah - jne L005notintel - orl $1048576,%edx L005notintel: btl $28,%edx jnc L002generic diff --git a/third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S b/third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S index faf4e2f..0dde04d 100644 --- a/third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S +++ b/third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S @@ -104,10 +104,6 @@ L$nocacheinfo: cmpl $0,%r9d jne L$notintel orl $1073741824,%edx - andb $15,%ah - cmpb $15,%ah - jne L$notintel - orl $1048576,%edx L$notintel: btl $28,%edx jnc L$generic diff --git a/third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S b/third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S index 44147ff..7808184 100644 --- a/third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S +++ b/third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S @@ -592,31 +592,4 @@ L$exit_key: movl %eax,-4(%rdi) .byte 0xf3,0xc3 - -.globl _RC4_options -.private_extern _RC4_options - -.p2align 4 -_RC4_options: - leaq L$opts(%rip),%rax - movq _OPENSSL_ia32cap_P(%rip),%rdx - movl (%rdx),%edx - btl $20,%edx - jc L$8xchar - btl $30,%edx - jnc L$done - addq $25,%rax - .byte 0xf3,0xc3 -L$8xchar: - addq $12,%rax -L$done: - .byte 0xf3,0xc3 -.p2align 6 -L$opts: -.byte 114,99,52,40,56,120,44,105,110,116,41,0 -.byte 114,99,52,40,56,120,44,99,104,97,114,41,0 -.byte 114,99,52,40,49,54,120,44,105,110,116,41,0 -.byte 82,67,52,32,102,111,114,32,120,56,54,95,54,52,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 -.p2align 6 - #endif diff --git a/third_party/boringssl/win-x86/crypto/cpu-x86-asm.asm b/third_party/boringssl/win-x86/crypto/cpu-x86-asm.asm index 22bae78..df7993f 100644 --- a/third_party/boringssl/win-x86/crypto/cpu-x86-asm.asm +++ b/third_party/boringssl/win-x86/crypto/cpu-x86-asm.asm @@ -112,10 +112,6 @@ L$004nocacheinfo: cmp ebp,0 jne NEAR L$005notintel or edx,1073741824 - and ah,15 - cmp ah,15 - jne NEAR L$005notintel - or edx,1048576 L$005notintel: bt edx,28 jnc NEAR L$002generic diff --git a/third_party/boringssl/win-x86_64/crypto/cpu-x86_64-asm.asm b/third_party/boringssl/win-x86_64/crypto/cpu-x86_64-asm.asm index a52e68b..c92d7bb 100644 --- a/third_party/boringssl/win-x86_64/crypto/cpu-x86_64-asm.asm +++ b/third_party/boringssl/win-x86_64/crypto/cpu-x86_64-asm.asm @@ -114,10 +114,6 @@ $L$nocacheinfo: cmp r9d,0 jne NEAR $L$notintel or edx,0x40000000 - and ah,15 - cmp ah,15 - jne NEAR $L$notintel - or edx,0x00100000 $L$notintel: bt edx,28 jnc NEAR $L$generic diff --git a/third_party/boringssl/win-x86_64/crypto/rc4/rc4-x86_64.asm b/third_party/boringssl/win-x86_64/crypto/rc4/rc4-x86_64.asm index 18ef62d..c7c3b7b 100644 --- a/third_party/boringssl/win-x86_64/crypto/rc4/rc4-x86_64.asm +++ b/third_party/boringssl/win-x86_64/crypto/rc4/rc4-x86_64.asm @@ -619,35 +619,6 @@ $L$exit_key: mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret $L$SEH_end_asm_RC4_set_key: - -global RC4_options - -ALIGN 16 -RC4_options: - lea rax,[$L$opts] - mov rdx,QWORD[OPENSSL_ia32cap_P] - mov edx,DWORD[rdx] - bt edx,20 - jc NEAR $L$8xchar - bt edx,30 - jnc NEAR $L$done - add rax,25 - DB 0F3h,0C3h ;repret -$L$8xchar: - add rax,12 -$L$done: - DB 0F3h,0C3h ;repret -ALIGN 64 -$L$opts: -DB 114,99,52,40,56,120,44,105,110,116,41,0 -DB 114,99,52,40,56,120,44,99,104,97,114,41,0 -DB 114,99,52,40,49,54,120,44,105,110,116,41,0 -DB 82,67,52,32,102,111,114,32,120,56,54,95,54,52,44,32 -DB 67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97 -DB 112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103 -DB 62,0 -ALIGN 64 - EXTERN __imp_RtlVirtualUnwind ALIGN 16 |