summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <>2008-09-08 07:23:38 +0000
committerdjm <>2008-09-08 07:23:38 +0000
commit0abc698722622c8941475565889452000fe9f149 (patch)
tree8e814044666769e0582646e50631203657e8da51
parentfe4b8d40f2a6b20c26c7ef61d14dd8cd5582a6ed (diff)
downloadopenbsd-0abc698722622c8941475565889452000fe9f149.tar.gz
openbsd-0abc698722622c8941475565889452000fe9f149.tar.bz2
openbsd-0abc698722622c8941475565889452000fe9f149.zip
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--src/lib/libssl/crypto/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 122496d913..114e1fc1d4 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.48 2008/09/07 19:22:21 deraadt Exp $ 1# $OpenBSD: Makefile,v 1.49 2008/09/08 07:23:38 djm Exp $
2 2
3LIB= crypto 3LIB= crypto
4WANTLINT= 4WANTLINT=
@@ -325,17 +325,17 @@ CFLAGS+= -DMD5_ASM
325CFLAGS+= -DSHA1_ASM 325CFLAGS+= -DSHA1_ASM
326CFLAGS+= -DRMD160_ASM 326CFLAGS+= -DRMD160_ASM
327CFLAGS+= -DOPENBSD_DES_ASM 327CFLAGS+= -DOPENBSD_DES_ASM
328CFLAGS+= -DOPENBSD_CAST_ASM
329CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS 328CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
330CFLAGS+= -DOPENSSL_BN_ASM_MONT 329CFLAGS+= -DOPENSSL_BN_ASM_MONT
331CFLAGS+= -DOPENSSL_CPUID_OBJ 330CFLAGS+= -DOPENSSL_CPUID_OBJ
331# XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto
332#CFLAGS+= -DOPENBSD_CAST_ASM
332SSLASM=\ 333SSLASM=\
333 aes aes-586 \ 334 aes aes-586 \
334 bf bf-586 \ 335 bf bf-586 \
335 bn bn-586 \ 336 bn bn-586 \
336 bn co-586 \ 337 bn co-586 \
337 bn mo-586 \ 338 bn mo-586 \
338 cast cast-586 \
339 des crypt586 \ 339 des crypt586 \
340 des des-586 \ 340 des des-586 \
341 md5 md5-586 \ 341 md5 md5-586 \