summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2013-04-27 05:44:39 +0000
committered <ed@FreeBSD.org>2013-04-27 05:44:39 +0000
commit8ac6e32cddc9e9b4a5f4c0d4ea66d8821330c97b (patch)
tree1fa02091fd93d268679f049d369b2260a0d26df6 /secure
parenta09c9f55503eb5b4686f83908992db66e59fe595 (diff)
downloadFreeBSD-src-8ac6e32cddc9e9b4a5f4c0d4ea66d8821330c97b.zip
FreeBSD-src-8ac6e32cddc9e9b4a5f4c0d4ea66d8821330c97b.tar.gz
Remove references to MK_IDEA.
As of r249959, we want to build with IDEA support enabled unconditionally. As this change removed the MK_IDEA flag, update these Makefiles accordingly.
Diffstat (limited to 'secure')
-rw-r--r--secure/Makefile.inc4
-rw-r--r--secure/lib/libcrypto/Makefile14
-rw-r--r--secure/lib/libcrypto/Makefile.inc4
3 files changed, 1 insertions, 21 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 0bd84f1..eb7c66e 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -8,10 +8,6 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt
.endif
-.if ${MK_IDEA} == "no"
-CFLAGS+= -DNO_IDEA
-.endif
-
.if ${MK_OPENSSH} != "no"
SSHDIR= ${.CURDIR}/../../../crypto/openssh
.endif
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 07e30f3..c28c510 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -200,10 +200,8 @@ SRCS+= hm_ameth.c hm_pmeth.c hmac.c
INCS+= hmac.h
# idea
-.if ${MK_IDEA} != "no"
SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
INCS+= idea.h
-.endif
# krb5
INCS+= krb5_asn.h
@@ -404,12 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h
.endif
cp -f ${.ALLSRC} ${.TARGET}
-.if ${MK_IDEA} == "no"
-evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
- sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= evp.h
-.endif
-
OLDSYMLINKS+= libdes.a libdes.so libdes.so.3 libdes_p.a
afterinstall:
@${ECHO} "Removing stale symlinks."
@@ -430,10 +422,6 @@ afterinstall:
_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm
.endif
-.if ${MK_IDEA} != "no"
-_ideapath= ${LCRYPTO_SRC}/crypto/idea
-.endif
-
.PATH: ${LCRYPTO_SRC}/crypto \
${LCRYPTO_SRC}/crypto/aes \
${LCRYPTO_SRC}/crypto/asn1 \
@@ -459,7 +447,7 @@ _ideapath= ${LCRYPTO_SRC}/crypto/idea
${LCRYPTO_SRC}/crypto/err \
${LCRYPTO_SRC}/crypto/evp \
${LCRYPTO_SRC}/crypto/hmac \
- ${_ideapath} \
+ ${LCRYPTO_SRC}/crypto/idea \
${LCRYPTO_SRC}/crypto/krb5 \
${LCRYPTO_SRC}/crypto/lhash \
${LCRYPTO_SRC}/crypto/md4 \
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index e598097..b28bc8d 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -13,10 +13,6 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE
CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H
-.if ${MK_IDEA} == "no"
-CFLAGS+= -DOPENSSL_NO_IDEA
-.endif
-
.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2
CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM
OpenPOWER on IntegriCloud