Module Name: src
Committed By: joerg
Date: Thu May 28 19:13:53 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: aes-x86_64.S
aesni-sha1-x86_64.S rc4-x86_64.S sha1-x86_64.S x86_64-gf2m.S
Log Message:
Regenerate.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.6 Sat Aug 4 11:03:34 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S Thu May 28 19:13:53 2015
@@ -1325,12 +1325,12 @@ AES_cbc_encrypt:
leaq .LAES_Td(%rip),%r14
.Lcbc_picked_te:
- movl OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10d
+ movq OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10
cmpq $512,%rdx
jb .Lcbc_slow_prologue
testq $15,%rdx
jnz .Lcbc_slow_prologue
- btl $28,%r10d
+ bt $28,(%r10)
jc .Lcbc_slow_prologue
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.6 Sat Aug 4 11:03:35 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S Thu May 28 19:13:53 2015
@@ -24,7 +24,7 @@ RC4: orq %rsi,%rsi
movb -4(%rdi),%cl
cmpl $-1,256(%rdi)
je .LRC4_CHAR
- movl OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8d
+ movq OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8
xorq %rbx,%rbx
incb %r10b
subq %r10,%rbx
@@ -32,7 +32,7 @@ RC4: orq %rsi,%rsi
movl (%rdi,%r10,4),%eax
testq $-16,%r11
jz .Lloop1
- btl $30,%r8d
+ bt $30,(%r8)
jc .Lintel
andq $7,%rbx
leaq 1(%r10),%rsi
@@ -531,8 +531,8 @@ private_RC4_set_key:
xorq %r10,%r10
xorq %r11,%r11
- movl OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8d
- btl $20,%r8d
+ movq OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8
+ bt $20,(%r8)
jc .Lc1stloop
jmp .Lw1stloop
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.6 Sat May 16 19:08:37 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S Thu May 28 19:13:53 2015
@@ -6,15 +6,12 @@
.type sha1_block_data_order,@function
.align 16
sha1_block_data_order:
- movl OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r9d
- movl OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r8d
- testl $512,%r8d
- jz .Lialu
- andl $268435456,%r8d
- andl $1073741824,%r9d
- orl %r9d,%r8d
- cmpl $1342177280,%r8d
- je _avx_shortcut
+ movq OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r8
+ movl 4(%r8),%r8d
+ btl $9,%r8d
+ jnc .Lialu
+ btl $28,%r8d
+ jc _avx_shortcut
jmp _ssse3_shortcut
.align 16
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.4 Sat May 16 19:08:37 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Thu May 28 19:13:53 2015
@@ -7,13 +7,9 @@
.align 16
aesni_cbc_sha1_enc:
- movl OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r10d
- movl OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r11d
- andl $268435456,%r11d
- andl $1073741824,%r10d
- orl %r11d,%r10d
- cmpl $1342177280,%r10d
- je aesni_cbc_sha1_enc_avx
+ movq OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10
+ bt $28,4(%r10)
+ jc aesni_cbc_sha1_enc_avx
jmp aesni_cbc_sha1_enc_ssse3
.byte 0xf3,0xc3
.size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S:1.1 Sat May 16 22:23:31 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S Thu May 28 19:13:53 2015
@@ -203,7 +203,7 @@ _mul_1x1:
.align 16
bn_GF2m_mul_2x2:
movq OPENSSL_ia32cap_P@GOTPCREL(%rip),%rax
- btq $33,%rax
+ bt $1,4(%rax)
jnc .Lvanilla_mul_2x2
.byte 102,72,15,110,198
