Module Name: src
Committed By: christos
Date: Sat Jul 14 04:06:17 UTC 2012
Modified Files:
src/tests/crypto/libcrypto: Makefile
src/tests/crypto/libcrypto/idea: Makefile
src/tests/crypto/libcrypto/mdc2: Makefile
Log Message:
MKCRYPTO_{IDEA,MDC2} is no more
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/mdc2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.8 src/tests/crypto/libcrypto/Makefile:1.9
--- src/tests/crypto/libcrypto/Makefile:1.8 Sat Oct 22 17:13:25 2011
+++ src/tests/crypto/libcrypto/Makefile Sat Jul 14 00:06:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/22 21:13:25 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2012/07/14 04:06:17 christos Exp $
.include <bsd.own.mk>
@@ -7,15 +7,11 @@
SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac lhash \
md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 srp threads x509v3
-.if ${MKCRYPTO_IDEA} != "no"
-SUBDIR+=idea
-.endif
+SUBDIR+=idea mdc2
+
.if ${MKCRYPTO_RC5} != "no"
SUBDIR+=rc5
.endif
-.if ${MKCRYPTO_MDC2} != "no"
-SUBDIR+=mdc2
-.endif
TESTSDIR= ${TESTSBASE}/crypto/libcrypto
Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.3 src/tests/crypto/libcrypto/idea/Makefile:1.4
--- src/tests/crypto/libcrypto/idea/Makefile:1.3 Tue Jul 5 06:03:09 2011
+++ src/tests/crypto/libcrypto/idea/Makefile Sat Jul 14 00:06:17 2012
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:09 spz Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
HELPER_NAME= ideatest
HELPER_DIR= idea
.include <bsd.init.mk>
-.if ${MKCRYPTO_IDEA} != "no"
-LDADD= -lcrypto_idea -lcrypto
-.else
-CPPFLAGS+= -DOPENSSL_NO_IDEA
-.endif
-
+LDADD= -lcrypto
LDADD+= -Wl,--no-fatal-warnings
Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.3 src/tests/crypto/libcrypto/mdc2/Makefile:1.4
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.3 Tue Jul 5 06:03:10 2011
+++ src/tests/crypto/libcrypto/mdc2/Makefile Sat Jul 14 00:06:17 2012
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
HELPER_NAME= mdc2test
HELPER_DIR= mdc2
.include <bsd.init.mk>
-.if ${MKCRYPTO_MDC2} != "no"
-LDADD= -lcrypto_mdc2 -lcrypto
-.else
-CPPFLAGS+= -DOPENSSL_NO_MDC2
-.endif
-
+LDADD= -lcrypto
LDADD+= -Wl,--no-fatal-warnings
