1 files changed, 50 insertions, 63 deletions

diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index fbe27fd738..0d5deb5d3a 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/regress/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.14 2010/10/03 19:47:18 naddy Exp $
+#       $OpenBSD: Makefile,v 1.15 2014/04/16 08:29:22 jsg Exp $
 
 CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
 
@@ -20,39 +20,38 @@ ECDHTEST=	ecdhtest
 ECDSATEST=      ecdsatest
 ECTEST=         ectest
 ENGINETEST=     enginetest
-EVPTEST=        evp_test
+EVPTEST=        evptest
 EXPTEST=        exptest
 HMACTEST=       hmactest
 IGETEST=        igetest
-MD2TEST=        md2test
 MD4TEST=        md4test
 MD5TEST=        md5test
 RANDTEST=       randtest
 RC2TEST=        rc2test
 RC4TEST=        rc4test
 RMDTEST=        rmdtest
-RSATEST=        rsa_test
 SHA1TEST=       sha1test
 SHA256TEST=     sha256t
 SHA512TEST=     sha512t
 SHATEST=        shatest
 
 SSLDIR= ${.CURDIR}/../../../lib/libssl/src/crypto
+CRYPTODIR= ${.CURDIR}/../libcrypto
 CFLAGS+= -Wall -I${SSLDIR} -I${SSLDIR}/..
 
 CLEANFILES+=    $(BNTEST).c $(ECTEST).c $(HMACTEST).c \
         $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
         $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c \
-        $(CASTTEST).c $(EXPTEST).c $(DSATEST).c $(RSATEST).c \
-        $(EVPTEST).c $(DESTEST).c ${RC2TEST}.c ${RC4TEST}.c ${MD2TEST}.c \
+        $(CASTTEST).c $(EXPTEST).c $(DSATEST).c \
+        $(EVPTEST).c $(DESTEST).c ${RC2TEST}.c ${RC4TEST}.c \
         ${MD4TEST}.c ${MD5TEST}.c ${BFTEST}.c ${ECDHTEST}.c ${ECDSATEST}.c \
         ${IGETEST}.c ${SHA256TEST}.c ${SHA512TEST}.c
 
 CLEANFILES+=    $(BNTEST) $(ECTEST) $(HMACTEST) \
         $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
         $(RANDTEST) $(DHTEST) $(ENGINETEST) \
-        $(CASTTEST) $(EXPTEST) $(DSATEST) $(RSATEST) \
-        $(EVPTEST) $(DESTEST) ${RC2TEST} ${RC4TEST} ${MD2TEST} ${MD4TEST} \
+        $(CASTTEST) $(EXPTEST) $(DSATEST) \
+        $(EVPTEST) $(DESTEST) ${RC2TEST} ${RC4TEST} ${MD4TEST} \
         ${MD5TEST} ${BFTEST} ${ECDHTEST} ${ECDSATEST} ${IGETEST} \
         ${SHA256TEST} ${SHA512TEST}
 
@@ -60,10 +59,10 @@ CLEANFILES+= ${BNTEST}.out
 
 OTESTS= ${ENGINETEST}  \
         ${EXPTEST} ${RANDTEST} \
-        ${MD2TEST} ${MD4TEST} ${MD5TEST} \
+        ${MD4TEST} ${MD5TEST} \
         ${SHATEST} ${SHA1TEST} ${HMACTEST} ${RMDTEST} ${MDC2TEST} \
         ${CASTTEST} ${BFTEST} ${RC2TEST} ${RC4TEST} ${DESTEST} \
-        ${DHTEST} ${DSATEST} ${RSATEST} \
+        ${DHTEST} ${DSATEST} \
         ${ECTEST} ${ECDHTEST} ${ECDSATEST} $(IGETEST) \
         $(SHA256TEST) $(SHA512TEST)
 
@@ -120,53 +119,53 @@ ossltests: ${OTESTS} ${BNTEST} ${EVPTEST}
         ${.OBJDIR}/${OT} 
 .endfor
         @echo running ${EVPTEST}
