tests: use more aliases in tests for better alias testing coverage

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/tests/cert-tests/pkcs12-encode.sh b/tests/cert-tests/pkcs12-encode.sh
index 2f719f3044c13297bdc6fbb01a96a1e5d6e456f2..f3e7ade3b9958569e827ebd141a04e2705819c33 100755 (executable)
--- a/tests/cert-tests/pkcs12-encode.sh
+++ b/tests/cert-tests/pkcs12-encode.sh
@@ -47,14 +47,14 @@ TMPFILE_PEM=pkcs12.$$.pem.tmp
 ${VALGRIND} "${CERTTOOL}" --to-p12 --password 123456 --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --load-ca-certificate "${srcdir}/../certs/ca-cert-ecc.pem" --outder --outfile $TMPFILE >/dev/null
 rc=$?
 if test ${rc} != 0; then
-       echo "PKCS12 FATAL encoding 2"
+       echo "PKCS12 FATAL encoding 2 (--outder)"
        exit 1
 fi
 
 ${VALGRIND} "${CERTTOOL}" --p12-info --inder --password 123456 --infile $TMPFILE >${TMPFILE_PEM} 2>/dev/null
 rc=$?
 if test ${rc} != 0; then
-       echo "PKCS12 FATAL decrypting/decoding 2"
+       echo "PKCS12 FATAL decrypting/decoding 2 (--inder)"
        exit 1
 fi
 
@@ -73,18 +73,18 @@ if test "$count" != "2"; then
 fi
 
 # Check whether we can encode a PKCS#12 file with cert / key and CRL
-${VALGRIND} "${CERTTOOL}" --to-p12 --password 123456 --pkcs-cipher aes-128 --p12-name "my-combo-key" --load-crl "${srcdir}/data/crl-demo1.pem" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --load-ca-certificate "${srcdir}/../certs/ca-cert-ecc.pem" --outder --outfile $TMPFILE >/dev/null
+${VALGRIND} "${CERTTOOL}" --to-p12 --password 123456 --pkcs-cipher aes-128 --p12-name "my-combo-key" --load-crl "${srcdir}/data/crl-demo1.pem" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --load-ca-certificate "${srcdir}/../certs/ca-cert-ecc.pem" --outraw --outfile $TMPFILE >/dev/null
 rc=$?
 if test ${rc} != 0; then
-       echo "PKCS12 FATAL encoding 3"
+       echo "PKCS12 FATAL encoding 3 (--outraw)"
        exit 1
 fi
 
 # Check whether the contents are the expected ones
-${VALGRIND} "${CERTTOOL}" --p12-info --inder --password 123456 --infile $TMPFILE >${TMPFILE_PEM} 2>/dev/null
+${VALGRIND} "${CERTTOOL}" --p12-info --inraw --password 123456 --infile $TMPFILE >${TMPFILE_PEM} 2>/dev/null
 rc=$?
 if test ${rc} != 0; then
-       echo "PKCS12 FATAL decrypting/decoding 3"
+       echo "PKCS12 FATAL decrypting/decoding 3 (--inraw)"
        exit 1
 fi
 

diff --git a/tests/server-multi-keys.sh b/tests/server-multi-keys.sh
index 9dd6a6adfec554ebe6d30b181f33bfec800954a9..26ebee03d332cd2e7458c7c4877b37858fb03740 100755 (executable)
--- a/tests/server-multi-keys.sh
+++ b/tests/server-multi-keys.sh
@@ -61,7 +61,7 @@ TMPFILE=outcert.$$.tmp
 
 eval "${GETPORT}"
 launch_server --echo --priority "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA" --x509keyfile ${KEY1} --x509certfile ${CERT1} \
-       --x509keyfile ${KEY2} --x509certfile ${CERT2} --x509keyfile ${KEY3} --x509certfile ${CERT3}
+       --x509keyfile ${KEY2} --x509ecccertfile ${CERT2} --x509keyfile ${KEY3} --x509certfile ${CERT3}
 PID=$!
 wait_server ${PID}