aboutsummaryrefslogtreecommitdiff
path: root/secure
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2016-05-06 13:04:45 +0000
committerEd Maste <emaste@FreeBSD.org>2016-05-06 13:04:45 +0000
commitc4ca587a28a30067d9247e2a6e8101a4fc86ca09 (patch)
tree74de87ed58d858cce41a1eda60bde3ee1b25d757 /secure
parent82731f79a37de114f58a4ff52e3e00b71e24874f (diff)
Notes
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile2
-rw-r--r--secure/lib/libcrypto/i386/crypt586.s (renamed from secure/lib/libcrypto/i386/crypt586.S)8
2 files changed, 1 insertions, 9 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index b41f533d16e8..fbb38e950c72 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -137,7 +137,7 @@ SRCS+= cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c des_old.c \
fcrypt.c ofb64ede.c ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c \
rand_key.c read2pwd.c rpc_enc.c set_key.c str2key.c xcbc_enc.c
.if ${MACHINE_CPUARCH} == "i386"
-SRCS+= crypt586.S des-586.s
+SRCS+= crypt586.s des-586.s
.else
SRCS+= des_enc.c fcrypt_b.c
.endif
diff --git a/secure/lib/libcrypto/i386/crypt586.S b/secure/lib/libcrypto/i386/crypt586.s
index a02a3fc0bd8b..43f903a02d3c 100644
--- a/secure/lib/libcrypto/i386/crypt586.S
+++ b/secure/lib/libcrypto/i386/crypt586.s
@@ -14,15 +14,7 @@ fcrypt_body:
xorl %edi,%edi
xorl %esi,%esi
-#ifdef PIC
- calll .L1
-.L1:
- popl %edx
- addl $_GLOBAL_OFFSET_TABLE_+(.-.L1), %edx
- movl DES_SPtrans@GOT(%edx), %edx
-#else
leal DES_SPtrans,%edx
-#endif
pushl %edx
movl 28(%esp),%ebp
pushl $25