-        ${.OBJDIR}/${EVPTEST} ${SSLDIR}/evp/evptests.txt
+        ${.OBJDIR}/${EVPTEST} ${CRYPTODIR}/evp/evptests.txt
 
-$(BNTEST).c: ${SSLDIR}/bn/bntest.c
-        cp ${SSLDIR}/bn/bntest.c ${.OBJDIR}
+$(BNTEST).c: ${CRYPTODIR}/bn/bntest.c
+        cp ${CRYPTODIR}/bn/bntest.c ${.OBJDIR}
 
 $(BNTEST): ${BNTEST}.c
         cc ${CFLAGS} -o $(BNTEST) ${BNTEST}.c $(LIBCRYPTO)
 
-$(EXPTEST).c: ${SSLDIR}/bn/exptest.c
-        cp ${SSLDIR}/bn/exptest.c ${.OBJDIR}
+$(EXPTEST).c: ${CRYPTODIR}/exp/exptest.c
+        cp ${CRYPTODIR}/exp/exptest.c ${.OBJDIR}
 
 $(EXPTEST): ${EXPTEST}.c
         cc ${CFLAGS} -o $(EXPTEST) ${EXPTEST}.c $(LIBCRYPTO)
 
-$(ECTEST).c: ${SSLDIR}/ec/ectest.c
-        cp ${SSLDIR}/ec/ectest.c ${.OBJDIR}
+$(ECTEST).c: ${CRYPTODIR}/ec/ectest.c
+        cp ${CRYPTODIR}/ec/ectest.c ${.OBJDIR}
 
 $(ECTEST): ${ECTEST}.c
         cc ${CFLAGS} -o $(ECTEST) ${ECTEST}.c $(LIBCRYPTO)
 
-$(EVPTEST).c: ${SSLDIR}/evp/${EVPTEST}.c
-        cp ${SSLDIR}/evp/${EVPTEST}.c ${.OBJDIR}
+$(EVPTEST).c: ${CRYPTODIR}/evp/${EVPTEST}.c
+        cp ${CRYPTODIR}/evp/${EVPTEST}.c ${.OBJDIR}
 $(EVPTEST): ${EVPTEST}.c
         cc ${CFLAGS} -o $(EVPTEST) ${EVPTEST}.c $(LIBCRYPTO)
 
-$(SHATEST).c: ${SSLDIR}/sha/${SHATEST}.c
-        cp ${SSLDIR}/sha/${SHATEST}.c ${.OBJDIR}
+$(SHATEST).c: ${CRYPTODIR}/sha/${SHATEST}.c
+        cp ${CRYPTODIR}/sha/${SHATEST}.c ${.OBJDIR}
 $(SHATEST): ${SHATEST}.c
         cc ${CFLAGS} -o $(SHATEST) ${SHATEST}.c $(LIBCRYPTO)
 
-$(SHA1TEST).c: ${SSLDIR}/sha/${SHA1TEST}.c
-        cp ${SSLDIR}/sha/${SHA1TEST}.c ${.OBJDIR}
+$(SHA1TEST).c: ${CRYPTODIR}/sha1/${SHA1TEST}.c
+        cp ${CRYPTODIR}/sha1/${SHA1TEST}.c ${.OBJDIR}
 $(SHA1TEST): ${SHA1TEST}.c
         cc ${CFLAGS} -o $(SHA1TEST) ${SHA1TEST}.c $(LIBCRYPTO)
 
-$(RANDTEST).c: ${SSLDIR}/rand/${RANDTEST}.c
-        cp ${SSLDIR}/rand/${RANDTEST}.c ${.OBJDIR}
+$(RANDTEST).c: ${CRYPTODIR}/rand/${RANDTEST}.c
+        cp ${CRYPTODIR}/rand/${RANDTEST}.c ${.OBJDIR}
 $(RANDTEST): ${RANDTEST}.c
         cc ${CFLAGS} -o $(RANDTEST) ${RANDTEST}.c $(LIBCRYPTO)
 
