summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-07-26 11:08:12 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-07-26 11:42:28 +0200
commit25134c7d9a70a715d00f60149b89f3d630890efb (patch)
tree7cd100bc136dfef0fc13c6a443a1c19fdff67b87
parentf587ad4f5b34f3fe50045e79c8f72ccb59e9ea82 (diff)
downloadgnutls-25134c7d9a70a715d00f60149b89f3d630890efb.tar.gz
tests: pkcs11-privkey-fork: added explicit pkcs11 deinitialization
Also ignore known leaks for p11-kit.
-rw-r--r--tests/pkcs11/pkcs11-privkey-fork.c4
-rw-r--r--tests/suppressions.valgrind13
2 files changed, 15 insertions, 2 deletions
diff --git a/tests/pkcs11/pkcs11-privkey-fork.c b/tests/pkcs11/pkcs11-privkey-fork.c
index d2039251d7..9d301d7d62 100644
--- a/tests/pkcs11/pkcs11-privkey-fork.c
+++ b/tests/pkcs11/pkcs11-privkey-fork.c
@@ -52,8 +52,6 @@
#endif
-static const gnutls_datum_t testdata = {(void*)"test test", 9};
-
static void tls_log_func(int level, const char *str)
{
fprintf(stderr, "|<%d>| %s", level, str);
@@ -145,6 +143,7 @@ void doit(void)
gnutls_free(sig.data);
gnutls_privkey_deinit(key);
+ gnutls_pkcs11_deinit();
gnutls_global_deinit();
exit(0);
}
@@ -153,6 +152,7 @@ void doit(void)
printf("done\n\n\n");
gnutls_privkey_deinit(key);
+ gnutls_pkcs11_deinit();
gnutls_global_deinit();
}
#else
diff --git a/tests/suppressions.valgrind b/tests/suppressions.valgrind
index 47e4cda8b4..f86faa75b7 100644
--- a/tests/suppressions.valgrind
+++ b/tests/suppressions.valgrind
@@ -212,6 +212,19 @@
}
{
+ ignore p11 leaks2
+ Memcheck:Leak
+ fun:malloc
+ obj:*
+ obj:*
+ obj:*
+ obj:*
+ obj:*
+ fun:p11_kit_module_initialize
+ fun:gnutls_pkcs11_add_provider
+}
+
+{
nettle memxor3
Memcheck:Addr8
fun:memxor3