diff options
| author | Adam Langley <agl@google.com> | 2015-05-11 17:20:37 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-05-12 23:06:14 +0000 |
| commit | e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5 (patch) | |
| tree | 6e43e34595ecf887c26c32b86d8ab097fe8cac64 /linux-x86/crypto/cpu-x86-asm.S | |
| parent | b3106a0cc1493bbe0505c0ec0ce3da4ca90a29ae (diff) | |
| download | external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.zip external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.gz external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.bz2 | |
external/boringssl: bump revision.
This change bumps the BoringSSL revision to the current tip-of-tree.
Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa
Diffstat (limited to 'linux-x86/crypto/cpu-x86-asm.S')
| -rw-r--r-- | linux-x86/crypto/cpu-x86-asm.S | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/linux-x86/crypto/cpu-x86-asm.S b/linux-x86/crypto/cpu-x86-asm.S index b6f767b..24a8dd4 100644 --- a/linux-x86/crypto/cpu-x86-asm.S +++ b/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 @@ -241,6 +237,18 @@ OPENSSL_wipe_cpu: movl (%ecx),%ecx btl $1,(%ecx) jnc .L016no_x87 + andl $83886080,%ecx + cmpl $83886080,%ecx + jne .L017no_sse2 + pxor %xmm0,%xmm0 + pxor %xmm1,%xmm1 + pxor %xmm2,%xmm2 + pxor %xmm3,%xmm3 + pxor %xmm4,%xmm4 + pxor %xmm5,%xmm5 + pxor %xmm6,%xmm6 + pxor %xmm7,%xmm7 +.L017no_sse2: .long 4007259865,4007259865,4007259865,4007259865,2430851995 .L016no_x87: leal 4(%esp),%eax @@ -257,11 +265,11 @@ OPENSSL_atomic_add: pushl %ebx nop movl (%edx),%eax -.L017spin: +.L018spin: leal (%eax,%ecx,1),%ebx nop .long 447811568 - jne .L017spin + jne .L018spin movl %ebx,%eax popl %ebx ret @@ -301,11 +309,11 @@ OPENSSL_indirect_call: OPENSSL_ia32_rdrand: .L_OPENSSL_ia32_rdrand_begin: movl $8,%ecx -.L018loop: +.L019loop: .byte 15,199,240 - jc .L019break - loop .L018loop -.L019break: + jc .L020break + loop .L019loop +.L020break: cmpl $0,%eax cmovel %ecx,%eax ret |