summaryrefslogtreecommitdiff
path: root/tests/ssl_gtests
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2017-11-06 15:19:31 +1100
committerMartin Thomson <martin.thomson@gmail.com>2017-11-06 15:19:31 +1100
commit91c340e823b6a5756b3b13e18473f6b7009926b5 (patch)
tree76adf1d4b56c432dd89af1493c32592e60ba5ec3 /tests/ssl_gtests
parentecca70d767924cca2078f2fd946fcc65b1d5dcc9 (diff)
downloadnss-hg-91c340e823b6a5756b3b13e18473f6b7009926b5.tar.gz
Bug 1414718 - Have a single way to signal a CA cert, r=ueno
Diffstat (limited to 'tests/ssl_gtests')
-rwxr-xr-xtests/ssl_gtests/ssl_gtests.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/ssl_gtests/ssl_gtests.sh b/tests/ssl_gtests/ssl_gtests.sh
index 665b5a629..fd678bf59 100755
--- a/tests/ssl_gtests/ssl_gtests.sh
+++ b/tests/ssl_gtests/ssl_gtests.sh
@@ -21,16 +21,17 @@
# Generate input to certutil
certscript() {
+ ca=n
while [ $# -gt 0 ]; do
case $1 in
sign) echo 0 ;;
kex) echo 2 ;;
- ca) echo 5;echo 6 ;;
+ ca) echo 5;echo 6;ca=y ;;
esac; shift
done;
echo 9
echo n
- echo ${ca:-n}
+ echo $ca
echo
echo n
}
@@ -50,9 +51,9 @@ make_cert() {
p256) type_args='-q nistp256';type=ec ;;
p384) type_args='-q secp384r1';type=ec ;;
p521) type_args='-q secp521r1';type=ec ;;
- rsa_ca) type_args='-g 1024';trust='CT,CT,CT';ca=y;type=rsa ;;
+ rsa_ca) type_args='-g 1024';trust='CT,CT,CT';type=rsa ;;
rsa_chain) type_args='-g 1024';sign='-c rsa_ca';type=rsa;;
- rsapss_ca) type_args='-g 1024 --pss';trust='CT,CT,CT';ca=y;type=rsa ;;
+ rsapss_ca) type_args='-g 1024 --pss';trust='CT,CT,CT';type=rsa ;;
rsapss_chain) type_args='-g 1024';sign='-c rsa_pss_ca';type=rsa;;
rsa_ca_rsapss_chain) type_args='-g 1024 --pss-sign';sign='-c rsa_ca';type=rsa;;
ecdh_rsa) type_args='-q nistp256';sign='-c rsa_ca';type=ec ;;