From 78daad3cf290f322075743c8eaa9a62009873633 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 30 May 2016 14:19:20 +0200 Subject: tests: tlsfeature-test will ignore the 'Algorithm Security Level' line in comparisons That is to allow depending on the certificate output validation without relying on "moving" parameters such as the Algorithm Security Level. --- tests/cert-tests/tlsfeature-test | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test index a6452f3c9b..eae8a3f91c 100755 --- a/tests/cert-tests/tlsfeature-test +++ b/tests/cert-tests/tlsfeature-test @@ -45,7 +45,7 @@ datefudge -s "2007-04-22" \ --outfile "${TMPFILE}" 2>/dev/null rc=$? -${DIFF} "${srcdir}/template-tlsfeature.pem" "${TMPFILE}" >/dev/null 2>&1 +${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/template-tlsfeature.pem" "${TMPFILE}" >/dev/null 2>&1 rc=$? # We're done. @@ -101,15 +101,19 @@ datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-request \ --load-privkey "${srcdir}/template-test.key" \ --template "${srcdir}/template-tlsfeature.tmpl" \ - --outfile "${TMPFILE}" 2>/dev/null + --outfile "${TMPFILE}" -d 4 #2>/dev/null rc=$? +if test "${rc}" != "0"; then + echo "CSR generation test (0) failed" + exit ${rc} +fi -${DIFF} "${srcdir}/template-tlsfeature.csr" "${TMPFILE}" >/dev/null 2>&1 +${DIFF} --ignore-matching-lines "Algorithm Security Level" "${srcdir}/template-tlsfeature.csr" "${TMPFILE}" #>/dev/null 2>&1 rc=$? # We're done. if test "${rc}" != "0"; then - echo "CSR generation test failed" + echo "CSR generation test (1) failed" exit ${rc} fi -- cgit v1.2.1