diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-02-29 20:49:09 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-02-29 20:49:09 +0100 |
| commit | 7c99351cf641abcf41f50c4e6392dbce627033c6 (patch) | |
| tree | 09f58b501367ff7a109466cacca115acf3c11f96 | |
| parent | 0a132efee4a5aa7802597a5e6e795ea3776fe8d4 (diff) | |
| download | gnutls-7c99351cf641abcf41f50c4e6392dbce627033c6.tar.gz | |
tests: pkcs12: allow multiple in-place builds
| -rwxr-xr-x | tests/pkcs12-decode/pkcs12 | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/pkcs12-decode/pkcs12 b/tests/pkcs12-decode/pkcs12 index 1427ec6872..e41afc9246 100755 --- a/tests/pkcs12-decode/pkcs12 +++ b/tests/pkcs12-decode/pkcs12 @@ -31,6 +31,9 @@ fi DIFF="${DIFF:-diff}" DEBUG="" +TMPFILE=pkcs12.$$.tmp +TMPFILE_PEM=pkcs12.$$.pem.tmp + DEBUG="1" ret=0 @@ -69,28 +72,28 @@ if test ${rc} != 0; then fi # test whether we can encode a certificate and a key -${VALGRIND} "${CERTTOOL}" --to-p12 --password 1234 --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --outder --outfile out.p12 >/dev/null +${VALGRIND} "${CERTTOOL}" --to-p12 --password 1234 --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --outder --outfile $TMPFILE >/dev/null rc=$? if test ${rc} != 0; then echo "PKCS12 FATAL encoding" exit 1 fi -${VALGRIND} "${CERTTOOL}" --p12-info --inder --password 1234 --infile out.p12 >out.pem 2>/dev/null +${VALGRIND} "${CERTTOOL}" --p12-info --inder --password 1234 --infile $TMPFILE >${TMPFILE_PEM} 2>/dev/null rc=$? if test ${rc} != 0; then echo "PKCS12 FATAL decrypting/decoding" exit 1 fi -grep "BEGIN ENCRYPTED PRIVATE KEY" out.pem >/dev/null 2>&1 +grep "BEGIN ENCRYPTED PRIVATE KEY" ${TMPFILE_PEM} >/dev/null 2>&1 rc=$? if test "${rc}" != "0"; then exit ${rc} fi -grep "BEGIN CERTIFICATE" out.pem >/dev/null 2>&1 +grep "BEGIN CERTIFICATE" ${TMPFILE_PEM} >/dev/null 2>&1 rc=$? if test "${rc}" != "0"; then @@ -98,35 +101,35 @@ if test "${rc}" != "0"; then fi # test whether we can encode a certificate, a key and a CA -${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 out.p12 >/dev/null +${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" exit 1 fi -${VALGRIND} "${CERTTOOL}" --p12-info --inder --password 123456 --infile out.p12 >out.pem 2>/dev/null +${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" exit 1 fi -grep "BEGIN ENCRYPTED PRIVATE KEY" out.pem >/dev/null 2>&1 +grep "BEGIN ENCRYPTED PRIVATE KEY" ${TMPFILE_PEM} >/dev/null 2>&1 rc=$? if test "${rc}" != "0"; then exit ${rc} fi -count=`grep -c "BEGIN CERTIFICATE" out.pem` +count=`grep -c "BEGIN CERTIFICATE" ${TMPFILE_PEM}` if test "$count" != "2"; then echo "Only one certificate was included" exit 1 fi -rm -f out.pem out.p12 +rm -f ${TMPFILE_PEM} $TMPFILE #echo "NEON PKCS12 DONE (rc ${ret})" exit ${ret} |