From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Thu, 18 Jun 2015 06:41:52 +0000 (+0300)
Subject: tests: ecdsa: cleanup shell usage
X-Git-Tag: gnutls_3_4_3~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2b7baee68007903e06b2e5290bfe89d8fcde6b2;p=thirdparty%2Fgnutls.git

tests: ecdsa: cleanup shell usage

Add quotes for most usages of variables.

Added ${} for variables.

Cleanup trailing spaces.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---

diff --git a/tests/ecdsa/ecdsa b/tests/ecdsa/ecdsa
index ddb9b60bd4..90eead0a4b 100755
--- a/tests/ecdsa/ecdsa
+++ b/tests/ecdsa/ecdsa
@@ -22,15 +22,15 @@
 
 #set -e
 
-srcdir=${srcdir:-.}
-CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
+srcdir="${srcdir:-.}"
+CERTTOOL="${CERTTOOL:-../../src/certtool$EXEEXT}"
 
 echo ca > template
 echo cn = "ECDSA SHA 256 CA" >> template
 
-$CERTTOOL --generate-privkey --ecc > key-ca-ecdsa.pem 2>/dev/null 
+"${CERTTOOL}" --generate-privkey --ecc > key-ca-ecdsa.pem 2>/dev/null
 
-$CERTTOOL -d 2 --generate-self-signed --template template \
+"${CERTTOOL}" -d 2 --generate-self-signed --template template \
     --load-privkey key-ca-ecdsa.pem \
     --outfile new-ca-ecdsa.pem \
     --hash sha256 >out 2>&1
@@ -41,10 +41,10 @@ if [ $? != 0 ];then
 fi
 
 echo ca > template
-$CERTTOOL --generate-privkey --ecc > key-subca-ecdsa.pem 2>/dev/null 
+"${CERTTOOL}" --generate-privkey --ecc > key-subca-ecdsa.pem 2>/dev/null
 echo cn = "ECDSA SHA 224 Mid CA" >> template
 
-$CERTTOOL -d 2 --generate-certificate --template template \
+"${CERTTOOL}" -d 2 --generate-certificate --template template \
     --load-ca-privkey key-ca-ecdsa.pem \
     --load-ca-certificate new-ca-ecdsa.pem \
     --load-privkey key-subca-ecdsa.pem \
@@ -58,9 +58,9 @@ fi
 
 echo cn = "End-user" > template
 
-$CERTTOOL --generate-privkey --ecc > key-ecdsa.pem 2>/dev/null 
+"${CERTTOOL}" --generate-privkey --ecc > key-ecdsa.pem 2>/dev/null
 
-$CERTTOOL -d 2 --generate-certificate --template template \
+"${CERTTOOL}" -d 2 --generate-certificate --template template \
     --load-ca-privkey key-subca-ecdsa.pem \
     --load-ca-certificate new-subca-ecdsa.pem \
     --load-privkey key-ecdsa.pem \
@@ -72,7 +72,7 @@ if [ $? != 0 ];then
 fi
 
 cat new-user.pem new-subca-ecdsa.pem new-ca-ecdsa.pem > out
-$CERTTOOL --verify-chain <out > verify
+"${CERTTOOL}" --verify-chain <out > verify
 
 if [ $? != 0 ];then
 	cat verify
@@ -82,7 +82,7 @@ fi
 rm -f verify new-user.pem new-ca-ecdsa.pem new-subca-ecdsa.pem template out
 rm -f key-subca-ecdsa.pem key-ca-ecdsa.pem key-ecdsa.pem
 
-$CERTTOOL -k < ${srcdir}/bad-key.pem | grep "validation failed" >/dev/null 2>&1
+"${CERTTOOL}" -k < "${srcdir}/bad-key.pem" | grep "validation failed" >/dev/null 2>&1
 if [ $? != 0 ];then
 	echo "certtool didn't detect a bad ECDSA key."
 	exit 1