summaryrefslogtreecommitdiffstats
path: root/security/nss/tests/ssl_gtests/ssl_gtests.sh
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:42:53 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-15 01:42:53 +0100
commit74cabf7948b2597f5b6a67d6910c844fd1a88ff6 (patch)
treedb1f30ada487c3831ea8e4e98b2d39edc9e88eea /security/nss/tests/ssl_gtests/ssl_gtests.sh
parent09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3 (diff)
downloadUXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.gz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.lz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.xz
UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.zip
Update NSS to 3.41
Diffstat (limited to 'security/nss/tests/ssl_gtests/ssl_gtests.sh')
-rwxr-xr-xsecurity/nss/tests/ssl_gtests/ssl_gtests.sh56
1 files changed, 7 insertions, 49 deletions
diff --git a/security/nss/tests/ssl_gtests/ssl_gtests.sh b/security/nss/tests/ssl_gtests/ssl_gtests.sh
index eef77f16f..6c088d8a6 100755
--- a/security/nss/tests/ssl_gtests/ssl_gtests.sh
+++ b/security/nss/tests/ssl_gtests/ssl_gtests.sh
@@ -19,55 +19,6 @@
#
########################################################################
-# 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=y ;;
- esac; shift
- done;
- echo 9
- echo n
- echo $ca
- echo
- echo n
-}
-
-# $1: name
-# $2: type
-# $3+: usages: sign or kex
-make_cert() {
- name=$1
- type=$2
- unset type_args trust sign
- case $type in
- dsa) type_args='-g 1024' ;;
- rsa) type_args='-g 1024' ;;
- rsa2048) type_args='-g 2048';type=rsa ;;
- rsa8192) type_args='-g 8192';type=rsa ;;
- rsapss) type_args='-g 1024 --pss';type=rsa ;;
- 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';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';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 ;;
- esac
- shift 2
- counter=$(($counter + 1))
- certscript $@ | ${BINDIR}/certutil -S \
- -z ${R_NOISE_FILE} -d "${PROFILEDIR}" \
- -n $name -s "CN=$name" -t ${trust:-,,} ${sign:--x} -m $counter \
- -w -2 -v 120 -k $type $type_args -Z SHA256 -1 -2
- html_msg $? 0 "create certificate: $@"
-}
-
ssl_gtest_certs() {
mkdir -p "${SSLGTESTDIR}"
cd "${SSLGTESTDIR}"
@@ -80,6 +31,10 @@ ssl_gtest_certs() {
${BINDIR}/certutil -N -d "${PROFILEDIR}" --empty-password 2>&1
html_msg $? 0 "create ssl_gtest database"
+ pushd "${QADIR}"
+ . common/certsetup.sh
+ popd
+
counter=0
make_cert client rsa sign
make_cert rsa rsa sign kex
@@ -87,6 +42,9 @@ ssl_gtest_certs() {
make_cert rsa8192 rsa8192 sign kex
make_cert rsa_sign rsa sign
make_cert rsa_pss rsapss sign
+ make_cert rsa_pss384 rsapss384 sign
+ make_cert rsa_pss512 rsapss512 sign
+ make_cert rsa_pss_noparam rsapss_noparam sign
make_cert rsa_decrypt rsa kex
make_cert ecdsa256 p256 sign
make_cert ecdsa384 p384 sign