Second round of fixing the OpenSSL perl/ stuff. It now at least compiled fine

[openssl.git] / test / Makefile.ssl

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 29a000d48c5fa13d12eb758fcd6069af0a73091c..94cbab77d176dff78f6081409f54761080e275bb 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -45,12 +45,13 @@ DHTEST=             dhtest
 DSATEST=       dsatest
 METHTEST=      methtest
 SSLTEST=       ssltest
+RSATEST=       rsa_oaep_test
 
 EXE=   $(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD5TEST) $(HMACTEST) \
        $(RC2TEST) $(RC4TEST) $(RC5TEST) \
        $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
        $(RANDTEST) $(DHTEST) \
-       $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST)
+       $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST) $(RSATEST)
 
 # $(METHTEST)
 
@@ -58,12 +59,12 @@ OBJ=        $(BNTEST).o $(IDEATEST).o $(MD2TEST).o  $(MD5TEST).o $(HMACTEST).o \
        $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
        $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
        $(RANDTEST).o $(DHTEST).o $(CASTTEST).o \
-       $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o
+       $(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o
 SRC=   $(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD5TEST).c  $(HMACTEST).c \
        $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
        $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
        $(RANDTEST).c $(DHTEST).c $(CASTTEST).c \
-       $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c
+       $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c
 
 EXHEADER= 
 HEADER=        $(EXHEADER)
@@ -81,8 +82,7 @@ files:
        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-       /bin/rm -f Makefile
-       $(TOP)/util/point.sh Makefile.ssl Makefile ;
+       @@$(TOP)/util/point.sh Makefile.ssl Makefile
 
 errors:
 
@@ -157,6 +157,7 @@ test_x509:
 
 test_rsa:
        @sh ./trsa 2>/dev/null
+       ./$(RSATEST)
 
 test_crl:
        @sh ./tcrl 2>/dev/null
@@ -220,7 +221,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
 
 clean:
-       /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
+       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
 
 $(DLIBSSL):
        (cd ../ssl; $(MAKE))
@@ -228,6 +229,9 @@ $(DLIBSSL):
 $(DLIBCRYPTO):
        (cd ../crypto; $(MAKE))
 
+$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
+       $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
 $(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
        $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
 
@@ -329,6 +333,8 @@ rc2test.o: ../include/rc2.h
 rc4test.o: ../include/rc4.h
 rc5test.o: ../include/rc5.h
 rmdtest.o: ../include/ripemd.h
+rsa_oaep_test.o: ../include/bn.h ../include/crypto.h ../include/e_os.h
+rsa_oaep_test.o: ../include/rsa.h ../include/stack.h
 sha1test.o: ../include/sha.h
 shatest.o: ../include/sha.h
 ssltest.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h