diff --git a/build-aux/knet_valgrind_memcheck.supp b/build-aux/knet_valgrind_memcheck.supp
index 4f424cd9..f0c7343a 100644
--- a/build-aux/knet_valgrind_memcheck.supp
+++ b/build-aux/knet_valgrind_memcheck.supp
@@ -1,526 +1,543 @@
 {
    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
 }
 {
    lzma internal stuff (Debian Unstable)
    Memcheck:Cond
    obj:/lib/x86_64-linux-gnu/liblzma.so.5.2.2
    obj:/lib/x86_64-linux-gnu/liblzma.so.5.2.2
    obj:/lib/x86_64-linux-gnu/liblzma.so.5.2.2
    obj:/lib/x86_64-linux-gnu/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 (Ubuntu 17.10 i386)
    Memcheck:Cond
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
    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 (Ubuntu 17.10 i386)
+   Memcheck:Cond
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   obj:/lib/i386-linux-gnu/liblzma.so.5.2.2
+   fun:lzma_stream_buffer_encode
+   fun:lzma_easy_buffer_encode
+   fun:lzma_compress
+   fun:compress
+   fun:_parse_recv_from_sock
+   fun:_handle_send_to_links
+   fun:_handle_send_to_links_thread
+}
 {
    nss internal stuff (FreeBSD 11.1)
    Memcheck:Addr8
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    fun:PR_LoadLibraryWithFlags
    obj:/usr/local/lib/nss/libnssutil3.so
    fun:PORT_LoadLibraryFromOrigin
    obj:/usr/local/lib/nss/libnss3.so
    fun:PR_CallOnce
    obj:/usr/local/lib/nss/libnss3.so
 }
 {
    nss internal stuff (FreeBSD 11.1)
    Memcheck:Addr8
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    fun:PR_LoadLibraryWithFlags
    obj:/usr/local/lib/nss/libnssutil3.so
    fun:PORT_LoadLibraryFromOrigin
    obj:/usr/local/lib/nss/libnss3.so
    fun:PR_CallOnce
    obj:/usr/local/lib/nss/libnss3.so
    fun:SECMOD_LoadModule
    obj:/usr/local/lib/nss/libnss3.so
 }
 {
    nss internal stuff (FreeBSD 11.1)
    Memcheck:Addr8
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/libexec/ld-elf.so.1
    obj:/usr/local/lib/libcrypto.so.10
    fun:DSO_load
    fun:DSO_dsobyaddr
    obj:/usr/local/lib/libcrypto.so.10
    fun:pthread_once
    fun:CRYPTO_THREAD_run_once
    fun:OPENSSL_init_crypto
    fun:opensslcrypto_load_lib
 }
diff --git a/libknet/tests/Makefile.am b/libknet/tests/Makefile.am
index 81fc86a3..a2a115d1 100644
--- a/libknet/tests/Makefile.am
+++ b/libknet/tests/Makefile.am
@@ -1,92 +1,92 @@
 #
 # Copyright (C) 2016-2017 Red Hat, Inc.  All rights reserved.
 #
 # Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
 #
 # This software licensed under GPL-2.0+, LGPL-2.0+
 #
 
 MAINTAINERCLEANFILES	= Makefile.in
 
 include $(top_srcdir)/build-aux/check.mk
 include $(top_srcdir)/libknet/tests/api-check.mk
 
 EXTRA_DIST		= \
 			  api-test-coverage \
 			  api-check.mk
 
 AM_CPPFLAGS		= -I$(top_srcdir)/libknet
 
 # override global LIBS that pulls in lots of craft we don't need here
 LIBS			= $(top_builddir)/libknet/libknet.la \
 			  $(dl_LIBS) $(pthread_LIBS)
 
 noinst_HEADERS		= \
 			  test-common.h
 
 # the order of those tests is NOT random.
 # some functions can only be tested properly after some dependents
 # API have been validated upfront.
 
 check_PROGRAMS		= \
 			  $(api_checks) \
 			  $(int_checks) \
 			  $(fun_checks)
 
 int_checks		= \
 			  int_crypto_test \
 			  int_timediff_test
 
 fun_checks		=
 
 benchmarks		= \
 			  crypto_bench_test \
 			  knet_bench_test
 
 noinst_PROGRAMS		= \
 			  api_knet_handle_new_limit_test \
 			  pckt_test \
 			  $(benchmarks) \
 			  $(check_PROGRAMS)
 
 noinst_SCRIPTS		= \
 			  api-test-coverage
 
 TESTS			= $(check_PROGRAMS)
 
 check-local: check-api-test-coverage
 
 check-api-test-coverage:
 	chmod u+x $(top_srcdir)/libknet/tests/api-test-coverage
 	$(top_srcdir)/libknet/tests/api-test-coverage $(top_srcdir) $(top_builddir)
 
 pckt_test_SOURCES	= pckt_test.c
 
 int_crypto_test_SOURCES = int_crypto.c \
 			  ../common.c \
 			  ../crypto.c \
 			  ../crypto_nss.c \
 			  ../crypto_openssl.c \
 			  ../logging.c \
 			  test-common.c
 
-int_crypto_test_CFLAGS	= $(nss_CFLAGS)
+int_crypto_test_CFLAGS	= $(nss_CFLAGS) $(openssl_CFLAGS)
 
 int_timediff_test_SOURCES = int_timediff.c
 
 crypto_bench_test_SOURCES = crypto_bench.c \
 			    ../common.c \
 			    ../crypto.c \
 			    ../crypto_nss.c \
 			    ../crypto_openssl.c \
 			    ../logging.c \
 			    test-common.c
 
-crypto_bench_test_CFLAGS  = $(nss_CFLAGS)
+crypto_bench_test_CFLAGS  = $(nss_CFLAGS) $(openssl_CFLAGS)
 
 knet_bench_test_SOURCES	= knet_bench.c \
 			  test-common.c \
 			  ../common.c \
 			  ../logging.c \
 			  ../compat.c \
 			  ../transport_common.c