From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 29 Feb 2016 18:41:33 +0000 (+0100)
Subject: tests: pkcs1-pad,rsa-md5-collision: allow multiple in-place builds
X-Git-Tag: gnutls_3_5_0~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a132efee4a5aa7802597a5e6e795ea3776fe8d4;p=thirdparty%2Fgnutls.git

tests: pkcs1-pad,rsa-md5-collision: allow multiple in-place builds
---

diff --git a/tests/pkcs1-padding/pkcs1-pad b/tests/pkcs1-padding/pkcs1-pad
index 8b71126d42..b5e9ca9c2b 100755
--- a/tests/pkcs1-padding/pkcs1-pad
+++ b/tests/pkcs1-padding/pkcs1-pad
@@ -35,26 +35,29 @@ if test "${TSTAMP}" != "1158969600"; then
 	exit 77
 fi
 
+TMPFILE1=pkcs1-pad.$$.tmp
+TMPFILE2=pkcs1-pad-2.$$.tmp
+
 # Test 1, PKCS#1 pad digestAlgorithm.parameters
 
 EXPECT1=2002
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok.pem" | tee out1 >/dev/null 2>&1
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken.pem" | tee out2 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok.pem" | tee $TMPFILE1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken.pem" | tee $TMPFILE2 >/dev/null 2>&1
 
-out1oks=`grep 'Verified.' out1 | wc -l | tr -d " "`
-out2oks=`grep 'Verified.' out2 | wc -l | tr -d " "`
-out1fails=`grep 'Not verified.' out1 | wc -l | tr -d " "`
-out2fails=`grep 'Not verified.' out2 | wc -l | tr -d " "`
+out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
+out2oks=`grep 'Verified.' $TMPFILE2 | wc -l | tr -d " "`
+out1fails=`grep 'Not verified.' $TMPFILE1 | wc -l | tr -d " "`
+out2fails=`grep 'Not verified.' $TMPFILE2 | wc -l | tr -d " "`
 
 if test "${out1oks}${out2oks}${out1fails}${out2fails}" != "${EXPECT1}"; then
-	echo "out1 oks ${out1oks} fails ${out1fails} out2 oks ${out2oks} fails ${out2fails}"
+	echo "$TMPFILE1 oks ${out1oks} fails ${out1fails} $TMPFILE2 oks ${out2oks} fails ${out2fails}"
 	echo "expected ${EXPECT1}"
 	echo "PKCS1-PAD1 FAIL"
 	exit 1
 fi
 
-rm -f out1 out2
+rm -f $TMPFILE1 $TMPFILE2
 
 echo "PKCS1-PAD1 OK"
 
@@ -62,22 +65,22 @@ echo "PKCS1-PAD1 OK"
 
 EXPECT2=2002
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok2.pem" | tee out1 >/dev/null 2>&1
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken2.pem" | tee out2 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-ok2.pem" | tee $TMPFILE1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken2.pem" | tee $TMPFILE2 >/dev/null 2>&1
 
-out1oks=`grep 'Verified.' out1 | wc -l | tr -d " "`
-out2oks=`grep 'Verified.' out2 | wc -l | tr -d " "`
-out1fails=`grep 'Not verified.' out1 | wc -l | tr -d " "`
-out2fails=`grep 'Not verified.' out2 | wc -l | tr -d " "`
+out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
+out2oks=`grep 'Verified.' $TMPFILE2 | wc -l | tr -d " "`
+out1fails=`grep 'Not verified.' $TMPFILE1 | wc -l | tr -d " "`
+out2fails=`grep 'Not verified.' $TMPFILE2 | wc -l | tr -d " "`
 
 if test "${out1oks}${out2oks}${out1fails}${out2fails}" != "${EXPECT2}"; then
