diff options
-rw-r--r-- | tests/cert-tests/Makefile.am | 27 | ||||
-rwxr-xr-x | tests/cert-tests/krb5-test | 6 | ||||
-rwxr-xr-x | tests/cert-tests/othername-test | 4 | ||||
-rwxr-xr-x | tests/cert-tests/sha3-test | 4 | ||||
-rwxr-xr-x | tests/cert-tests/template-test | 20 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-date.tmpl (renamed from tests/cert-tests/template-date.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-dn-err.tmpl (renamed from tests/cert-tests/template-dn-err.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-dn.tmpl (renamed from tests/cert-tests/template-dn.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-generalized.tmpl (renamed from tests/cert-tests/template-generalized.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-krb5name.tmpl (renamed from tests/cert-tests/template-krb5name.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-nc.tmpl (renamed from tests/cert-tests/template-nc.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-othername-xmpp.tmpl (renamed from tests/cert-tests/template-othername-xmpp.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-othername.tmpl (renamed from tests/cert-tests/template-othername.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-overflow.tmpl (renamed from tests/cert-tests/template-overflow.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-overflow2.tmpl (renamed from tests/cert-tests/template-overflow2.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-test.tmpl (renamed from tests/cert-tests/template-test.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-tlsfeature-crq.tmpl (renamed from tests/cert-tests/template-tlsfeature-crq.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-tlsfeature.tmpl (renamed from tests/cert-tests/template-tlsfeature.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-unique.tmpl (renamed from tests/cert-tests/template-unique.tmpl) | 0 | ||||
-rw-r--r-- | tests/cert-tests/templates/template-utf8.tmpl (renamed from tests/cert-tests/template-utf8.tmpl) | 0 | ||||
-rwxr-xr-x | tests/cert-tests/tlsfeature-test | 6 |
21 files changed, 36 insertions, 31 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index 4320532e00..551ff86953 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -20,27 +20,32 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \ - template-test.key template-test.pem template-test.tmpl \ + template-test.key template-test.pem templates/template-test.tmpl \ funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem \ - bmpstring.pem template-utf8.pem template-utf8.tmpl \ - template-dn.tmpl template-dn.pem complex-cert.pem template-overflow.pem \ - template-overflow.tmpl template-overflow2.pem template-overflow2.tmpl \ - template-date.tmpl template-date.pem template-dn-err.tmpl \ - template-nc.tmpl template-nc.pem xmpp-othername.pem \ + bmpstring.pem template-utf8.pem templates/template-utf8.tmpl \ + templates/template-dn.tmpl template-dn.pem complex-cert.pem template-overflow.pem \ + templates/template-overflow.tmpl template-overflow2.pem \ + templates/template-overflow2.tmpl \ + templates/template-date.tmpl template-date.pem templates/template-dn-err.tmpl \ + templates/template-nc.tmpl template-nc.pem xmpp-othername.pem \ suppressions.valgrind csr-invalid.der invalid-sig2.pem invalid-sig3.pem \ invalid-sig.pem email-certs/chain.exclude.test.example.com email-certs/chain.test.example.com \ email-certs/chain.invalid.example.com email-certs/chain.test.example.com-2 \ single-ca.p7b single-ca.p7b.out full.p7b full.p7b.out detached.p7b \ pkcs7-detached.txt p7-combined.out template-generalized.pem \ - template-generalized.tmpl privkey1.pem privkey2.pem privkey3.pem \ + templates/template-generalized.tmpl privkey1.pem privkey2.pem privkey3.pem \ name-constraints-ip.pem cert-invalid-utf8.der very-long-dn.pem \ provable3072.pem provable2048.pem provable-dsa2048.pem provable-dsa2048-fips.pem \ - template-unique.tmpl template-unique.pem template-othername.tmpl template-othername.pem \ - template-othername-xmpp.tmpl template-othername-xmpp.pem template-krb5name.tmpl \ + templates/template-unique.tmpl template-unique.pem \ + templates/template-othername.tmpl template-othername.pem \ + templates/template-othername-xmpp.tmpl template-othername-xmpp.pem \ + templates/template-krb5name.tmpl \ template-krb5name.pem template-krb5name-full.pem template-test-ecc.key \ template-rsa-sha3-256.pem template-rsa-sha3-512.pem template-rsa-sha3-224.pem template-rsa-sha3-384.pem \ - name-constraints-ip2.pem chain-md5.pem gost-cert.pem template-tlsfeature.tmpl \ - template-tlsfeature.pem template-tlsfeature.csr template-tlsfeature-crq.tmpl + name-constraints-ip2.pem chain-md5.pem gost-cert.pem \ + templates/template-tlsfeature.tmpl \ + template-tlsfeature.pem template-tlsfeature.csr \ + templates/template-tlsfeature-crq.tmpl dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \ pkcs7 pkcs7-broken-sigs privkey-import name-constraints certtool-long-cn crl provable-privkey \ diff --git a/tests/cert-tests/krb5-test b/tests/cert-tests/krb5-test index 6ad121cdcb..e6e731e93d 100755 --- a/tests/cert-tests/krb5-test +++ b/tests/cert-tests/krb5-test @@ -47,7 +47,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-krb5name.tmpl" \ + --template "${srcdir}/templates/template-krb5name.tmpl" \ --outfile ${OUTFILE} 2>/dev/null ${DIFF} "${srcdir}/template-krb5name.pem" ${OUTFILE} >/dev/null 2>&1 @@ -60,7 +60,7 @@ if test "${rc}" != "0"; then fi # Negative tests. Check against values which may cause problems -cp template-krb5name.tmpl ${TMPLFILE} +cp templates/template-krb5name.tmpl ${TMPLFILE} echo "krb5_principal = 'xxxxxxxxxxxxxx'" >>${TMPLFILE} datefudge -s "2007-04-22" \ @@ -77,7 +77,7 @@ if test "${rc}" != "1"; then exit ${rc} fi -cp template-krb5name.tmpl ${TMPLFILE} +cp templates/template-krb5name.tmpl ${TMPLFILE} echo "krb5_principal = 'comp1/comp2/comp3/comp4/comp5/comp6/comp7/comp8/comp9/comp10@REALM.COM'" >>${TMPLFILE} datefudge -s "2007-04-22" \ diff --git a/tests/cert-tests/othername-test b/tests/cert-tests/othername-test index 40cedea7bf..1acb072942 100755 --- a/tests/cert-tests/othername-test +++ b/tests/cert-tests/othername-test @@ -42,7 +42,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-othername.tmpl" \ + --template "${srcdir}/templates/template-othername.tmpl" \ --outfile ${OUTFILE} 2>/dev/null ${DIFF} "${srcdir}/template-othername.pem" ${OUTFILE} >/dev/null 2>&1 @@ -57,7 +57,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-othername-xmpp.tmpl" \ + --template "${srcdir}/templates/template-othername-xmpp.tmpl" \ --outfile ${OUTFILE} 2>/dev/null ${DIFF} "${srcdir}/template-othername-xmpp.pem" ${OUTFILE} >/dev/null 2>&1 diff --git a/tests/cert-tests/sha3-test b/tests/cert-tests/sha3-test index b59f6411f0..d6ac8a9518 100755 --- a/tests/cert-tests/sha3-test +++ b/tests/cert-tests/sha3-test @@ -44,7 +44,7 @@ for i in sha3-224 sha3-256 sha3-384 sha3-512;do datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-test.tmpl" \ + --template "${srcdir}/templates/template-test.tmpl" \ --outfile "${TMPFILE}" --hash $i 2>/dev/null rc=$? @@ -74,7 +74,7 @@ for i in sha3-224 sha3-256 sha3-384 sha3-512;do datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test-ecc.key" \ - --template "${srcdir}/template-test.tmpl" \ + --template "${srcdir}/templates/template-test.tmpl" \ --outfile "${TMPFILE}" --hash $i 2>/dev/null rc=$? diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test index 9e40696adc..14588af149 100755 --- a/tests/cert-tests/template-test +++ b/tests/cert-tests/template-test @@ -41,7 +41,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-test.tmpl" \ + --template "${srcdir}/templates/template-test.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-test.pem" tmp-tt.pem >/dev/null 2>&1 @@ -58,7 +58,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-utf8.tmpl" \ + --template "${srcdir}/templates/template-utf8.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-utf8.pem" tmp-tt.pem >/dev/null 2>&1 @@ -75,7 +75,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-dn.tmpl" \ + --template "${srcdir}/templates/template-dn.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-dn.pem" tmp-tt.pem >/dev/null 2>&1 @@ -92,7 +92,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-dn-err.tmpl" \ + --template "${srcdir}/templates/template-dn-err.tmpl" \ --outfile tmp-tt.pem 2>/dev/null rc=$? @@ -106,7 +106,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-overflow.tmpl" \ + --template "${srcdir}/templates/template-overflow.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-overflow.pem" tmp-tt.pem >/dev/null 2>&1 @@ -126,7 +126,7 @@ if echo __SIZEOF_POINTER__ | cpp -E - - | grep '^8$' >/dev/null; then datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-overflow2.tmpl" \ + --template "${srcdir}/templates/template-overflow2.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-overflow2.pem" tmp-tt.pem >/dev/null 2>&1 @@ -144,7 +144,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-date.tmpl" \ + --template "${srcdir}/templates/template-date.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-date.pem" tmp-tt.pem >/dev/null 2>&1 @@ -163,7 +163,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-nc.tmpl" \ + --template "${srcdir}/templates/template-nc.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-nc.pem" tmp-tt.pem >/dev/null 2>&1 @@ -184,7 +184,7 @@ if test "$(getconf LONG_BIT)" = "64"; then datefudge -s "2051-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-generalized.tmpl" \ + --template "${srcdir}/templates/template-generalized.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-generalized.pem" tmp-tt.pem >/dev/null 2>&1 @@ -204,7 +204,7 @@ rm -f tmp-tt.pem datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-unique.tmpl" \ + --template "${srcdir}/templates/template-unique.tmpl" \ --outfile tmp-tt.pem 2>/dev/null ${DIFF} "${srcdir}/template-unique.pem" tmp-tt.pem >/dev/null 2>&1 diff --git a/tests/cert-tests/template-date.tmpl b/tests/cert-tests/templates/template-date.tmpl index a535d10821..a535d10821 100644 --- a/tests/cert-tests/template-date.tmpl +++ b/tests/cert-tests/templates/template-date.tmpl diff --git a/tests/cert-tests/template-dn-err.tmpl b/tests/cert-tests/templates/template-dn-err.tmpl index df864bb8de..df864bb8de 100644 --- a/tests/cert-tests/template-dn-err.tmpl +++ b/tests/cert-tests/templates/template-dn-err.tmpl diff --git a/tests/cert-tests/template-dn.tmpl b/tests/cert-tests/templates/template-dn.tmpl index a3172bb6b9..a3172bb6b9 100644 --- a/tests/cert-tests/template-dn.tmpl +++ b/tests/cert-tests/templates/template-dn.tmpl diff --git a/tests/cert-tests/template-generalized.tmpl b/tests/cert-tests/templates/template-generalized.tmpl index 2143c82242..2143c82242 100644 --- a/tests/cert-tests/template-generalized.tmpl +++ b/tests/cert-tests/templates/template-generalized.tmpl diff --git a/tests/cert-tests/template-krb5name.tmpl b/tests/cert-tests/templates/template-krb5name.tmpl index 8fe1e14598..8fe1e14598 100644 --- a/tests/cert-tests/template-krb5name.tmpl +++ b/tests/cert-tests/templates/template-krb5name.tmpl diff --git a/tests/cert-tests/template-nc.tmpl b/tests/cert-tests/templates/template-nc.tmpl index d6d624e6ac..d6d624e6ac 100644 --- a/tests/cert-tests/template-nc.tmpl +++ b/tests/cert-tests/templates/template-nc.tmpl diff --git a/tests/cert-tests/template-othername-xmpp.tmpl b/tests/cert-tests/templates/template-othername-xmpp.tmpl index 90c78c01c2..90c78c01c2 100644 --- a/tests/cert-tests/template-othername-xmpp.tmpl +++ b/tests/cert-tests/templates/template-othername-xmpp.tmpl diff --git a/tests/cert-tests/template-othername.tmpl b/tests/cert-tests/templates/template-othername.tmpl index 96b9b0c2c4..96b9b0c2c4 100644 --- a/tests/cert-tests/template-othername.tmpl +++ b/tests/cert-tests/templates/template-othername.tmpl diff --git a/tests/cert-tests/template-overflow.tmpl b/tests/cert-tests/templates/template-overflow.tmpl index ec88388624..ec88388624 100644 --- a/tests/cert-tests/template-overflow.tmpl +++ b/tests/cert-tests/templates/template-overflow.tmpl diff --git a/tests/cert-tests/template-overflow2.tmpl b/tests/cert-tests/templates/template-overflow2.tmpl index af245f4edc..af245f4edc 100644 --- a/tests/cert-tests/template-overflow2.tmpl +++ b/tests/cert-tests/templates/template-overflow2.tmpl diff --git a/tests/cert-tests/template-test.tmpl b/tests/cert-tests/templates/template-test.tmpl index 007adcfa53..007adcfa53 100644 --- a/tests/cert-tests/template-test.tmpl +++ b/tests/cert-tests/templates/template-test.tmpl diff --git a/tests/cert-tests/template-tlsfeature-crq.tmpl b/tests/cert-tests/templates/template-tlsfeature-crq.tmpl index 1a41d2dacf..1a41d2dacf 100644 --- a/tests/cert-tests/template-tlsfeature-crq.tmpl +++ b/tests/cert-tests/templates/template-tlsfeature-crq.tmpl diff --git a/tests/cert-tests/template-tlsfeature.tmpl b/tests/cert-tests/templates/template-tlsfeature.tmpl index 7a03b49afb..7a03b49afb 100644 --- a/tests/cert-tests/template-tlsfeature.tmpl +++ b/tests/cert-tests/templates/template-tlsfeature.tmpl diff --git a/tests/cert-tests/template-unique.tmpl b/tests/cert-tests/templates/template-unique.tmpl index 2fc7101f0c..2fc7101f0c 100644 --- a/tests/cert-tests/template-unique.tmpl +++ b/tests/cert-tests/templates/template-unique.tmpl diff --git a/tests/cert-tests/template-utf8.tmpl b/tests/cert-tests/templates/template-utf8.tmpl index 3a37da4311..3a37da4311 100644 --- a/tests/cert-tests/template-utf8.tmpl +++ b/tests/cert-tests/templates/template-utf8.tmpl diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test index eae8a3f91c..4df27ef0b9 100755 --- a/tests/cert-tests/tlsfeature-test +++ b/tests/cert-tests/tlsfeature-test @@ -41,7 +41,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-self-signed \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-tlsfeature.tmpl" \ + --template "${srcdir}/templates/template-tlsfeature.tmpl" \ --outfile "${TMPFILE}" 2>/dev/null rc=$? @@ -100,7 +100,7 @@ fi datefudge -s "2007-04-22" \ "${CERTTOOL}" --generate-request \ --load-privkey "${srcdir}/template-test.key" \ - --template "${srcdir}/template-tlsfeature.tmpl" \ + --template "${srcdir}/templates/template-tlsfeature.tmpl" \ --outfile "${TMPFILE}" -d 4 #2>/dev/null rc=$? if test "${rc}" != "0"; then @@ -163,7 +163,7 @@ datefudge -s "2007-04-22" \ --load-privkey "${srcdir}/template-test.key" \ --load-ca-privkey "${srcdir}/template-test.key" \ --load-ca-certificate "${srcdir}/template-tlsfeature.pem" \ - --template "${srcdir}/template-tlsfeature-crq.tmpl" \ + --template "${srcdir}/templates/template-tlsfeature-crq.tmpl" \ --load-request "${TMPFILE}" >"${TMPFILE2}" 2>&1 grep -A 2 "TLS Features" "${TMPFILE2}" >"${TMPFILE}" 2>/dev/null |