diff --git a/build-aux/knet_valgrind_memcheck.supp b/build-aux/knet_valgrind_memcheck.supp
index becad828..208eb4d8 100644
--- a/build-aux/knet_valgrind_memcheck.supp
+++ b/build-aux/knet_valgrind_memcheck.supp
@@ -1,482 +1,516 @@
 {
-   Internal NSPR/NSS leaks
+   Internal NSPR/NSS leaks (libknet direct)
    Memcheck:Leak
    match-leak-kinds: definite
    fun:calloc
    obj:*
    obj:*
    obj:*
    obj:*
    obj:*
    fun:init_nss_db
    fun:nsscrypto_load_lib
    fun:crypto_check_init_lib
    fun:crypto_init
    fun:knet_handle_crypto
    fun:test
    fun:main
 }
 {
-   Internal NSPR/NSS leaks
+   Internal NSPR/NSS leaks (libknet direct)
    Memcheck:Leak
    match-leak-kinds: definite
    fun:malloc
    obj:*
    obj:*
    obj:*
    obj:*
    obj:*
    fun:init_nss_db
    fun:nsscrypto_load_lib
    fun:crypto_check_init_lib
    fun:crypto_init
    fun:knet_handle_crypto
    fun:test
    fun:main
 }
+{
+   Internal NSPR/NSS leaks (internal crypto test)
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:calloc
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:init_nss_db
+   fun:nsscrypto_load_lib
+   fun:crypto_check_init_lib
+   fun:crypto_init
+   fun:test
+   fun:main
+}
+{
+   Internal NSPR/NSS leaks (internal crypto test)
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:init_nss_db
+   fun:nsscrypto_load_lib
+   fun:crypto_check_init_lib
+   fun:crypto_init
+   fun:test
+   fun:main
+}
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_stream_header_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_crc32
    fun:lzma_stream_header_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_crc32
    fun:lzma_stream_header_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_block_header_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:is_overlap
    fun:memcpy@@GLIBC_2.14
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:memcpy@@GLIBC_2.14
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:memcpy@@GLIBC_2.14
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_vli_encode
    fun:lzma_filter_flags_encode
    fun:lzma_block_header_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_filter_flags_encode
    fun:lzma_block_header_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:memset
    fun:lzma_block_header_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:memset
    fun:lzma_block_header_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_block_unpadded_size
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_index_append
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_vli_size
    fun:lzma_index_append
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_vli_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_vli_encode
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_crc32
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_crc32
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_index_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_stream_footer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Value8
    fun:lzma_crc32
    fun:lzma_stream_footer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    fun:lzma_crc32
    fun:lzma_stream_footer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
    fun:clone
 }
 {
    lzma internal stuff
    Memcheck:Cond
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    obj:/usr/lib64/liblzma.so.5.2.2
    fun:lzma_block_buffer_encode
    fun:lzma_stream_buffer_encode
    fun:lzma_easy_buffer_encode
    fun:lzma_compress
    fun:_parse_recv_from_sock
    fun:_handle_send_to_links
    fun:_handle_send_to_links_thread
    fun:start_thread
 }