diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-07-28 13:37:31 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-07-28 18:26:57 +0200 |
| commit | 97326e86769460faeb091ea35d5ad1f76c9df7f7 (patch) | |
| tree | 64a5be1722c3e8b293f817795f3e7f606bac601f | |
| parent | 8fb13655271cf34266d46d7196fc8feb1dec7ebe (diff) | |
| download | gnutls-97326e86769460faeb091ea35d5ad1f76c9df7f7.tar.gz | |
tests: updated paths for new location of p12 files
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/set_pkcs12_cred.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index bcc3122742..c0dfa4e028 100644 --- 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 6dcd572de5..8e45047467 100644 --- 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); |