merge with 0.9.7-beta1

1 files changed, 10 insertions, 5 deletions

diff --git a/src/lib/libssl/test/Makefile.ssl b/src/lib/libssl/test/Makefile.ssl
index 952ab16371..49f2cc9a23 100644
--- a/src/lib/libssl/test/Makefile.ssl
+++ b/src/lib/libssl/test/Makefile.ssl
@@ -14,6 +14,7 @@ MAKEFILE=	Makefile.ssl
 MAKE=           make -f $(MAKEFILE)
 MAKEDEPPROG=    makedepend
 MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
+PERL=           perl
 
 PEX_LIBS=
 EX_LIBS= #-lnsl -lsocket
@@ -234,7 +235,7 @@ test_gen:
         @echo "Generate and verify a certificate request"
         @sh ./testgen
 
-test_ss:
+test_ss keyU.ss certU.ss certCA.ss: testss
         @echo "Generate and certify a test certificate"
         @sh ./testss
 
@@ -242,13 +243,17 @@ test_engine:
         @echo "Manipulate the ENGINE structures"
         ./$(ENGINETEST)
 
-test_ssl:
+test_ssl: keyU.ss certU.ss certCA.ss
         @echo "test SSL protocol"
-        @sh ./testssl
+        @sh ./testssl keyU.ss certU.ss certCA.ss
 
 test_ca:
-        @echo "Generate and certify a test certificate via the 'ca' program"
-        @sh ./testca
+        @if ../apps/openssl no-rsa; then \
+          echo "skipping CA.sh test -- requires RSA"; \
+        else \
+          echo "Generate and certify a test certificate via the 'ca' program"; \
+          sh ./testca; \
+        fi
 
 test_rd: #$(RDTEST)
 #       @echo "test Rijndael"