diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 6 | ||||
-rw-r--r-- | tests/data/pkcs7-cat-ca.pem (renamed from tests/suite/data/ca.pem) | 0 | ||||
-rw-r--r-- | tests/data/test1.cat (renamed from tests/suite/data/test1.cat) | bin | 329485 -> 329485 bytes | |||
-rw-r--r-- | tests/data/test1.cat.data (renamed from tests/suite/data/test1.cat.data) | bin | 322522 -> 322522 bytes | |||
-rw-r--r-- | tests/data/test1.cat.out (renamed from tests/suite/data/test1.cat.out) | 0 | ||||
-rw-r--r-- | tests/data/test2.cat (renamed from tests/suite/data/test2.cat) | bin | 1871 -> 1871 bytes | |||
-rw-r--r-- | tests/data/test2.cat.data (renamed from tests/suite/data/test2.cat.data) | bin | 548 -> 548 bytes | |||
-rw-r--r-- | tests/data/test2.cat.out (renamed from tests/suite/data/test2.cat.out) | 0 | ||||
-rwxr-xr-x | tests/pkcs7-cat.sh (renamed from tests/suite/pkcs7-cat) | 8 | ||||
-rw-r--r-- | tests/suite/Makefile.am | 6 |
10 files changed, 10 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6c1ee54540..af3902aaf0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -62,7 +62,9 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \ ocsp-tests/certs/server_bad.template ocsp-tests/certs/ocsp-staple-unrelated.der ocsp-tests/suppressions.valgrind \ data/listings-DTLS1.0 data/listings-SSL3.0 data/listings-TLS1.0 data/listings-TLS1.1 \ data/listings-SSL3.0-TLS1.1 p11-kit-trust-data/Example_Root_CA.p11-kit server-kx-neg-common.c \ - p11-kit-trust-data/Example_Root_CA.pem + p11-kit-trust-data/Example_Root_CA.pem data/test1.cat data/test2.cat \ + data/test1.cat.data data/test2.cat.data data/test1.cat.out data/test2.cat.out \ + data/pkcs7-cat-ca.pem AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) @@ -383,7 +385,7 @@ dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh start ocsp-tests/ocsp-tls-connection ocsp-tests/ocsp-must-staple-connection \ ocsp-tests/ocsp-test cipher-listings.sh sni-hostname.sh server-multi-keys.sh \ psktool.sh ocsp-tests/ocsp-load-chain gnutls-cli-save-data.sh gnutls-cli-debug.sh \ - sni-resume.sh ocsp-tests/ocsptool cert-reencoding.sh + sni-resume.sh ocsp-tests/ocsptool cert-reencoding.sh pkcs7-cat.sh dist_check_SCRIPTS += gnutls-cli-self-signed.sh diff --git a/tests/suite/data/ca.pem b/tests/data/pkcs7-cat-ca.pem index 884a191539..884a191539 100644 --- a/tests/suite/data/ca.pem +++ b/tests/data/pkcs7-cat-ca.pem diff --git a/tests/suite/data/test1.cat b/tests/data/test1.cat Binary files differindex 543e62a74a..543e62a74a 100644 --- a/tests/suite/data/test1.cat +++ b/tests/data/test1.cat diff --git a/tests/suite/data/test1.cat.data b/tests/data/test1.cat.data Binary files differindex e0bac4c436..e0bac4c436 100644 --- a/tests/suite/data/test1.cat.data +++ b/tests/data/test1.cat.data diff --git a/tests/suite/data/test1.cat.out b/tests/data/test1.cat.out index 1a0c955228..1a0c955228 100644 --- a/tests/suite/data/test1.cat.out +++ b/tests/data/test1.cat.out diff --git a/tests/suite/data/test2.cat b/tests/data/test2.cat Binary files differindex 288599decb..288599decb 100644 --- a/tests/suite/data/test2.cat +++ b/tests/data/test2.cat diff --git a/tests/suite/data/test2.cat.data b/tests/data/test2.cat.data Binary files differindex b72a5ddc76..b72a5ddc76 100644 --- a/tests/suite/data/test2.cat.data +++ b/tests/data/test2.cat.data diff --git a/tests/suite/data/test2.cat.out b/tests/data/test2.cat.out index aead58067c..aead58067c 100644 --- a/tests/suite/data/test2.cat.out +++ b/tests/data/test2.cat.out diff --git a/tests/suite/pkcs7-cat b/tests/pkcs7-cat.sh index 602e056c68..2f3b0b0b35 100755 --- a/tests/suite/pkcs7-cat +++ b/tests/pkcs7-cat.sh @@ -21,7 +21,7 @@ #set -e srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" DIFF="${DIFF:-diff -b -B}" if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=15" @@ -32,13 +32,13 @@ if ! test -x "${CERTTOOL}"; then exit 77 fi -. ${srcdir}/../scripts/common.sh +. ${srcdir}/scripts/common.sh check_for_datefudge #try verification datefudge -s "2010-10-10" \ -${VALGRIND} "${CERTTOOL}" --verify-allow-broken --inder --p7-verify --infile "${srcdir}/data/test1.cat" --load-certificate "${srcdir}/data/ca.pem" +${VALGRIND} "${CERTTOOL}" --verify-allow-broken --inder --p7-verify --infile "${srcdir}/data/test1.cat" --load-certificate "${srcdir}/data/pkcs7-cat-ca.pem" rc=$? if test "${rc}" = "0"; then @@ -47,7 +47,7 @@ if test "${rc}" = "0"; then fi datefudge -s "2016-10-10" \ -${VALGRIND} "${CERTTOOL}" --verify-allow-broken --inder --p7-verify --infile "${srcdir}/data/test1.cat" --load-certificate "${srcdir}/data/ca.pem" +${VALGRIND} "${CERTTOOL}" --verify-allow-broken --inder --p7-verify --infile "${srcdir}/data/test1.cat" --load-certificate "${srcdir}/data/pkcs7-cat-ca.pem" rc=$? if test "${rc}" != "0"; then diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index a573d7c329..21b2383b7f 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -31,9 +31,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/tests/suite/ecore/src/include \ -I$(top_srcdir)/tests/suite/ecore/src/lib -EXTRA_DIST = crl/long.crl crl/long.pem data/test1.cat data/test2.cat \ - data/test1.cat.data data/test2.cat.data \ - data/test1.cat.out data/test2.cat.out data/ca.pem +EXTRA_DIST = crl/long.crl crl/long.pem check_PROGRAMS = rng prime-check cert-coverage ocsp-coverage AM_LDFLAGS = -no-install @@ -91,7 +89,7 @@ EXTRA_DIST += testcompat-main-polarssl testcompat-main-openssl testcompat-common testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm nodist_check_SCRIPTS = testsrn.sh chain.sh invalid-cert.sh \ testrng.sh testcompat-polarssl.sh testcompat-openssl.sh \ - testrandom.sh pkcs7-cat certtool-pkcs11.sh tls-fuzzer/tls-fuzzer-nocert.sh \ + testrandom.sh certtool-pkcs11.sh tls-fuzzer/tls-fuzzer-nocert.sh \ tls-fuzzer/tls-fuzzer-cert.sh tls-fuzzer/tls-fuzzer-alpn.sh if ENABLE_PKCS11 |