-$(RMDTEST).c: ${SSLDIR}/ripemd/${RMDTEST}.c
-        cp ${SSLDIR}/ripemd/${RMDTEST}.c ${.OBJDIR}
+$(RMDTEST).c: ${CRYPTODIR}/rmd/${RMDTEST}.c
+        cp ${CRYPTODIR}/rmd/${RMDTEST}.c ${.OBJDIR}
 $(RMDTEST): ${RMDTEST}.c
         cc ${CFLAGS} -o $(RMDTEST) ${RMDTEST}.c $(LIBCRYPTO)
 
-$(DHTEST).c: ${SSLDIR}/dh/${DHTEST}.c
-        cp ${SSLDIR}/dh/${DHTEST}.c ${.OBJDIR}
+$(DHTEST).c: ${CRYPTODIR}/dh/${DHTEST}.c
+        cp ${CRYPTODIR}/dh/${DHTEST}.c ${.OBJDIR}
 
 $(DHTEST): ${DHTEST}.c
         cc ${CFLAGS} -o $(DHTEST) ${DHTEST}.c $(LIBCRYPTO)
@@ -177,81 +176,69 @@ $(ENGINETEST).c: ${SSLDIR}/engine/${ENGINETEST}.c
 $(ENGINETEST): ${ENGINETEST}.c
         cc ${CFLAGS} -o $(ENGINETEST) ${ENGINETEST}.c $(LIBCRYPTO)
 
-$(CASTTEST).c: ${SSLDIR}/cast/${CASTTEST}.c
-        cp ${SSLDIR}/cast/${CASTTEST}.c ${.OBJDIR}
+$(CASTTEST).c: ${CRYPTODIR}/cast/${CASTTEST}.c
+        cp ${CRYPTODIR}/cast/${CASTTEST}.c ${.OBJDIR}
 
 $(CASTTEST): ${CASTTEST}.c
         cc ${CFLAGS} -o $(CASTTEST) ${CASTTEST}.c $(LIBCRYPTO)
 
-$(RSATEST).c: ${SSLDIR}/rsa/${RSATEST}.c
-        cp ${SSLDIR}/rsa/${RSATEST}.c ${.OBJDIR}
-
-$(RSATEST): ${RSATEST}.c
-        cc ${CFLAGS} -o $(RSATEST) ${RSATEST}.c $(LIBCRYPTO)
-
-$(DSATEST).c: ${SSLDIR}/dsa/${DSATEST}.c
-        cp ${SSLDIR}/dsa/${DSATEST}.c ${.OBJDIR}
+$(DSATEST).c: ${CRYPTODIR}/dsa/${DSATEST}.c
+        cp ${CRYPTODIR}/dsa/${DSATEST}.c ${.OBJDIR}
 
 $(DSATEST): ${DSATEST}.c
         cc ${CFLAGS} -o $(DSATEST) ${DSATEST}.c $(LIBCRYPTO)
 
 
-$(HMACTEST).c: ${SSLDIR}/hmac/${HMACTEST}.c
-        cp ${SSLDIR}/hmac/${HMACTEST}.c ${.OBJDIR}
+$(HMACTEST).c: ${CRYPTODIR}/hmac/${HMACTEST}.c
+        cp ${CRYPTODIR}/hmac/${HMACTEST}.c ${.OBJDIR}
 
 $(HMACTEST): ${HMACTEST}.c
         cc ${CFLAGS} -o $(HMACTEST) ${HMACTEST}.c $(LIBCRYPTO)
 
-$(DESTEST).c: ${SSLDIR}/des/${DESTEST}.c
-        cp ${SSLDIR}/des/${DESTEST}.c ${.OBJDIR}
+$(DESTEST).c: ${CRYPTODIR}/des/${DESTEST}.c
+        cp ${CRYPTODIR}/des/${DESTEST}.c ${.OBJDIR}
 
 $(DESTEST): ${DESTEST}.c
         cc ${CFLAGS} -o $(DESTEST) ${DESTEST}.c $(LIBCRYPTO)
 
-$(BFTEST).c: ${SSLDIR}/bf/${BFTEST}.c
-        cp ${SSLDIR}/bf/${BFTEST}.c ${.OBJDIR}
+$(BFTEST).c: ${CRYPTODIR}/bf/${BFTEST}.c
+        cp ${CRYPTODIR}/bf/${BFTEST}.c ${.OBJDIR}
 
 $(BFTEST): ${BFTEST}.c
         cc ${CFLAGS} -o $(BFTEST) ${BFTEST}.c $(LIBCRYPTO)
 
