diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2015-06-21 20:42:12 +0300 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-06-24 21:47:29 +0200 |
commit | 435deb84c9c27d22be04e6a598e874e0bd55ff5b (patch) | |
tree | cf7562223e3481d66b45b34a7c058e07d6389592 /tests/cert-tests/pkcs7 | |
parent | 503c0cb80bcc8d6194cb414e889c40f59161d81d (diff) | |
download | gnutls-435deb84c9c27d22be04e6a598e874e0bd55ff5b.tar.gz |
tests: tab indent + minor style changes
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Diffstat (limited to 'tests/cert-tests/pkcs7')
-rwxr-xr-x | tests/cert-tests/pkcs7 | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7 index c3938cb672..d4b754b5c3 100755 --- a/tests/cert-tests/pkcs7 +++ b/tests/cert-tests/pkcs7 @@ -23,54 +23,54 @@ srcdir="${srcdir:-.}" CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" DIFF="${DIFF:-diff}" -if ! test -z "${VALGRIND}";then - VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=15" +if ! test -z "${VALGRIND}"; then + VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=15" fi OUTFILE=out-pkcs7.tmp OUTFILE2=out2-pkcs7.tmp -for FILE in single-ca.p7b full.p7b;do +for FILE in single-ca.p7b full.p7b; do ${VALGRIND} "${CERTTOOL}" --inder --p7-info --infile "${srcdir}/${FILE}"|grep -v "Signing time" >"${OUTFILE}" rc=$? # We're done. if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 decoding failed" - exit ${rc} + echo "${FILE}: PKCS7 decoding failed" + exit ${rc} fi ${DIFF} "${OUTFILE}" "${srcdir}/${FILE}.out" >/dev/null if test "$?" != "0"; then - echo "${FILE}: PKCS7 decoding didn't produce the correct file" - exit 1 + echo "${FILE}: PKCS7 decoding didn't produce the correct file" + exit 1 fi done # check signatures -for FILE in full.p7b;do +for FILE in full.p7b; do ${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}" rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 verification failed" - exit ${rc} + echo "${FILE}: PKCS7 verification failed" + exit ${rc} fi ${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.1 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}" rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 verification failed with key purpose" - exit ${rc} + echo "${FILE}: PKCS7 verification failed with key purpose" + exit ${rc} fi ${VALGRIND} "${CERTTOOL}" --verify-purpose=1.3.6.1.5.5.7.3.3 --inder --p7-verify --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" >"${OUTFILE}" rc=$? if test "${rc}" = "0"; then - echo "${FILE}: PKCS7 verification succeeded with wrong key purpose" - exit 2 + echo "${FILE}: PKCS7 verification succeeded with wrong key purpose" + exit 2 fi done @@ -82,16 +82,16 @@ ${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-ca-certificate "${srcdir}/. rc=$? if test "${rc}" = "0"; then - echo "${FILE}: PKCS7 verification succeeded without providing detached data" - exit 2 + echo "${FILE}: PKCS7 verification succeeded without providing detached data" + exit 2 fi ${VALGRIND} "${CERTTOOL}" --inder --p7-verify --load-data "${srcdir}/pkcs7-detached.txt" --load-ca-certificate "${srcdir}/../../doc/credentials/x509/ca.pem" --infile "${srcdir}/${FILE}" rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 verification failed" - exit ${rc} + echo "${FILE}: PKCS7 verification failed" + exit ${rc} fi # Test cert combination @@ -102,14 +102,14 @@ ${VALGRIND} "${CERTTOOL}" --p7-generate --load-certificate "${OUTFILE2}" >"${OUT rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct generation failed" - exit ${rc} + echo "${FILE}: PKCS7 struct generation failed" + exit ${rc} fi ${DIFF} "${OUTFILE}" "${srcdir}/p7-combined.out" >/dev/null if test "$?" != "0"; then - echo "${FILE}: PKCS7 generation didn't produce the correct file" - exit 1 + echo "${FILE}: PKCS7 generation didn't produce the correct file" + exit 1 fi # Test signing @@ -118,8 +118,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-sign --load-privkey "${srcdir}/../../doc/credent rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing failed" - exit ${rc} + echo "${FILE}: PKCS7 struct signing failed" + exit ${rc} fi FILE="signing-verify" @@ -127,8 +127,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/cr rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing failed verification" - exit ${rc} + echo "${FILE}: PKCS7 struct signing failed verification" + exit ${rc} fi @@ -137,8 +137,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-detached-sign --load-privkey "${srcdir}/../../do rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing-detached failed" - exit ${rc} + echo "${FILE}: PKCS7 struct signing-detached failed" + exit ${rc} fi FILE="signing-detached-verify" @@ -146,8 +146,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/cr rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing-detached failed verification" - exit ${rc} + echo "${FILE}: PKCS7 struct signing-detached failed verification" + exit ${rc} fi # Test signing with broken algorithms @@ -156,8 +156,8 @@ ${VALGRIND} "${CERTTOOL}" --hash md5 --p7-sign --load-privkey "${srcdir}/../../ rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing-broken failed" - exit ${rc} + echo "${FILE}: PKCS7 struct signing-broken failed" + exit ${rc} fi FILE="signing-verify-broken" @@ -165,8 +165,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/cr rc=$? if test "${rc}" = "0"; then - echo "${FILE}: PKCS7 struct verification succeeded with broken algo" - exit 1 + echo "${FILE}: PKCS7 struct verification succeeded with broken algo" + exit 1 fi FILE="signing-time" @@ -174,14 +174,14 @@ ${VALGRIND} "${CERTTOOL}" --p7-detached-sign --p7-time --load-privkey "${srcdir rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing with time failed" - exit ${rc} + echo "${FILE}: PKCS7 struct signing with time failed" + exit ${rc} fi ${VALGRIND} "${CERTTOOL}" --p7-info <"${OUTFILE}"|grep "Signing time:" "${OUTFILE}" >/dev/null 2>&1 if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing with time failed. No time was found." - exit ${rc} + echo "${FILE}: PKCS7 struct signing with time failed. No time was found." + exit ${rc} fi FILE="signing-time-verify" @@ -189,8 +189,8 @@ ${VALGRIND} "${CERTTOOL}" --p7-verify --load-certificate "${srcdir}/../../doc/cr rc=$? if test "${rc}" != "0"; then - echo "${FILE}: PKCS7 struct signing with time failed verification" - exit ${rc} + echo "${FILE}: PKCS7 struct signing with time failed verification" + exit ${rc} fi rm -f "${OUTFILE}" |