-	echo "out1 oks ${out1oks} fails ${out1fails} out2 oks ${out2oks} fails ${out2fails}"
+	echo "$TMPFILE1 oks ${out1oks} fails ${out1fails} $TMPFILE2 oks ${out2oks} fails ${out2fails}"
 	echo "expected ${EXPECT2}"
 	echo "PKCS1-PAD2 FAIL"
 	exit 1
 fi
 
-rm -f out1 out2
+rm -f $TMPFILE1 $TMPFILE2
 
 echo "PKCS1-PAD2 OK"
 
@@ -87,19 +90,19 @@ echo "PKCS1-PAD2 OK"
 
 EXPECT3=02
 
-datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken3.pem" | tee out1 >/dev/null 2>&1
+datefudge "2006-09-23" "${CERTTOOL}" --verify-chain --infile "${srcdir}/pkcs1-pad-broken3.pem" | tee $TMPFILE1 >/dev/null 2>&1
 
-out1oks=`grep 'Verified.' out1 | wc -l | tr -d " "`
-out1fails=`grep 'Not verified.' out1 | wc -l | tr -d " "`
+out1oks=`grep 'Verified.' $TMPFILE1 | wc -l | tr -d " "`
+out1fails=`grep 'Not verified.' $TMPFILE1 | wc -l | tr -d " "`
 
 if test "${out1oks}${out1fails}" != "${EXPECT3}"; then
-	echo "out1 oks ${out1oks} fails ${out1fails}"
+	echo "$TMPFILE1 oks ${out1oks} fails ${out1fails}"
 	echo "expected ${EXPECT3}"
 	echo "PKCS1-PAD3 FAIL"
 	exit 1
 fi
 
-rm -f out1
+rm -f $TMPFILE1
 
 echo "PKCS1-PAD3 OK"
 
diff --git a/tests/rsa-md5-collision/rsa-md5-collision b/tests/rsa-md5-collision/rsa-md5-collision
index d6c1d2db5e..0ac6e8b45d 100755
--- a/tests/rsa-md5-collision/rsa-md5-collision
+++ b/tests/rsa-md5-collision/rsa-md5-collision
@@ -24,24 +24,25 @@ set -e
 
 srcdir="${srcdir:-.}"
 CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
+TMPFILE1=rsa-md5.$$.tmp
+TMPFILE2=rsa-md5-2.$$.tmp
 
 "${CERTTOOL}" --inder --certificate-info \
-	--infile "${srcdir}/MD5CollisionCA.cer" > ca.pem
+	--infile "${srcdir}/TargetCollidingCertificate1.cer" > $TMPFILE1
 "${CERTTOOL}" --inder --certificate-info \
-	--infile "${srcdir}/TargetCollidingCertificate1.cer" > client1.pem
-"${CERTTOOL}" --inder --certificate-info \
-	--infile "${srcdir}/TargetCollidingCertificate2.cer" > client2.pem
+	--infile "${srcdir}/TargetCollidingCertificate2.cer" > $TMPFILE2
 
-cat client1.pem ca.pem > chain1.pem
-cat client2.pem ca.pem > chain2.pem
+"${CERTTOOL}" --inder --certificate-info \
+	--infile "${srcdir}/MD5CollisionCA.cer" >> $TMPFILE1
+"${CERTTOOL}" --inder --certificate-info \
+	--infile "${srcdir}/MD5CollisionCA.cer" >> $TMPFILE2
 
-"${CERTTOOL}" --verify-chain < chain1.pem | \
+"${CERTTOOL}" --verify-chain < $TMPFILE1 | \
 	grep 'Not verified.' | grep 'insecure algorithm' >/dev/null
-"${CERTTOOL}" --verify-chain < chain2.pem | \
+"${CERTTOOL}" --verify-chain < $TMPFILE2 | \
 	grep 'Not verified.' | grep 'insecure algorithm' >/dev/null
 
-rm -f ca.pem client1.pem client2.pem \
-	chain1.pem chain2.pem
+rm -f $TMPFILE1 $TMPFILE2
 
 # We're done.
 exit 0