summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/aes/asm
diff options
context:
space:
mode:
authorkettenis <>2012-10-31 11:19:35 +0000
committerkettenis <>2012-10-31 11:19:35 +0000
commite05982c56ef9dbde368df8fe35a8458f34b76f76 (patch)
treedf8275e2ac9f9c9853242382bc11bb6d08487c90 /src/lib/libcrypto/aes/asm
parent21f5cd5730973fef800d5035b20030617736629a (diff)
downloadopenbsd-e05982c56ef9dbde368df8fe35a8458f34b76f76.tar.gz
openbsd-e05982c56ef9dbde368df8fe35a8458f34b76f76.tar.bz2
openbsd-e05982c56ef9dbde368df8fe35a8458f34b76f76.zip
On amd64 OPENSSL_cpuid_setup and OPENSSL_ia32cap_P are now hidden so we don't
have to go through the PLT/GOT to get at them anymore. In fact going through the GOT now fails since we no longer have a GOT entry for OPENSSL_ia32cap_P. Fixes the problem spotted by jasper@ and sthen@. Based on a diff from mikeb@ who did most of the actual work of tracking down the issue. ok millert@, mikeb@
Diffstat (limited to 'src/lib/libcrypto/aes/asm')
-rwxr-xr-xsrc/lib/libcrypto/aes/asm/aes-x86_64.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/aes/asm/aes-x86_64.pl b/src/lib/libcrypto/aes/asm/aes-x86_64.pl
index 027b4ae2e5..48fa857d5b 100755
--- a/src/lib/libcrypto/aes/asm/aes-x86_64.pl
+++ b/src/lib/libcrypto/aes/asm/aes-x86_64.pl
@@ -1678,7 +1678,7 @@ AES_cbc_encrypt:
1678 lea .LAES_Td(%rip),$sbox 1678 lea .LAES_Td(%rip),$sbox
1679.Lcbc_picked_te: 1679.Lcbc_picked_te:
1680 1680
1681 mov PIC_GOT(OPENSSL_ia32cap_P),%r10d 1681 mov OPENSSL_ia32cap_P(%rip),%r10d
1682 cmp \$$speed_limit,%rdx 1682 cmp \$$speed_limit,%rdx
1683 jb .Lcbc_slow_prologue 1683 jb .Lcbc_slow_prologue
1684 test \$15,%rdx 1684 test \$15,%rdx