[master] testcrypto.sh in system tests

3714.	[test]		System tests that need to test for cryptography
			support before running can now use a common
			"testcrypto.sh" script to do so. [RT #35213]

bin/tests/system/pkcs11ssl/clean.sh

@@ -15,6 +15,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f K* ns1/K* keyset-* dsset-* ns1/*.db ns1/*.signed ns1/*.jnl
-rm -f dig.out random.data pin
+rm -f dig.out pin
 rm -f ns1/*.key ns1/named.memstats
 rm -f supported

bin/tests/system/pkcs11ssl/prereq.sh

@@ -14,21 +14,5 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-../../../tools/genrandom 400 random.data
-
-echo rsaonly > supported
-exit 0
-
-rsafail=0 eccfail=0
-
-$KEYGEN -q -r random.data foo > /dev/null 2>&1 || rsafail=1
-rm -f Kfoo*
-
-if [ $rsafail = 1 ]; then
-	echo "I:This test requires OpenSSL built with PKCS#11 support." >&2
-	exit 255
-fi
+echo "I:(PKCS#11 via OpenSSL)" >&2
+exec sh ../testcrypto.sh rsa

bin/tests/system/pkcs11ssl/setup.sh

@@ -17,7 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin

bin/tests/system/pkcs11ssl/tests.sh

@@ -19,8 +19,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-RANDFILE=random.data
-
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300"
 
 status=0