Module Name: src
Committed By: christos
Date: Fri Jul 13 19:32:51 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/bin: Makefile
Log Message:
remove mdc2 and idea handling
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.5 src/crypto/external/bsd/openssl/bin/Makefile:1.6
--- src/crypto/external/bsd/openssl/bin/Makefile:1.5 Wed Aug 17 01:30:01 2011
+++ src/crypto/external/bsd/openssl/bin/Makefile Fri Jul 13 15:32:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/17 05:30:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/13 19:32:51 christos Exp $
WARNS?= 2 # XXX -Wcast-qual
@@ -10,7 +10,7 @@ BINDIR=/usr/bin
USE_FORT?= yes # cryptographic software
# RCSid:
-# $Id: Makefile,v 1.5 2011/08/17 05:30:01 christos Exp $
+# $Id: Makefile,v 1.6 2012/07/13 19:32:51 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -40,20 +40,8 @@ SRCS+= verify.c asn1pars.c req.c dgst.c
CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
-# with normal OpenSSL, OPENSSL_NO_{IDEA,MDC2,RC5} changes ABI due to change in
-# struct/union. we nuked all of them in our header files and it is now safe.
-.if ${MKCRYPTO_IDEA} == "no"
-CPPFLAGS+= -DOPENSSL_NO_IDEA
-.else
-LDADD+= -lcrypto_idea
-DPADD+= ${LIBCRYPTO_IDEA}
-.endif
-.if ${MKCRYPTO_MDC2} == "no"
-CPPFLAGS+= -DOPENSSL_NO_MDC2
-.else
-LDADD+= -lcrypto_mdc2
-DPADD+= ${LIBCRYPTO_MDC2}
-.endif
+# with normal OpenSSL, OPENSSL_NO_RC5 changes ABI due to change in
+# struct/union. we nuked it in our header files and it is now safe.
.if ${MKCRYPTO_RC5} == "no"
CPPFLAGS+= -DOPENSSL_NO_RC5
.else
