"openssl no-..." commands for avoiding the need to grep

"openssl list-standard-commands".

5 files changed, 14 insertions, 14 deletions

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 8cd3be0eaa..5f36364017 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -215,11 +215,11 @@ test_ssl: keyU.ss certU.ss certCA.ss
 	@sh ./testssl keyU.ss certU.ss certCA.ss
 
 test_ca:
-	@if ../apps/openssl list-standard-commands | grep '^rsa$$' >/dev/null; then \
+	@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; \
-	else \
-	  echo "skipping CA.sh test -- requires RSA"; \
  	fi
 
 lint:
diff --git a/test/testgen b/test/testgen
index f2db42cb24..6a4b6b9221 100644
--- a/test/testgen
+++ b/test/testgen
@@ -13,12 +13,12 @@ echo "generating certificate request"
 
 echo "string to make the random number generator think it has entropy" >> ./.rnd
 
-if ../apps/openssl list-standard-commands | grep '^rsa$' >/dev/null; then
+if ../apps/openssl no-rsa; then
+  req_new='-newkey dsa:../apps/dsa512.pem'
+else
   req_new='-new'
   echo "There should be a 2 sequences of .'s and some +'s."
   echo "There should not be more that at most 80 per line"
-else
-  req_new='-newkey dsa:../apps/dsa512.pem'
 fi
 
 echo "This could take some time."
diff --git a/test/testss b/test/testss
index bcc4f5295e..2f600f04d8 100644
--- a/test/testss
+++ b/test/testss
@@ -20,10 +20,10 @@ Ucert="certU.ss"
 echo
 echo "make a certificate request using 'req'"
 
-if ../apps/openssl list-standard-commands | grep '^rsa$' >/dev/null; then
-  req_new='-new'
-else
+if ../apps/openssl no-rsa; then
   req_new='-newkey dsa:../apps/dsa512.pem'
+else
+  req_new='-new'
 fi
 
 $reqcmd -config $CAconf -out $CAreq -keyout $CAkey $req_new #>err.ss
diff --git a/test/testssl b/test/testssl
index 873df83128..2151a6438c 100644
--- a/test/testssl
+++ b/test/testssl
@@ -115,7 +115,9 @@ $ssltest -bio_pair -server_auth -client_auth $CA || exit 1
 echo test tls1 with 1024bit anonymous DH, multiple handshakes
 $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1
 
-if ../apps/openssl list-standard-commands | grep '^rsa$' >/dev/null; then
+if ../apps/openssl no-rsa; then
+  echo skipping RSA tests
+else
   echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
   ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time || exit 1
 
diff --git a/test/trsa b/test/trsa
index a7a624978f..bd6c07650a 100644
--- a/test/trsa
+++ b/test/trsa
@@ -3,10 +3,8 @@
 PATH=../apps:$PATH
 export PATH
 
-if ../apps/openssl list-standard-commands | grep '^rsa$' >/dev/null; then
-  echo openssl rsa command available
-else
-  echo openssl rsa command not available, skipping test
+if ../apps/openssl no-rsa; then
+  echo skipping rsa conversion test
   exit 0
 fi