summaryrefslogtreecommitdiff
path: root/security/nss/tests/libpkix
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/tests/libpkix')
-rwxr-xr-xsecurity/nss/tests/libpkix/libpkix.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/tests/libpkix/libpkix.sh b/security/nss/tests/libpkix/libpkix.sh
index 7d3b6caab..b32c73bfd 100755
--- a/security/nss/tests/libpkix/libpkix.sh
+++ b/security/nss/tests/libpkix/libpkix.sh
@@ -206,7 +206,7 @@ libpkix_setup_db()
echo "Loading certs into DB at $DB_DIR"
output=$TMP/libpkix_setup.tmp
while read certName trusts; do
- certutil -d $DB_DIR -A -n $certName -t $trusts -i $CERT_DIR/$certName.cert > $output 2>&1
+ certutil -d $DB_DIR -A -n $certName -t $trusts -i $CERT_DIR/$certName.cert -f "${R_PWFILE}" > $output 2>&1
if [ $? -ne 0 ]; then
echo "WARNING: unable to add a certificate($certName) into database"
echo "certutil output:"
@@ -243,14 +243,14 @@ libpkix_leak_test()
[ $status -ne 0 ] && continue;
extraOpt=""
if [ "$explPolicy" -a "$explPolicy" != "undef" ]; then
- extraOpt="-p -o $explPolicy"
+ extraOpt="-pp -o $explPolicy"
fi
cmd="vfychain -d $DB_DIR $extraOpt $CERT_DIR/$leafCert.cert"
if [ -n "$MEMLEAK_DBG" ]; then
cmd="$RUN_COMMAND_DBG $cmd"
fi
echo $cmd
- $cmd > $tmpLogFile
+ $cmd > $tmpLogFile 2>&1
if [ -z "$MEMLEAK_DBG" ]; then
cat $tmpLogFile
grep "Memory Leak:" $tmpLogFile