diff options
author | djm <> | 2008-09-08 07:23:38 +0000 |
---|---|---|
committer | djm <> | 2008-09-08 07:23:38 +0000 |
commit | 0abc698722622c8941475565889452000fe9f149 (patch) | |
tree | 8e814044666769e0582646e50631203657e8da51 | |
parent | fe4b8d40f2a6b20c26c7ef61d14dd8cd5582a6ed (diff) | |
download | openbsd-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/Makefile | 6 |
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 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | WANTLINT= | 4 | WANTLINT= |
@@ -325,17 +325,17 @@ CFLAGS+= -DMD5_ASM | |||
325 | CFLAGS+= -DSHA1_ASM | 325 | CFLAGS+= -DSHA1_ASM |
326 | CFLAGS+= -DRMD160_ASM | 326 | CFLAGS+= -DRMD160_ASM |
327 | CFLAGS+= -DOPENBSD_DES_ASM | 327 | CFLAGS+= -DOPENBSD_DES_ASM |
328 | CFLAGS+= -DOPENBSD_CAST_ASM | ||
329 | CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS | 328 | CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS |
330 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 329 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
331 | CFLAGS+= -DOPENSSL_CPUID_OBJ | 330 | CFLAGS+= -DOPENSSL_CPUID_OBJ |
331 | # XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto | ||
332 | #CFLAGS+= -DOPENBSD_CAST_ASM | ||
332 | SSLASM=\ | 333 | SSLASM=\ |
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 \ |