svn commit: r249971 - in head/secure: . lib/libcrypto

[Ed Schouten]

Author: ed
Date: Sat Apr 27 05:44:39 2013
New Revision: 249971
URL: http://svnweb.freebsd.org/changeset/base/249971

Log:
  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.

Modified:
  head/secure/Makefile.inc
  head/secure/lib/libcrypto/Makefile
  head/secure/lib/libcrypto/Makefile.inc

Modified: head/secure/Makefile.inc
==============================================================================
--- head/secure/Makefile.inc	Sat Apr 27 05:06:25 2013	(r249970)
+++ head/secure/Makefile.inc	Sat Apr 27 05:44:39 2013	(r249971)
@@ -8,10 +8,6 @@ CRYPTOBJDIR=	${.CURDIR}/../../lib/libcry
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
 .endif
 
-.if ${MK_IDEA} == "no"
-CFLAGS+= -DNO_IDEA
-.endif
-
 .if ${MK_OPENSSH} != "no"
 SSHDIR=		${.CURDIR}/../../../crypto/openssh
 .endif

Modified: head/secure/lib/libcrypto/Makefile
==============================================================================
--- head/secure/lib/libcrypto/Makefile	Sat Apr 27 05:06:25 2013	(r249970)
+++ head/secure/lib/libcrypto/Makefile	Sat Apr 27 05:44:39 2013	(r249971)
@@ -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_CPU
 .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 \

Modified: head/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/Makefile.inc	Sat Apr 27 05:06:25 2013	(r249970)
+++ head/secure/lib/libcrypto/Makefile.inc	Sat Apr 27 05:44:39 2013	(r249971)
@@ -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