tests: updated paths for new location of p12 files

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bcc312274275b62f2d38a9f74112025a3a509d33..c0dfa4e028bb1e034cffd06d7b0d95fb44739ebe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -266,12 +266,12 @@ TESTS_ENVIRONMENT =                                               \
        ASAN_OPTIONS=suppressions=gnutls-asan.supp              \
        CAFILE=$(srcdir)/cert-tests/data/ca-certs.pem           \
        P11MOCKLIB1=$(abs_builddir)/.libs/libpkcs11mock1.so     \
-       PKCS12_MANY_CERTS_FILE=$(srcdir)/pkcs12-decode/pkcs12_5certs.p12        \
-       PKCS12FILE=$(srcdir)/pkcs12-decode/client.p12           \
+       PKCS12_MANY_CERTS_FILE=$(srcdir)/cert-tests/data/pkcs12_5certs.p12      \
+       PKCS12FILE=$(srcdir)/cert-tests/data/client.p12         \
        PKCS12PASSWORD=foobar                                   \
-       PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12  \
+       PKCS12FILE_2=$(srcdir)/cert-tests/data/pkcs12_2certs.p12        \
        PKCS12PASSWORD_2=""                                     \
-       PKCS12PATH=$(srcdir)/pkcs12-decode/                     \
+       PKCS12PATH=$(srcdir)/cert-tests/data/                   \
        X509CERTDIR=$(srcdir)/x509cert-dir/                     \
        GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/system.prio       \
        PSK_FILE=$(srcdir)/psk.passwd                           \

diff --git a/tests/set_pkcs12_cred.c b/tests/set_pkcs12_cred.c
index 6dcd572de571a0b66189372a57b69892db885e15..8e45047467167fa7ec1b9fa5bdccef917b64dc6f 100644 (file)
--- a/tests/set_pkcs12_cred.c
+++ b/tests/set_pkcs12_cred.c
@@ -72,7 +72,7 @@ void doit(void)
 
                path = getenv("PKCS12PATH");
                if (!path)
-                       path = "pkcs12-decode/";
+                       path = "cert-tests/data/";
 
                snprintf(file, sizeof(file), "%s/%s", path, files[i].file);