-$(RC2TEST).c: ${SSLDIR}/rc2/${RC2TEST}.c
-        cp ${SSLDIR}/rc2/${RC2TEST}.c ${.OBJDIR}
+$(RC2TEST).c: ${CRYPTODIR}/rc2/${RC2TEST}.c
+        cp ${CRYPTODIR}/rc2/${RC2TEST}.c ${.OBJDIR}
 
 $(RC2TEST): ${RC2TEST}.c
         cc ${CFLAGS} -o $(RC2TEST) ${RC2TEST}.c $(LIBCRYPTO)
 
-$(RC4TEST).c: ${SSLDIR}/rc4/${RC4TEST}.c
-        cp ${SSLDIR}/rc4/${RC4TEST}.c ${.OBJDIR}
+$(RC4TEST).c: ${CRYPTODIR}/rc4/${RC4TEST}.c
+        cp ${CRYPTODIR}/rc4/${RC4TEST}.c ${.OBJDIR}
 
 $(RC4TEST): ${RC4TEST}.c
         cc ${CFLAGS} -o $(RC4TEST) ${RC4TEST}.c $(LIBCRYPTO)
 
-$(MD2TEST).c: ${SSLDIR}/md2/${MD2TEST}.c
-        cp ${SSLDIR}/md2/${MD2TEST}.c ${.OBJDIR}
-
-$(MD2TEST): ${MD2TEST}.c
-        cc ${CFLAGS} -o $(MD2TEST) ${MD2TEST}.c $(LIBCRYPTO)
-
-$(MD4TEST).c: ${SSLDIR}/md4/${MD4TEST}.c
-        cp ${SSLDIR}/md4/${MD4TEST}.c ${.OBJDIR}
+$(MD4TEST).c: ${CRYPTODIR}/md4/${MD4TEST}.c
+        cp ${CRYPTODIR}/md4/${MD4TEST}.c ${.OBJDIR}
 
 $(MD4TEST): ${MD4TEST}.c
         cc ${CFLAGS} -o $(MD4TEST) ${MD4TEST}.c $(LIBCRYPTO)
 
-$(MD5TEST).c: ${SSLDIR}/md5/${MD5TEST}.c
-        cp ${SSLDIR}/md5/${MD5TEST}.c ${.OBJDIR}
+$(MD5TEST).c: ${CRYPTODIR}/md5/${MD5TEST}.c
+        cp ${CRYPTODIR}/md5/${MD5TEST}.c ${.OBJDIR}
 
 $(MD5TEST): ${MD5TEST}.c
         cc ${CFLAGS} -o $(MD5TEST) ${MD5TEST}.c $(LIBCRYPTO)
 
-$(ECDHTEST).c: ${SSLDIR}/ecdh/${ECDHTEST}.c
-        cp ${SSLDIR}/ecdh/${ECDHTEST}.c ${.OBJDIR}
+$(ECDHTEST).c: ${CRYPTODIR}/ecdh/${ECDHTEST}.c
+        cp ${CRYPTODIR}/ecdh/${ECDHTEST}.c ${.OBJDIR}
 
 $(ECDHTEST): ${ECDHTEST}.c
         cc ${CFLAGS} -o $(ECDHTEST) ${ECDHTEST}.c $(LIBCRYPTO)
 
-$(ECDSATEST).c: ${SSLDIR}/ecdsa/${ECDSATEST}.c
-        cp ${SSLDIR}/ecdsa/${ECDSATEST}.c ${.OBJDIR}
+$(ECDSATEST).c: ${CRYPTODIR}/ecdsa/${ECDSATEST}.c
+        cp ${CRYPTODIR}/ecdsa/${ECDSATEST}.c ${.OBJDIR}
 
 $(ECDSATEST): ${ECDSATEST}.c
         cc ${CFLAGS} -o $(ECDSATEST) ${ECDSATEST}.c $(LIBCRYPTO)