summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-09-08 07:23:39 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-09-08 07:23:39 +0000
commit8aa62324f07d22813b96308137003b7087e161a1 (patch)
tree1f403ddcc03cdaf3188afd3fc649cdbce2b2a21b
parent5ba8205317ad2d4f2f0591b3a1fac22670efb20a (diff)
turn off CAST assembler code (i.e. use C implementation) as it has bad
relocations that lead to libcrypto.so being marked TEXTREL; linker-fu from drahn@ "go ahead" deraadt@
-rw-r--r--lib/libssl/crypto/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile
index 122496d9130..114e1fc1d4f 100644
--- a/lib/libssl/crypto/Makefile
+++ b/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2008/09/07 19:22:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.49 2008/09/08 07:23:38 djm Exp $
LIB= crypto
WANTLINT=
@@ -325,17 +325,17 @@ CFLAGS+= -DMD5_ASM
CFLAGS+= -DSHA1_ASM
CFLAGS+= -DRMD160_ASM
CFLAGS+= -DOPENBSD_DES_ASM
-CFLAGS+= -DOPENBSD_CAST_ASM
CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
CFLAGS+= -DOPENSSL_BN_ASM_MONT
CFLAGS+= -DOPENSSL_CPUID_OBJ
+# XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto
+#CFLAGS+= -DOPENBSD_CAST_ASM
SSLASM=\
aes aes-586 \
bf bf-586 \
bn bn-586 \
bn co-586 \
bn mo-586 \
- cast cast-586 \
des crypt586 \
des des-586 \
md5 md5-586 \