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/mac-x86_64 | |
| 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/mac-x86_64')
| -rw-r--r-- | third_party/boringssl/mac-x86_64/crypto/cpu-x86_64-asm.S | 4 | ||||
| -rw-r--r-- | third_party/boringssl/mac-x86_64/crypto/rc4/rc4-x86_64.S | 27 |
2 files changed, 0 insertions, 31 deletions
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 |