Release libstrophe-0.12.2

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
fix infitite looping in resolver
2022-08-08 11:48:47 +02:00 · 2022-08-05 14:54:50 +02:00 · 2022-08-05 13:59:17 +02:00 · 2022-08-05 12:36:31 +02:00 · 2022-08-05 12:36:22 +02:00 · 2022-08-04 11:54:36 +02:00
82 changed files with 7517 additions and 1999 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Unify coding style with clang-format
+562a06425b96450481cdbc88e8872a2bf5a7d8aa
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,49 @@
+<!--
+
+Provide a general summary of the issue in the Title above
+
+This is a very generic template, remove items that do not apply. For completed items, change [ ] to [x].
+
+-->
+
+### Prerequisites
+
+* [ ] Checked that your issue isn't already filed: https://github.com/strophe/libstrophe/issues?q=
+
+### Additional Information
+
+<!--- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
+
+## Expected Behavior
+
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+
+<!--- If describing a bug, tell us what happens instead of the expected behavior or even better, provide a functional code example reproducing your issue. -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+
+<!--- Please either describe your issue in detail or even better, provide a functional code example reproducing your issue. -->
+1.
+2.
+3.
+4.
+
+## Context
+
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+
+## Environment
+
+<!---
+Please provide the version of the library you're using.
+You can find the version either in the first line of the `configure.ac` file or if you're using the Git repository, please run `git describe --always --tags --dirty`.
+Also, please include the compiler, the compiler version, the architecture, the OS and what version of the OS you're experiencing the issue.
+ -->
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -0,0 +1,131 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  linux-tests:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        valgrind:
+           - { configure: ''                  , make: 'check' }
+           - { configure: '--enable-valgrind' , make: 'check-valgrind'  }
+        options:
+           - { configure: ''                    }
+           - { configure: '--without-libxml2'   }
+           - { configure: '--with-libxml2'      }
+           - { configure: '--with-gnutls'       }
+           - { configure: '--disable-tls'       }
+           - { configure: '--enable-cares'      }
+           - { configure: '--disable-getrandom' }
+    name: Regular Tests
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libtool pkg-config libexpat1-dev libxml2-dev libssl-dev libgnutls28-dev libc-ares-dev valgrind
+      - name: Build the library
+        run: |
+          ./bootstrap.sh
+          ./configure ${{ matrix.options.configure }} ${{ matrix.valgrind.configure }} CFLAGS="-Werror -g3"
+          make -j$(nproc)
+      - name: Run tests
+        run: |
+          make -j$(nproc) ${{ matrix.valgrind.make }}
+      - name: Error logs
+        if: ${{ failure() }}
+        run: |
+          cat test-suite*.log || true
+
+  xssl-tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        xssl_versions:
+           - { version: "master",        continue: true,  libressl: true }
+           - { version: "OPENBSD_7_1",   continue: true,  libressl: true }
+           # https://github.com/libressl-portable/portable/issues/760
+           # - { version: "v3.5.2",        continue: true,  libressl: true }
+           - { version: "OPENBSD_7_0",   continue: true,  libressl: true }
+           # OPENBSD_7_0 is basically the "fixed v3.4.3"
+           # - { version: "v3.4.3",        continue: true,  libressl: true }
+           - { version: "v3.4.2",        continue: true,  libressl: true }
+           - { version: "OPENBSD_6_9",   continue: true,  libressl: true }
+           - { version: "v3.1.5",        continue: true,  libressl: true }
+           - { version: "v2.1.10",       continue: true,  libressl: true }
+           - { version: "openssl-3.0",   continue: true,  libressl: false }
+           - { version: "openssl-3.0.4", continue: false, libressl: false }
+        valgrind:
+           - { configure: ''                    , make: 'check'          }
+           - { configure: '--enable-valgrind'   , make: 'check-valgrind' }
+    name: xSSL tests
+    continue-on-error: ${{ matrix.xssl_versions.continue }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libtool pkg-config libexpat1-dev valgrind
+      - name: build&install the TLS stack
+        env:
+           XSSL_COMMITISH: ${{ matrix.xssl_versions.version }}
+           LIBRESSL: ${{ matrix.xssl_versions.libressl }}
+        run: |
+          ./travis/before_script.sh
+      - name: Build the library
+        run: |
+          ./bootstrap.sh
+          ./configure ${{ matrix.valgrind.configure }} PKG_CONFIG_PATH="${HOME}/xssl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/xssl"
+          make -j$(nproc)
+      - name: Run tests
+        run: |
+          make -j$(nproc) ${{ matrix.valgrind.make }}
+      - name: Error logs
+        if: ${{ failure() }}
+        run: |
+          cat test-suite*.log || true
+
+  release-test:
+    runs-on: ubuntu-20.04
+    name: Check if release would work
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libtool pkg-config libexpat1-dev
+      - name: Setup the library
+        run: |
+          ./bootstrap.sh
+          ./configure
+      - name: Try release & tests
+        run: |
+          make test-release
+      - name: Show logs from release build
+        if: ${{ !failure() }}
+        run: |
+          cat testbuild.log
+
+  code-style:
+    runs-on: ubuntu-20.04
+    name: Check coding style
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libtool pkg-config libexpat1-dev libxml2-dev libssl-dev libgnutls28-dev libc-ares-dev dos2unix
+      - name: Configure
+        run: |
+          ./bootstrap.sh
+          ./configure
+      - name: Check style
+        run: |
+          make format
+          git diff --exit-code
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ autom4te.cache
 .dirstamp
 .deps
 .sconsign*
+src/*.gcda
+src/*.gcno
 src/*.o
 src/*.lo
 examples/*.o
@@ -27,6 +29,8 @@ examples/*.o
 *.la
 *.pc
 *.tar.gz
+*.tar.bz2
+*.tar.xz
 *.zip
 docs/html
 TAGS
@@ -34,19 +38,25 @@ tags
 examples/active
 examples/basic
 examples/bot
+examples/complex
 examples/component
+examples/perf
 examples/register
 examples/roster
 examples/uuid
 examples/vcard
+testbuild*.log
+test-release/
 test_stamp
-test-suite.log
+test-suite*.log
 tests/*.o
 tests/*.log
 tests/*.trs
 tests/check_parser
 tests/test_base64
 tests/test_ctx
+tests/test_fuzz_parser
+tests/test_fuzz_resolver
 tests/test_hash
 tests/test_jid
 tests/test_md5
@@ -54,6 +64,7 @@ tests/test_rand
 tests/test_resolver
 tests/test_sasl
 tests/test_scram
+tests/test_send_queue
 tests/test_sha1
 tests/test_sha256
 tests/test_sha512
@@ -61,7 +72,9 @@ tests/test_snprintf
 tests/test_sock
 tests/test_stanza
 tests/test_string
-m4/
+tests/test_xmppaddr
+m4/lt*
+m4/libtool*
 libstrophe.project
 libs/
 obj/
@@ -69,3 +82,7 @@ expat/
 .settings/
 .project
 .cproject
+coverage/
+coverage.info
+configure~
+fuzz-*.log
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +0,0 @@
-language: c
-install:
-  - sudo apt-get update
-  - sudo apt-get -y install libtool pkg-config libexpat1-dev libxml2-dev libssl-dev libc-ares-dev dos2unix
-stages:
-  - style
-  - test
-before_script:
-  - ./bootstrap.sh
-env:
-  - CONFIGURE_OPT="--without-libxml2"
-  - CONFIGURE_OPT="--with-libxml2"
-  - CONFIGURE_OPT="--disable-tls"
-  - CONFIGURE_OPT="--enable-cares"
-script: ./configure ${CONFIGURE_OPT} CFLAGS="-Werror" && make && make check
-jobs:
-  include:
-    - stage: style
-      name: "Check code style"
-      script: ./configure && make format && git diff --exit-code
-      env:
-        - CONFIGURE_OPT=""
-matrix:
-    fast_finish: true
--- a/92
+++ b/92
@@ -1,3 +1,95 @@
+0.12.2
+	- Fix reconnect issues when Stream Management is enabled (#211)
+	- Fix resolver ... this time for real hopefully (fixup of #200) (#214)
+	- Fix clearing of password cache on resumed connection (#214)
+	- Improve detection&implementation of `va_copy` (#213)
+	- Fix Valgrind CI builds against LibreSSL (#212)
+	- Fix perf example on platforms where an `rdtsc()` equivalent isn't implemented (#212)
+
+0.12.1
+	- Fix compilation in buildroot (#207)
+	- Fixes regarding OpenSSL (#208)
+	- Fix some build steps when builddir != srcdir (#208)
+	- Allow the user to disable build of examples (#209)
+	- CI builds against OpenSSL 3 (#206)
+	- Change the call signature of the following API:
+		- xmpp_conn_set_client_cert() - the PKCS#12 file has now to be passed via the `cert`
+				parameter. Originally it was via `key`. Currently both styles are supported,
+				but in a future release only passing via `cert` will be accepted.
+
+0.12.0
+	- Fix potential infinite loop in resolver (#200)
+	- Prevent potential memory leak in `xmpp_stanza_new_from_string()` (#205)
+	- Do proper SO versioning
+	- Add code coverage support (#188)
+	- Add support for password-protected TLS key & PKCS#12/PFX files (#195, #205)
+	- Stream-Management support - XEP-0198 (#184)
+	- New API:
+		- xmpp_conn_send_queue_len()
+		- xmpp_conn_send_queue_drop_element()
+		- xmpp_conn_get_sm_state()
+		- xmpp_conn_set_sm_state()
+		- xmpp_free_sm_state()
+		- xmpp_conn_get_keyfile()
+		- xmpp_conn_set_password_callback()
+		- xmpp_conn_set_password_retries()
+		- xmpp_stanza_get_child_by_path()
+		- xmpp_conn_set_sockopt_callback()
+		- xmpp_sockopt_cb_keepalive()
+	- The following APIs were public in the shared library, but not in `strophe.h`.
+	  Now they are officially public API:
+		- xmpp_rand_new()
+		- xmpp_rand_free()
+		- xmpp_rand()
+		- xmpp_rand_bytes()
+		- xmpp_rand_nonce()
+		- xmpp_rand_bytes()
+	- The following APIs were public in the shared library, but not in `strophe.h`.
+	  In a future version of the library they will be private without replacement:
+		- xmpp_alloc()
+		- xmpp_realloc()
+		- xmpp_strdup()
+		- xmpp_strndup()
+		- xmpp_strtok_r()
+		- xmpp_snprintf()
+		- xmpp_vsnprintf()
+		- xmpp_log()
+		- xmpp_error()
+		- xmpp_warn()
+		- xmpp_info()
+		- xmpp_debug()
+		- xmpp_debug_verbose()
+	- Deprecated the following API:
+		- xmpp_conn_set_keepalive() - replaced by xmpp_conn_set_sockopt_callback()
+
+0.11.0
+	- SASL EXTERNAL support (XEP-0178)
+	- Client certificate can be provided for TLS negotiation. If the
+	  certificate contains a single xmppAddr and JID is not provided with
+	  xmpp_conn_set_jid(), the xmppAddr is chosen as JID
+	- <stream> element contains "from" attribute over TLS connections now
+	- GnuTLS can be selected optionally with configure script
+	- Support for manual certificate verification
+	- New API:
+		- xmpp_conn_set_client_cert()
+		- xmpp_conn_cert_xmppaddr_num()
+		- xmpp_conn_cert_xmppaddr()
+		- xmpp_conn_set_cafile()
+		- xmpp_conn_set_capath()
+		- xmpp_conn_set_certfail_handler()
+		- xmpp_conn_get_peer_cert()
+		- xmpp_tlscert_get_ctx()
+		- xmpp_tlscert_get_conn()
+		- xmpp_tlscert_get_pem()
+		- xmpp_tlscert_get_dnsname()
+		- xmpp_tlscert_get_string()
+		- xmpp_tlscert_get_description()
+		- xmpp_tlscert_free()
+
+0.10.1
+	- Fixed compilation error when LibreSSL is used
+	- Fixed crash when NULL is provided as password
+
 0.10.0
 	- Coding style has been unified
 	- SCRAM-SHA-256 and SCRAM-SHA-512 support
--- a/933
+++ b/933
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,32 +2,47 @@ AUTOMAKE_OPTIONS = subdir-objects

 ACLOCAL_AMFLAGS = -I m4

+COVERAGE_CFLAGS=@COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS=@COVERAGE_LDFLAGS@
+COVERAGE_PRE=@COVERAGE_PRE@
+COVERAGE_POST=@COVERAGE_POST@
+
 PARSER_CFLAGS=@PARSER_CFLAGS@
 PARSER_LIBS=@PARSER_LIBS@

+if TLS_WITH_GNUTLS
+SSL_CFLAGS = @gnutls_CFLAGS@
+SSL_LIBS = @gnutls_LIBS@
+else
+if !TLS_WITH_SCHANNEL
 SSL_CFLAGS = @openssl_CFLAGS@
 SSL_LIBS = @openssl_LIBS@
+endif
+endif
+
+MINGW_LIBS = @MINGW_LIBS@

 RESOLV_CFLAGS = @RESOLV_CFLAGS@
 RESOLV_LIBS = @RESOLV_LIBS@

 WARNING_FLAGS = @WARNING_FLAGS@
 STROPHE_FLAGS = -I$(top_srcdir) $(WARNING_FLAGS)
-STROPHE_LIBS = libstrophe.la
+STROPHE_LIBS = $(COVERAGE_PRE) libstrophe.la $(COVERAGE_POST) $(COVERAGE_LDFLAGS)

 ## Main build targets
 lib_LTLIBRARIES = libstrophe.la

-libstrophe_la_CFLAGS = $(SSL_CFLAGS) $(STROPHE_FLAGS) $(PARSER_CFLAGS) $(RESOLV_CFLAGS)
-libstrophe_la_LDFLAGS = $(SSL_LIBS) $(PARSER_LIBS) $(RESOLV_LIBS) -no-undefined
+libstrophe_la_CFLAGS = $(SSL_CFLAGS) $(STROPHE_FLAGS) $(PARSER_CFLAGS) $(RESOLV_CFLAGS) $(COVERAGE_CFLAGS)
+libstrophe_la_LDFLAGS = $(SSL_LIBS) $(PARSER_LIBS) $(RESOLV_LIBS) $(MINGW_LIBS) -no-undefined
 # Export only public API
-libstrophe_la_LDFLAGS += -export-symbols-regex '^xmpp_'
+libstrophe_la_LDFLAGS += -export-symbols-regex '^xmpp_' -version-info @VERSION_INFO@

 libstrophe_la_SOURCES = \
 	src/auth.c \
 	src/conn.c \
 	src/crypto.c \
 	src/ctx.c \
+	src/deprecated.c \
 	src/event.c \
 	src/handler.c \
 	src/hash.c \
@@ -40,9 +55,9 @@ libstrophe_la_SOURCES = \
 	src/sha1.c \
 	src/sha256.c \
 	src/sha512.c \
-	src/snprintf.c \
 	src/sock.c \
 	src/stanza.c \
+	src/tls.c \
 	src/util.c \
 	src/uuid.c
 libstrophe_la_SOURCES += \
@@ -51,7 +66,6 @@ libstrophe_la_SOURCES += \
 	src/md5.h \
 	src/ostypes.h \
 	src/parser.h \
-	src/rand.h \
 	src/resolver.h \
 	src/sasl.h \
 	src/scram.h \
@@ -64,11 +78,23 @@ libstrophe_la_SOURCES += \
 	src/tls.h \
 	src/util.h

+if NEED_SNPRINTF
+libstrophe_la_SOURCES += src/snprintf.c
+endif
+
 if DISABLE_TLS
 libstrophe_la_SOURCES += src/tls_dummy.c
 else
+if TLS_WITH_GNUTLS
+libstrophe_la_SOURCES += src/tls_gnutls.c
+else
+if TLS_WITH_SCHANNEL
+libstrophe_la_SOURCES += src/tls_schannel.c
+else
 libstrophe_la_SOURCES += src/tls_openssl.c
 endif
+endif
+endif

 if PARSER_EXPAT
 libstrophe_la_SOURCES += src/parser_expat.c
@@ -88,24 +114,32 @@ EXTRA_DIST = \
 	MIT-LICENSE.txt \
 	bootstrap.sh \
 	build-android.sh \
-	docs/footer.html \
+	testbuild.sh \
 	examples/README.md \
 	jni/Android.mk \
 	jni/Application.mk \
-	src/tls_gnutls.c \
-	src/tls_schannel.c \
+	m4/ax_valgrind_check.m4 \
+	tests/cert.pem \
+	tests/cert.pfx \
+	tests/cert.emptypass.pfx \
+	tests/cert.nopass.pfx \
+	tests/key.pem \
+	tests/key_encrypted.pem \
 	tests/res_query_dump.c

+if EXAMPLES
 ## Examples
 noinst_PROGRAMS = \
 	examples/active \
 	examples/basic \
 	examples/bot \
+	examples/complex \
 	examples/component \
+	examples/perf \
+	examples/register \
 	examples/roster \
 	examples/uuid \
-	examples/vcard \
-	examples/register
+	examples/vcard

 examples_active_SOURCES = examples/active.c
 examples_active_CFLAGS = $(STROPHE_FLAGS)
@@ -116,9 +150,18 @@ examples_basic_LDADD = $(STROPHE_LIBS)
 examples_bot_SOURCES = examples/bot.c
 examples_bot_CFLAGS = $(STROPHE_FLAGS)
 examples_bot_LDADD = $(STROPHE_LIBS)
+examples_complex_SOURCES = examples/complex.c
+examples_complex_CFLAGS = $(STROPHE_FLAGS)
+examples_complex_LDADD = $(STROPHE_LIBS)
 examples_component_SOURCES = examples/component.c
 examples_component_CFLAGS = $(STROPHE_FLAGS)
 examples_component_LDADD = $(STROPHE_LIBS)
+examples_perf_SOURCES = examples/perf.c
+examples_perf_CFLAGS = $(STROPHE_FLAGS)
+examples_perf_LDADD = $(STROPHE_LIBS)
+examples_register_SOURCES = examples/register.c
+examples_register_CFLAGS = $(STROPHE_FLAGS)
+examples_register_LDADD = $(STROPHE_LIBS)
 examples_roster_SOURCES = examples/roster.c
 examples_roster_CFLAGS = $(STROPHE_FLAGS)
 examples_roster_LDADD = $(STROPHE_LIBS)
@@ -128,9 +171,7 @@ examples_uuid_LDADD = $(STROPHE_LIBS)
 examples_vcard_SOURCES = examples/vcard.c
 examples_vcard_CFLAGS = $(STROPHE_FLAGS)
 examples_vcard_LDADD = $(STROPHE_LIBS)
-examples_register_SOURCES = examples/register.c
-examples_register_CFLAGS = $(STROPHE_FLAGS)
-examples_register_LDADD = $(STROPHE_LIBS)
+endif


 ## Tests
@@ -146,13 +187,34 @@ TESTS = \
 	tests/test_base64 \
 	tests/test_hash \
 	tests/test_jid \
+	tests/test_send_queue \
 	tests/test_snprintf \
 	tests/test_string \
 	tests/test_stanza \
 	tests/test_resolver

+if !DISABLE_TLS
+TESTS += tests/test_xmppaddr
+endif
+
 check_PROGRAMS = $(TESTS)

+if FUZZ
+check_PROGRAMS += tests/test_fuzz_parser tests/test_fuzz_resolver
+
+tests_test_fuzz_parser_SOURCES = tests/test_fuzz_parser.c
+tests_test_fuzz_parser_CFLAGS = -fsanitize=fuzzer,address  $(PARSER_CFLAGS) $(STROPHE_FLAGS) \
+	-I$(top_srcdir)/src
+tests_test_fuzz_parser_LDADD = $(STROPHE_LIBS)
+tests_test_fuzz_parser_LDFLAGS = -static
+
+tests_test_fuzz_resolver_SOURCES = tests/test_fuzz_resolver.c
+tests_test_fuzz_resolver_CFLAGS = -fsanitize=fuzzer,address  $(resolver_CFLAGS) $(STROPHE_FLAGS) \
+	-I$(top_srcdir)/src
+tests_test_fuzz_resolver_LDADD = $(STROPHE_LIBS)
+tests_test_fuzz_resolver_LDFLAGS = -static
+endif
+
 tests_check_parser_SOURCES = tests/check_parser.c tests/test.h
 tests_check_parser_CFLAGS = $(PARSER_CFLAGS) $(STROPHE_FLAGS) \
 	-I$(top_srcdir)/src
@@ -203,6 +265,11 @@ tests_test_sha512_CFLAGS = -I$(top_srcdir)/src
 tests_test_md5_SOURCES = tests/test_md5.c tests/test.c src/md5.c
 tests_test_md5_CFLAGS = -I$(top_srcdir)/src

+tests_test_send_queue_SOURCES = tests/test_send_queue.c
+tests_test_send_queue_CFLAGS = -I$(top_srcdir)/src
+tests_test_send_queue_LDADD = $(STROPHE_LIBS)
+tests_test_send_queue_LDFLAGS = -static
+
 tests_test_snprintf_SOURCES = tests/test_snprintf.c
 tests_test_snprintf_CFLAGS = -I$(top_srcdir)/src

@@ -211,12 +278,55 @@ tests_test_string_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
 tests_test_string_LDADD = $(STROPHE_LIBS)
 tests_test_string_LDFLAGS = -static

-tests_test_stanza_SOURCES = tests/test_stanza.c
-tests_test_stanza_CFLAGS = $(STROPHE_FLAGS)
+tests_test_stanza_SOURCES = tests/test_stanza.c tests/test.h
+tests_test_stanza_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
 tests_test_stanza_LDADD = $(STROPHE_LIBS)
 tests_test_stanza_LDFLAGS = -static

+tests_test_xmppaddr_SOURCES = tests/test_xmppaddr.c
+tests_test_xmppaddr_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
+tests_test_xmppaddr_LDADD = $(STROPHE_LIBS)
+tests_test_xmppaddr_LDFLAGS = -static
+
 format:
 	@echo "   * run clang-format on all sources"
-	@dos2unix -q src/*.[ch] *.h tests/*.[ch] examples/*.c
-	@clang-format -i src/*.[ch] *.h tests/*.[ch] examples/*.c
+	@dos2unix -k -q $(top_srcdir)/src/*.[ch] $(top_srcdir)/*.h $(top_srcdir)/tests/*.[ch] $(top_srcdir)/examples/*.c
+	@clang-format -i $(top_srcdir)/src/*.[ch] $(top_srcdir)/*.h $(top_srcdir)/tests/*.[ch] $(top_srcdir)/examples/*.c
+
+if COVERAGE
+MOSTLYCLEANFILES = src/*.gcno src/*.gcda coverage.info
+clean-local:
+	-rm -rf coverage/
+
+coverage: check
+	@lcov --capture --no-external --directory src -q --output-file coverage.info
+	@genhtml coverage.info --output-directory coverage -q
+endif
+
+release: test-release-all
+
+dist-archives:
+	$(MAKE) dist
+	$(MAKE) dist-bzip2
+	$(MAKE) dist-xz
+
+test-release: dist
+	@touch testbuild-$(PACKAGE_VERSION).log && ln -sf testbuild-$(PACKAGE_VERSION).log testbuild.log
+	@mkdir -p test-release && cp $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.* test-release && pushd test-release && \
+		tar xzf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz  && pushd $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && ./testbuild.sh && popd && rm -rf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && \
+		echo "Success" && popd
+
+test-release-all: dist-archives
+	@touch testbuild-$(PACKAGE_VERSION).log && ln -sf testbuild-$(PACKAGE_VERSION).log testbuild.log
+	@mkdir -p test-release && cp $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.* test-release && pushd test-release && \
+		tar xJf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.xz  && pushd $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && ./testbuild.sh && popd && rm -rf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && \
+		tar xjf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 && pushd $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && ./testbuild.sh && popd && rm -rf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && \
+		tar xzf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz  && pushd $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && ./testbuild.sh && popd && rm -rf $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && \
+		echo "Success" && popd
+
+docs:
+	@SRCDIR=$(top_srcdir) doxygen -q $(top_srcdir)/Doxyfile
+
+@VALGRIND_CHECK_RULES@
+
+.PHONY: docs test-release
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,4 @@
-libstrophe [![Build Status](https://travis-ci.org/strophe/libstrophe.png?branch=master)](https://travis-ci.org/strophe/libstrophe)
+libstrophe [![Build Status](https://github.com/strophe/libstrophe/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/strophe/libstrophe/actions/workflows/main.yml?query=branch%3Amaster+++)
 ==========

 libstrophe is a lightweight XMPP client library written in C. It has
@@ -42,17 +42,30 @@ another path use the `--prefix` option during configure, e.g.:
 Run script `build-android.sh` and follow the instructions. You will
 need expat sources and android-ndk.

+### Code Coverage
+
+If you want to create a code coverage report, run:
+
+    ./configure --enable-coverage
+    make coverage
+
+The coverage report can be found in `./coverage/index.html`.
+
+
 Requirements
 ------------

 libstrophe requires:

- expat or libxml2 - expat is the default; use --with-libxml2 to
+- expat or libxml2 - expat is the default; use `--with-libxml2` to
  switch
- openssl on UNIX systems
+- openssl or GnuTLS on UNIX systems - openssl is default; use
+  `--with-gnutls` to switch

-To build libstrophe using autotools you will need autoconf, automake,
-libtool and pkg-config.
+To build libstrophe using autotools you will need `autoconf`,
+`automake`, `libtool` and `pkg-config`.
+
+To run code coverage analysis you will need `gcov` and `lcov`.

 Installation
 ------------
@@ -69,4 +82,17 @@ by running:

    doxygen

+or if you have everything configured properly:
+
+    make docs
+
 Then open `docs/html/index.html`.
+
+An online version of the documentation of the latest release is available on http://strophe.im/libstrophe/
+
+Releases
+--------
+
+Releases are signed with the GPG key with ID `F8ADC1F9A68A7AFF0E2C89E4391A5EFC2D1709DE`.
+
+It can be found e.g. on https://keys.openpgp.org/
--- a/1
+++ b/1
@@ -8,6 +8,7 @@ BinPackParameters: 'false'
 BreakBeforeBraces: Linux
 ColumnLimit: '80'
 DerivePointerAlignment: 'false'
+IndentGotoLabels: false
 IndentWidth: '4'
 PointerAlignment: Right
 SortIncludes: 'false'
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,13 @@
-AC_INIT([libstrophe], [0.10.0], [jack@metajack.im])
+m4_define([v_maj], [0])
+m4_define([v_min], [12])
+m4_define([v_patch], [2])
+m4_define([project_version], [v_maj.v_min.v_patch])
+
+m4_define([lt_cur], m4_eval(v_maj + v_min))
+m4_define([lt_rev], v_patch)
+m4_define([lt_age], v_min)
+
+AC_INIT([libstrophe], [project_version], [jack@metajack.im])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])
@@ -16,6 +25,8 @@ AS_CASE([$host_os],
    [*solaris*],   [PLATFORM="solaris"],
    [*android*],   [PLATFORM="android"],
    [*haiku*],     [PLATFORM="haiku"],
+    [*mingw*],     [PLATFORM="win32"
+                    MINGW_LIBS="-lws2_32"],
                   [PLATFORM="nix"])

 WARNING_FLAGS="-Wall"
@@ -24,18 +35,109 @@ AS_CASE([$PLATFORM],
    [haiku],   [],
               [WARNING_FLAGS="$WARNING_FLAGS -Wextra"])

+AC_ARG_ENABLE([examples],
+    [AS_HELP_STRING([--disable-examples], [turn off examples])],
+    [case "${enableval}" in yes) examples=true ;; no)  examples=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --disable-examples]) ;; esac],[examples=true])
+AM_CONDITIONAL([EXAMPLES], [test x$examples = xtrue])
 AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing, expat is the default])])
+AC_ARG_WITH([gnutls],
+    [AS_HELP_STRING([--with-gnutls], [use GnuTLS for TLS support, OpenSSL is the default])])
+AC_ARG_WITH([schannel],
+    [AS_HELP_STRING([--with-schannel], [use Windows Schannel for TLS support, OpenSSL is the default])])
 AC_ARG_ENABLE([tls],
    [AS_HELP_STRING([--disable-tls], [disable TLS support])])
 AC_ARG_ENABLE([cares],
    [AS_HELP_STRING([--enable-cares], [use c-ares for DNS resolution])])
+AC_ARG_ENABLE([getrandom],
+    [AS_HELP_STRING([--disable-getrandom], [disable usage of the getrandom() system call])])

+AC_ARG_ENABLE([fuzzing],
+    [AS_HELP_STRING([--enable-fuzzing], [turn on fuzzing test])],
+    [case "${enableval}" in yes) fuzzing=true ;; no)  fuzzing=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-fuzzing]) ;; esac],[fuzzing=false])
+AM_CONDITIONAL([FUZZ], [test x$fuzzing = xtrue])
+
+if test "x$enable_fuzzing" = "xyes" ; then
+    if test "x$CC" != "xclang" ; then
+        AC_MSG_ERROR(["You need to set CC=clang to use --enable-fuzzing, used $CC"])
+    fi
+fi
+
+AC_ARG_ENABLE([coverage],
+    [AS_HELP_STRING([--enable-coverage], [turn on coverage for tests])],
+    [case "${enableval}" in yes) coverage=true ;; no)  coverage=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-coverage]) ;; esac],[coverage=false])
+AM_CONDITIONAL([COVERAGE], [test x$coverage = xtrue])
+
+if test "$enable_coverage" = "yes"; then
+    COVERAGE_CFLAGS="--coverage -g"
+    COVERAGE_LDFLAGS="--coverage -lgcov"
+    COVERAGE_PRE="-Wl,--whole-archive"
+    COVERAGE_POST="-Wl,--no-whole-archive"
+else
+    COVERAGE_CFLAGS=""
+    COVERAGE_LDFLAGS=""
+    COVERAGE_PRE=""
+    COVERAGE_POST=""
+fi
+
+m4_include([m4/ax_valgrind_check.m4])
+AX_VALGRIND_DFLT([drd], [off])
+AX_VALGRIND_DFLT([helgrind], [off])
+AX_VALGRIND_DFLT([sgcheck], [off])
+AX_VALGRIND_CHECK
+
+AC_SEARCH_LIBS([clock_gettime], [rt], AC_DEFINE(HAVE_CLOCK_GETTIME,1))
 AC_SEARCH_LIBS([socket], [network socket])
-AC_CHECK_FUNCS([snprintf vsnprintf])
-AC_CHECK_DECLS([va_copy], [], [], [#include <stdarg.h>])
+AC_CHECK_FUNCS([snprintf vsnprintf], [], [have_snprintf=no])

-if test "x$enable_tls" != xno; then
+dnl Checking for va_copy availability
+AC_MSG_CHECKING([for va_copy])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+va_list ap1,ap2;]], [[va_copy(ap1,ap2);]])],
+have_va_copy=yes,
+have_va_copy=no)
+AC_MSG_RESULT($have_va_copy)
+if test x"$have_va_copy" = x"yes"; then
+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
+else
+    AC_MSG_CHECKING([for __va_copy])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+    va_list ap1,ap2;]], [[__va_copy(ap1,ap2);]])],
+    have___va_copy=yes,
+    have___va_copy=no)
+    AC_MSG_RESULT($have___va_copy)
+    if test x"$have___va_copy" = x"yes"; then
+        AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
+    fi
+fi
+
+if test x"$have_va_copy$have___va_copy" = x"nono"; then
+    dnl Checking whether va_list is an array type
+    AC_MSG_CHECKING([whether va_list is an array type])
+    AC_TRY_COMPILE2([
+    #include <stdarg.h>
+    void a(va_list * ap) {}],[
+    va_list ap1, ap2; a(&ap1); ap2 = (va_list) ap1],[
+      AC_MSG_RESULT(no)],[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE([VA_LIST_IS_ARRAY], [1],[Define if va_list is an array type])])
+fi
+
+if test "x$enable_tls" != xno -a "x$with_gnutls" == xyes; then
+    PKG_CHECK_MODULES([gnutls], [gnutls],
+        [PC_REQUIRES="gnutls ${PC_REQUIRES}"],
+        [AC_CHECK_HEADER([gnutls/gnutls.h],
+            [
+                gnutls_LIBS="-lgnutls"
+                PC_LIBS="${gnutls_LIBS} ${PC_LIBS}"
+            ],
+            [AC_MSG_ERROR([gnutls not found; gnutls required])]
+        )])
+elif test "x$enable_tls" != xno -a "x$with_schannel" == xyes; then
+    if test "x$PLATFORM" != xwin32; then
+        AC_MSG_ERROR([schannel is only supported on Windows])
+    fi
+elif test "x$enable_tls" != xno; then
    PKG_CHECK_MODULES([openssl], [openssl],
        [PC_REQUIRES="openssl ${PC_REQUIRES}"],
        [AC_CHECK_HEADER([openssl/ssl.h],
@@ -47,6 +149,12 @@ if test "x$enable_tls" != xno; then
        )])
 fi

+AC_CHECK_FUNCS([getrandom], [], [enable_getrandom=no])
+if test "$enable_getrandom" = "no"; then
+    AC_DEFINE(DONT_USE_GETRANDOM)
+    AC_MSG_NOTICE([libstrophe will not use the getrandom() system call])
+fi
+
 with_parser=""
 if test "x$with_libxml2" != xyes; then
    PKG_CHECK_MODULES([expat], [expat >= 2.0.0],
@@ -113,8 +221,10 @@ AS_CASE([$PLATFORM],
    [solaris], [RESOLV_LIBS="-lresolv -lsocket -lnsl"],
    [android], [RESOLV_LIBS=""],
    [haiku],   [RESOLV_LIBS="-lnetwork"],
+    [win32],   [RESOLV_LIBS=""],
               [RESOLV_LIBS="-lresolv"])

+if test "x$PLATFORM" != xwin32; then
 LIBS_TMP="${LIBS}"
 LIBS="${RESOLV_LIBS}"
 AC_LINK_IFELSE([AC_LANG_SOURCE([
@@ -133,6 +243,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
    [AC_MSG_ERROR([res_query() not found with LIBS="${LIBS}"])])
 LIBS="${LIBS_TMP}"
 PC_LIBS="${RESOLV_LIBS} ${PC_LIBS}"
+fi

 fi

@@ -145,11 +256,34 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],

 AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
 AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno])
+AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno])
+AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes])
+AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes])
+
+# define while compiling
+AC_DEFINE_UNQUOTED(LIBXMPP_VERSION_MAJOR, [v_maj], [Major version])
+AC_DEFINE_UNQUOTED(LIBXMPP_VERSION_MINOR, [v_min], [Minor version])
+
+VMAJ=v_maj
+VMIN=v_min
+AC_SUBST(VMAJ)
+AC_SUBST(VMIN)
+# define in package-config file
+PC_CFLAGS="${PC_CFLAGS} -DLIBXMPP_VERSION_MAJOR=${VMAJ} -DLIBXMPP_VERSION_MINOR=${VMIN}"
+
+# set the SO version of the installed library
+VERSION_INFO="lt_cur:lt_rev:lt_age"
+AC_SUBST([VERSION_INFO])

 AC_SUBST([PC_REQUIRES], [${PC_REQUIRES}])
 AC_SUBST([PC_CFLAGS], [${PC_CFLAGS}])
 AC_SUBST([PC_LIBS], [${PC_LIBS}])

+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+AC_SUBST(COVERAGE_PRE)
+AC_SUBST(COVERAGE_POST)
+AC_SUBST(MINGW_LIBS)
 AC_SUBST(PARSER_CFLAGS)
 AC_SUBST(PARSER_LIBS)
 AC_SUBST(RESOLV_CFLAGS)
--- a/docs/.keep
+++ b/docs/.keep
--- a/docs/footer.html
+++ b/docs/footer.html
@@ -1,2 +0,0 @@
-</body>
-</html>
--- a/examples/active.c
+++ b/examples/active.c
@@ -19,9 +19,7 @@

 #include <strophe.h>

-int handle_reply(xmpp_conn_t *const conn,
-                 xmpp_stanza_t *const stanza,
-                 void *const userdata)
+int handle_reply(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_stanza_t *query, *item;
    const char *type;
@@ -46,11 +44,11 @@ int handle_reply(xmpp_conn_t *const conn,
    return 0;
 }

-void conn_handler(xmpp_conn_t *const conn,
-                  const xmpp_conn_event_t status,
-                  const int error,
-                  xmpp_stream_error_t *const stream_error,
-                  void *const userdata)
+void conn_handler(xmpp_conn_t *conn,
+                  xmpp_conn_event_t status,
+                  int error,
+                  xmpp_stream_error_t *stream_error,
+                  void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
    xmpp_stanza_t *iq, *query;
--- a/examples/basic.c
+++ b/examples/basic.c
@@ -10,32 +10,25 @@
 */

 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>

 #include <strophe.h>

-/* hardcoded TCP keepalive timeout and interval */
-#define KA_TIMEOUT 60
-#define KA_INTERVAL 1
-
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
-                  const xmpp_conn_event_t status,
-                  const int error,
-                  xmpp_stream_error_t *const stream_error,
-                  void *const userdata)
+static void conn_handler(xmpp_conn_t *conn,
+                         xmpp_conn_event_t status,
+                         int error,
+                         xmpp_stream_error_t *stream_error,
+                         void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
-    int secured;

    (void)error;
    (void)stream_error;

    if (status == XMPP_CONN_CONNECT) {
        fprintf(stderr, "DEBUG: connected\n");
-        secured = xmpp_conn_is_secured(conn);
-        fprintf(stderr, "DEBUG: connection is %s.\n",
-                secured ? "secured" : "NOT secured");
        xmpp_disconnect(conn);
    } else {
        fprintf(stderr, "DEBUG: disconnected\n");
@@ -43,19 +36,39 @@ void conn_handler(xmpp_conn_t *const conn,
    }
 }

+static void usage(int exit_code)
+{
+    fprintf(stderr,
+            "Usage: basic [options] [<host> [<port>]]\n\n"
+            "Options:\n"
+            "  --jid <jid>              The JID to use to authenticate.\n"
+            "  --pass <pass>            The password of the JID.\n"
+            "  --disable-tls            Disable TLS.\n"
+            "  --mandatory-tls          Deny plaintext connection.\n"
+            "  --trust-tls              Trust TLS certificate.\n"
+            "  --legacy-ssl             Use old style SSL.\n"
+            "  --legacy-auth            Allow legacy authentication.\n"
+            "Note: --disable-tls conflicts with --mandatory-tls or "
+            "--legacy-ssl\n");
+
+    exit(exit_code);
+}
+
 int main(int argc, char **argv)
 {
    xmpp_ctx_t *ctx;
    xmpp_conn_t *conn;
    xmpp_log_t *log;
-    char *jid, *pass, *host = NULL;
+    char *jid = NULL, *password = NULL, *host = NULL;
    long flags = 0;
-    int tcp_keepalive = 0;
    int i;
+    unsigned long port = 0;

    /* take a jid and password on the command line */
    for (i = 1; i < argc; ++i) {
-        if (strcmp(argv[i], "--disable-tls") == 0)
+        if (strcmp(argv[i], "--help") == 0)
+            usage(0);
+        else if (strcmp(argv[i], "--disable-tls") == 0)
            flags |= XMPP_CONN_FLAG_DISABLE_TLS;
        else if (strcmp(argv[i], "--mandatory-tls") == 0)
            flags |= XMPP_CONN_FLAG_MANDATORY_TLS;
@@ -65,29 +78,21 @@ int main(int argc, char **argv)
            flags |= XMPP_CONN_FLAG_LEGACY_SSL;
        else if (strcmp(argv[i], "--legacy-auth") == 0)
            flags |= XMPP_CONN_FLAG_LEGACY_AUTH;
-        else if (strcmp(argv[i], "--tcp-keepalive") == 0)
-            tcp_keepalive = 1;
+        else if ((strcmp(argv[i], "--jid") == 0) && (++i < argc))
+            jid = argv[i];
+        else if ((strcmp(argv[i], "--pass") == 0) && (++i < argc))
+            password = argv[i];
        else
            break;
    }
-    if ((argc - i) < 2 || (argc - i) > 3) {
-        fprintf(stderr, "Usage: basic [options] <jid> <pass> [<host>]\n\n"
-                        "Options:\n"
-                        "  --disable-tls        Disable TLS.\n"
-                        "  --mandatory-tls      Deny plaintext connection.\n"
-                        "  --trust-tls          Trust TLS certificate.\n"
-                        "  --legacy-ssl         Use old style SSL.\n"
-                        "  --legacy-auth        Allow legacy authentication.\n"
-                        "  --tcp-keepalive      Configure TCP keepalive.\n\n"
-                        "Note: --disable-tls conflicts with --mandatory-tls or "
-                        "--legacy-ssl\n");
-        return 1;
+    if ((!jid) || (argc - i) > 2) {
+        usage(1);
    }

-    jid = argv[i];
-    pass = argv[i + 1];
-    if (i + 2 < argc)
-        host = argv[i + 2];
+    if (i < argc)
+        host = argv[i];
+    if (i + 1 < argc)
+        port = strtoul(argv[i + 1], NULL, 0);

    /*
     * Note, this example doesn't handle errors. Applications should check
@@ -107,20 +112,20 @@ int main(int argc, char **argv)

    /* configure connection properties (optional) */
    xmpp_conn_set_flags(conn, flags);
-    /* configure TCP keepalive (optional) */
-    if (tcp_keepalive)
-        xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);

    /* setup authentication information */
-    xmpp_conn_set_jid(conn, jid);
-    xmpp_conn_set_pass(conn, pass);
+    if (jid)
+        xmpp_conn_set_jid(conn, jid);
+    if (password)
+        xmpp_conn_set_pass(conn, password);

    /* initiate connection */
-    xmpp_connect_client(conn, host, 0, conn_handler, ctx);
+    if (xmpp_connect_client(conn, host, port, conn_handler, ctx) == XMPP_EOK) {

-    /* enter the event loop -
-       our connect handler will trigger an exit */
-    xmpp_run(ctx);
+        /* enter the event loop -
+           our connect handler will trigger an exit */
+        xmpp_run(ctx);
+    }

    /* release our connection and context */
    xmpp_conn_release(conn);
--- a/examples/bot.c
+++ b/examples/bot.c
@@ -19,12 +19,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
+#ifdef _WIN32
+#include <conio.h>
+#include <ctype.h>
+#endif

 #include <strophe.h>

-int version_handler(xmpp_conn_t *const conn,
-                    xmpp_stanza_t *const stanza,
-                    void *const userdata)
+static int reconnect;
+
+int version_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_stanza_t *reply, *query, *name, *version, *text;
    const char *ns;
@@ -70,9 +76,7 @@ int version_handler(xmpp_conn_t *const conn,
    return 1;
 }

-int message_handler(xmpp_conn_t *const conn,
-                    xmpp_stanza_t *const stanza,
-                    void *const userdata)
+int message_handler(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
    xmpp_stanza_t *body, *reply;
@@ -99,6 +103,10 @@ int message_handler(xmpp_conn_t *const conn,
    if (strcmp(intext, "quit") == 0) {
        replytext = strdup("bye!");
        quit = 1;
+    } else if (strcmp(intext, "reconnect") == 0) {
+        replytext = strdup("alright, let's see what happens!");
+        reconnect = 1;
+        quit = 1;
    } else {
        replytext = (char *)malloc(strlen(" to you too!") + strlen(intext) + 1);
        strcpy(replytext, intext);
@@ -118,11 +126,11 @@ int message_handler(xmpp_conn_t *const conn,
 }

 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
-                  const xmpp_conn_event_t status,
-                  const int error,
-                  xmpp_stream_error_t *const stream_error,
-                  void *const userdata)
+void conn_handler(xmpp_conn_t *conn,
+                  xmpp_conn_event_t status,
+                  int error,
+                  xmpp_stream_error_t *stream_error,
+                  void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;

@@ -146,21 +154,116 @@ void conn_handler(xmpp_conn_t *const conn,
    }
 }

+#ifdef _WIN32
+static char *getpassword(const char *prompt, size_t maxlen)
+{
+    char *b, *buffer = malloc(maxlen);
+    size_t i = 0;
+
+    b = buffer;
+    fputs(prompt, stderr);
+    for (i = 0; i < maxlen; i++, b++) {
+        char c = _getch();
+        if (c == '\r' || c == '\n')
+            break;
+        *b = c;
+    }
+    *b = '\0';
+    fputs("\n", stderr);
+    return buffer;
+}
+#else
+#define getpassword(prompt, maxlen) getpass(prompt)
+#endif
+
+static int
+password_callback(char *pw, size_t pw_max, xmpp_conn_t *conn, void *userdata)
+{
+    (void)userdata;
+    printf("Trying to unlock %s\n", xmpp_conn_get_keyfile(conn));
+    char *pass = getpassword("Please enter password: ", pw_max);
+    if (!pass)
+        return -1;
+    size_t passlen = strlen(pass);
+    int ret;
+    if (passlen >= pw_max) {
+        ret = -1;
+        goto out;
+    }
+    ret = passlen + 1;
+    memcpy(pw, pass, ret);
+out:
+    memset(pass, 0, passlen);
+    return ret;
+}
+
+static void usage(int exit_code)
+{
+    fprintf(stderr,
+            "Usage: bot [options] <jid> <pass>\n\n"
+            "Options:\n"
+            "  --jid <jid>              The JID to use to authenticate.\n"
+            "  --pass <pass>            The password of the JID.\n"
+            "  --tls-cert <cert>        Path to client certificate.\n"
+            "  --tls-key <key>          Path to private key or P12 file.\n\n"
+            "  --tcp-keepalive          Configure TCP keepalive.\n"
+            "  --disable-tls            Disable TLS.\n"
+            "  --mandatory-tls          Deny plaintext connection.\n"
+            "  --trust-tls              Trust TLS certificate.\n"
+            "  --legacy-ssl             Use old style SSL.\n"
+            "  --legacy-auth            Allow legacy authentication.\n"
+            "Note: --disable-tls conflicts with --mandatory-tls or "
+            "--legacy-ssl\n");
+
+    exit(exit_code);
+}
+
 int main(int argc, char **argv)
 {
    xmpp_ctx_t *ctx;
    xmpp_conn_t *conn;
    xmpp_log_t *log;
-    char *jid, *pass;
+    xmpp_sm_state_t *sm_state = NULL;
+    char *jid = NULL, *password = NULL, *host = NULL, *cert = NULL, *key = NULL;
+    long flags = 0;
+    int i, tcp_keepalive = 0;
+    unsigned long port = 0;

    /* take a jid and password on the command line */
-    if (argc != 3) {
-        fprintf(stderr, "Usage: bot <jid> <pass>\n\n");
-        return 1;
+    for (i = 1; i < argc; ++i) {
+        if (strcmp(argv[i], "--help") == 0)
+            usage(0);
+        else if (strcmp(argv[i], "--disable-tls") == 0)
+            flags |= XMPP_CONN_FLAG_DISABLE_TLS;
+        else if (strcmp(argv[i], "--mandatory-tls") == 0)
+            flags |= XMPP_CONN_FLAG_MANDATORY_TLS;
+        else if (strcmp(argv[i], "--trust-tls") == 0)
+            flags |= XMPP_CONN_FLAG_TRUST_TLS;
+        else if (strcmp(argv[i], "--legacy-ssl") == 0)
+            flags |= XMPP_CONN_FLAG_LEGACY_SSL;
+        else if (strcmp(argv[i], "--legacy-auth") == 0)
+            flags |= XMPP_CONN_FLAG_LEGACY_AUTH;
+        else if ((strcmp(argv[i], "--jid") == 0) && (++i < argc))
+            jid = argv[i];
+        else if ((strcmp(argv[i], "--pass") == 0) && (++i < argc))
+            password = argv[i];
+        else if ((strcmp(argv[i], "--tls-cert") == 0) && (++i < argc))
+            cert = argv[i];
+        else if ((strcmp(argv[i], "--tls-key") == 0) && (++i < argc))
+            key = argv[i];
+        else if (strcmp(argv[i], "--tcp-keepalive") == 0)
+            tcp_keepalive = 1;
+        else
+            break;
+    }
+    if ((!jid && !key) || (argc - i) > 2) {
+        usage(1);
    }

-    jid = argv[1];
-    pass = argv[2];
+    if (i < argc)
+        host = argv[i];
+    if (i + 1 < argc)
+        port = strtoul(argv[i + 1], NULL, 0);

    /* init library */
    xmpp_initialize();
@@ -170,29 +273,55 @@ int main(int argc, char **argv)
    /* create a context */
    ctx = xmpp_ctx_new(NULL, log);

+create_connection:
+    reconnect = 0;
    /* create a connection */
    conn = xmpp_conn_new(ctx);

-    /*
-     * also you can disable TLS support or force legacy SSL
-     * connection without STARTTLS
-     *
-     * see xmpp_conn_set_flags() or examples/basic.c
-     */
+    /* configure connection properties (optional) */
+    xmpp_conn_set_flags(conn, flags);

+    /* ask for a password if key is protected */
+    xmpp_conn_set_password_callback(conn, password_callback, NULL);
+    /* try at max 3 times in case the user enters the password wrong */
+    xmpp_conn_set_password_retries(conn, 3);
    /* setup authentication information */
-    xmpp_conn_set_jid(conn, jid);
-    xmpp_conn_set_pass(conn, pass);
+    if (key)
+        xmpp_conn_set_client_cert(conn, cert, key);
+    if (jid)
+        xmpp_conn_set_jid(conn, jid);
+    if (password)
+        xmpp_conn_set_pass(conn, password);
+
+    /* enable TCP keepalive, using canned callback function */
+    if (tcp_keepalive)
+        xmpp_conn_set_sockopt_callback(conn, xmpp_sockopt_cb_keepalive);
+
+    /* set Stream-Mangement state if available */
+    if (sm_state) {
+        xmpp_conn_set_sm_state(conn, sm_state);
+        sm_state = NULL;
+    }

    /* initiate connection */
-    xmpp_connect_client(conn, NULL, 0, conn_handler, ctx);
+    if (xmpp_connect_client(conn, host, port, conn_handler, ctx) == XMPP_EOK) {

-    /* enter the event loop -
-       our connect handler will trigger an exit */
-    xmpp_run(ctx);
+        /* enter the event loop -
+           our connect handler will trigger an exit */
+        xmpp_run(ctx);
+    }

-    /* release our connection and context */
+    /* save the Stream-Mangement state if we should re-connect */
+    if (reconnect)
+        sm_state = xmpp_conn_get_sm_state(conn);
+
+    /* release our connection */
    xmpp_conn_release(conn);
+
+    if (reconnect)
+        goto create_connection;
+
+    /* release our context */
    xmpp_ctx_free(ctx);

    /* final shutdown of the library */
--- a/examples/complex.c
+++ b/examples/complex.c
@@ -0,0 +1,364 @@
+/* complex.c
+** libstrophe XMPP client library -- more complex usage example
+**
+** Copyright (C) 2005-2009 Collecta, Inc.
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+** This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef _WIN32
+#include <conio.h>
+#include <ctype.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+#include <mstcpip.h> /* tcp_keepalive */
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#endif
+
+#include <strophe.h>
+
+/* hardcoded TCP keepalive timeout and interval */
+#define KA_TIMEOUT 60
+#define KA_INTERVAL 30
+#define KA_COUNT 3
+#define USER_TIMEOUT 150
+
+static void print_tlscert(const xmpp_tlscert_t *cert)
+{
+    const char *name;
+    size_t n;
+    for (n = 0; n < (unsigned)XMPP_CERT_ELEMENT_MAX; ++n) {
+        printf("\t%32s: %s\n", xmpp_tlscert_get_description(n),
+               xmpp_tlscert_get_string(cert, n));
+    }
+    n = 0;
+    while ((name = xmpp_tlscert_get_dnsname(cert, n++)) != NULL)
+        printf("\t%32s: %s\n", "dnsName", name);
+    printf("PEM:\n%s\n", xmpp_tlscert_get_pem(cert));
+}
+
+/* define a handler for connection events */
+static void conn_handler(xmpp_conn_t *conn,
+                         xmpp_conn_event_t status,
+                         int error,
+                         xmpp_stream_error_t *stream_error,
+                         void *userdata)
+{
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
+    int secured;
+
+    (void)error;
+    (void)stream_error;
+
+    if (status == XMPP_CONN_CONNECT) {
+        fprintf(stderr, "DEBUG: connected\n");
+        secured = xmpp_conn_is_secured(conn);
+        fprintf(stderr, "DEBUG: connection is %s.\n",
+                secured ? "secured" : "NOT secured");
+        if (secured) {
+            xmpp_tlscert_t *cert = xmpp_conn_get_peer_cert(conn);
+            print_tlscert(cert);
+            xmpp_tlscert_free(cert);
+        }
+        xmpp_disconnect(conn);
+    } else {
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(ctx);
+    }
+}
+
+static int certfail_handler(const xmpp_tlscert_t *cert,
+                            const char *const errormsg)
+{
+    char read_char[16] = {0};
+    printf("Received certificate can't be validated!\n");
+    printf("Reason: %s\n", errormsg);
+    print_tlscert(cert);
+    printf("Do you agree to connect?\n[y(es)|n(o)]: ");
+    fflush(stdout);
+    if (fgets(read_char, sizeof(read_char), stdin) == NULL) {
+        printf("fgets() failed\n");
+        return 0;
+    }
+    printf("\n");
+    return read_char[0] == 'y' || read_char[0] == 'Y';
+}
+
+#ifdef _WIN32
+static char *getpassword(const char *prompt, size_t maxlen)
+{
+    char *b, *buffer = malloc(maxlen);
+    size_t i = 0;
+
+    b = buffer;
+    fputs(prompt, stderr);
+    for (i = 0; i < maxlen; i++, b++) {
+        char c = _getch();
+        if (c == '\r' || c == '\n')
+            break;
+        *b = c;
+    }
+    *b = '\0';
+    fputs("\n", stderr);
+    return buffer;
+}
+#else
+#define getpassword(prompt, maxlen) getpass(prompt)
+#endif
+
+static int
+password_callback(char *pw, size_t pw_max, xmpp_conn_t *conn, void *userdata)
+{
+    (void)userdata;
+    printf("Trying to unlock %s\n", xmpp_conn_get_keyfile(conn));
+    char *pass = getpassword("Please enter password: ", pw_max);
+    if (!pass)
+        return -1;
+    size_t passlen = strlen(pass);
+    int ret;
+    if (passlen >= pw_max) {
+        ret = -1;
+        goto out;
+    }
+    ret = passlen + 1;
+    memcpy(pw, pass, ret);
+out:
+    memset(pass, 0, passlen);
+    return ret;
+}
+
+static int sockopt_cb(xmpp_conn_t *conn, void *socket)
+{
+    int timeout = KA_TIMEOUT;
+    int interval = KA_INTERVAL;
+    int count = KA_COUNT;
+    unsigned int user_timeout = USER_TIMEOUT;
+    int ret;
+    int optval = (timeout && interval) ? 1 : 0;
+
+    (void)conn;
+
+#ifdef _WIN32
+    (void)count;
+    (void)user_timeout;
+
+    SOCKET sock = *((SOCKET *)socket);
+    struct tcp_keepalive ka;
+    DWORD dw = 0;
+
+    ka.onoff = optval;
+    ka.keepalivetime = timeout * 1000;
+    ka.keepaliveinterval = interval * 1000;
+    ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &ka, sizeof(ka), NULL, 0, &dw,
+                   NULL, NULL);
+#else
+    int sock = *((int *)socket);
+
+    fprintf(stderr, "DEBUG: setting socket options\n");
+
+    ret = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval));
+    if (ret < 0)
+        return ret;
+
+    if (optval) {
+#ifdef TCP_KEEPIDLE
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &timeout,
+                         sizeof(timeout));
+#elif defined(TCP_KEEPALIVE)
+        /* QNX receives `struct timeval' as argument, but it seems OSX does int
+         */
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPALIVE, &timeout,
+                         sizeof(timeout));
+#endif /* TCP_KEEPIDLE */
+        if (ret < 0)
+            return ret;
+#ifdef TCP_KEEPINTVL
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &interval,
+                         sizeof(interval));
+        if (ret < 0)
+            return ret;
+#endif /* TCP_KEEPINTVL */
+    }
+
+    if (count) {
+#ifdef TCP_KEEPCNT
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count));
+        if (ret < 0)
+            return ret;
+#endif /* TCP_KEEPCNT */
+    }
+
+    if (user_timeout) {
+#ifdef TCP_USER_TIMEOUT
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout,
+                         sizeof(user_timeout));
+        if (ret < 0)
+            return ret;
+#elif defined(TCP_RXT_CONNDROPTIME)
+        int rxt = user_timeout / 1000;
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_RXT_CONNDROPTIME, &rxt,
+                         sizeof(rxt));
+        if (ret < 0)
+            return ret;
+#endif /* TCP_USER_TIMEOUT */
+    }
+#endif /* _WIN32 */
+
+    return ret;
+}
+
+static void usage(int exit_code)
+{
+    fprintf(stderr,
+            "Usage: complex [options] [<host> [<port>]]\n\n"
+            "Options:\n"
+            "  --jid <jid>              The JID to use to authenticate.\n"
+            "  --pass <pass>            The password of the JID.\n"
+            "  --tls-cert <cert>        Path to client certificate.\n"
+            "  --tls-key <key>          Path to private key or P12 file.\n\n"
+            "  --capath <path>          Path to an additional CA trust store "
+            "(directory).\n"
+            "  --cafile <path>          Path to an additional CA trust store "
+            "(single file).\n"
+            "  --disable-tls            Disable TLS.\n"
+            "  --mandatory-tls          Deny plaintext connection.\n"
+            "  --trust-tls              Trust TLS certificate.\n"
+            "  --enable-certfail        Enable certfail handler.\n"
+            "  --legacy-ssl             Use old style SSL.\n"
+            "  --legacy-auth            Allow legacy authentication.\n"
+            "  --verbose                Increase the verbosity level.\n"
+            "  --tcp-keepalive          Configure TCP keepalive.\n\n"
+            "Note: --disable-tls conflicts with --mandatory-tls or "
+            "--legacy-ssl\n");
+
+    exit(exit_code);
+}
+
+int main(int argc, char **argv)
+{
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    xmpp_log_t *log;
+    char *jid = NULL, *password = NULL, *cert = NULL, *key = NULL, *host = NULL,
+         *capath = NULL, *cafile = NULL;
+    long flags = 0;
+    int tcp_keepalive = 0, verbosity = 0, certfail = 0;
+    int i;
+    unsigned long port = 0;
+
+    /* take a jid and password on the command line */
+    for (i = 1; i < argc; ++i) {
+        if (strcmp(argv[i], "--help") == 0)
+            usage(0);
+        else if (strcmp(argv[i], "--disable-tls") == 0)
+            flags |= XMPP_CONN_FLAG_DISABLE_TLS;
+        else if (strcmp(argv[i], "--mandatory-tls") == 0)
+            flags |= XMPP_CONN_FLAG_MANDATORY_TLS;
+        else if (strcmp(argv[i], "--trust-tls") == 0)
+            flags |= XMPP_CONN_FLAG_TRUST_TLS;
+        else if (strcmp(argv[i], "--legacy-ssl") == 0)
+            flags |= XMPP_CONN_FLAG_LEGACY_SSL;
+        else if (strcmp(argv[i], "--legacy-auth") == 0)
+            flags |= XMPP_CONN_FLAG_LEGACY_AUTH;
+        else if (strcmp(argv[i], "--verbose") == 0)
+            verbosity++;
+        else if (strcmp(argv[i], "--tcp-keepalive") == 0)
+            tcp_keepalive = 1;
+        else if (strcmp(argv[i], "--enable-certfail") == 0)
+            certfail = 1;
+        else if ((strcmp(argv[i], "--jid") == 0) && (++i < argc))
+            jid = argv[i];
+        else if ((strcmp(argv[i], "--pass") == 0) && (++i < argc))
+            password = argv[i];
+        else if ((strcmp(argv[i], "--tls-cert") == 0) && (++i < argc))
+            cert = argv[i];
+        else if ((strcmp(argv[i], "--tls-key") == 0) && (++i < argc))
+            key = argv[i];
+        else if ((strcmp(argv[i], "--capath") == 0) && (++i < argc))
+            capath = argv[i];
+        else if ((strcmp(argv[i], "--cafile") == 0) && (++i < argc))
+            cafile = argv[i];
+        else
+            break;
+    }
+    if ((!jid && !key) || (argc - i) > 2) {
+        usage(1);
+    }
+
+    if (i < argc)
+        host = argv[i];
+    if (i + 1 < argc)
+        port = strtoul(argv[i + 1], NULL, 0);
+
+    /*
+     * Note, this example doesn't handle errors. Applications should check
+     * return values of non-void functions.
+     */
+
+    /* init library */
+    xmpp_initialize();
+
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    /* create a context */
+    ctx = xmpp_ctx_new(NULL, log);
+    xmpp_ctx_set_verbosity(ctx, verbosity);
+
+    /* create a connection */
+    conn = xmpp_conn_new(ctx);
+
+    /* configure connection properties (optional) */
+    xmpp_conn_set_flags(conn, flags);
+    /* configure TCP keepalive (optional) */
+    if (tcp_keepalive)
+        xmpp_conn_set_sockopt_callback(conn, sockopt_cb);
+
+    /* ask for a password if key is protected */
+    xmpp_conn_set_password_callback(conn, password_callback, NULL);
+    /* try at max 3 times in case the user enters the password wrong */
+    xmpp_conn_set_password_retries(conn, 3);
+    /* setup authentication information */
+    if (key) {
+        xmpp_conn_set_client_cert(conn, cert, key);
+    }
+    if (jid)
+        xmpp_conn_set_jid(conn, jid);
+    if (password)
+        xmpp_conn_set_pass(conn, password);
+
+    if (certfail)
+        xmpp_conn_set_certfail_handler(conn, certfail_handler);
+    if (capath)
+        xmpp_conn_set_capath(conn, capath);
+    if (cafile)
+        xmpp_conn_set_cafile(conn, cafile);
+
+    /* initiate connection */
+    if (xmpp_connect_client(conn, host, port, conn_handler, ctx) == XMPP_EOK) {
+
+        /* enter the event loop -
+           our connect handler will trigger an exit */
+        xmpp_run(ctx);
+    }
+
+    /* release our connection and context */
+    xmpp_conn_release(conn);
+    xmpp_ctx_free(ctx);
+
+    /* final shutdown of the library */
+    xmpp_shutdown();
+
+    return 0;
+}
--- a/examples/component.c
+++ b/examples/component.c
@@ -20,11 +20,11 @@
 #include <strophe.h>

 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
-                  const xmpp_conn_event_t status,
-                  const int error,
-                  xmpp_stream_error_t *const stream_error,
-                  void *const userdata)
+void conn_handler(xmpp_conn_t *conn,
+                  xmpp_conn_event_t status,
+                  int error,
+                  xmpp_stream_error_t *stream_error,
+                  void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;

--- a/examples/perf.c
+++ b/examples/perf.c
@@ -0,0 +1,189 @@
+/* perf.c
+ * strophe XMPP client library -- performance measure
+ *
+ * Copyright (C) 2022 Steffen Jaeckel <jaeckel-floss@eyet-services.de>
+ *
+ *  This software is provided AS-IS with no warranty, either express
+ *  or implied.
+ *
+ *  This program is dual licensed under the MIT and GPLv3 licenses.
+ */
+
+/** @file
+ *  performance measure
+ *
+ *  Timing code shamelessly borrowed from libtomcrypt/demos/timing.c
+ */
+
+#include <strophe.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <time.h>
+
+static void init_timer(void);
+static void t_start(void);
+static uint64_t t_read(void);
+static const char *perf_time_unit;
+
+#define NUM_SAMPLES 1000u
+
+static void perf_rand(xmpp_ctx_t *ctx)
+{
+    xmpp_rand_t *rng = xmpp_rand_new(ctx);
+
+    uint64_t t1, t2, t3 = 0;
+    unsigned int n;
+    const size_t alloc_sz = 0x1000u;
+    size_t sz;
+    unsigned char *buf = malloc(alloc_sz);
+
+    /* pre-heat */
+    for (n = 1; n < 4; ++n) {
+        xmpp_rand_bytes(rng, buf, alloc_sz / n);
+    }
+
+    for (sz = 2; sz <= alloc_sz; sz <<= 1) {
+        t2 = 0;
+        for (n = 0; n < NUM_SAMPLES; ++n) {
+
+            t_start();
+            t1 = t_read();
+
+            xmpp_rand_bytes(rng, buf, sz);
+
+            t1 = t_read() - t1;
+            t2 += t1;
+        }
+        t2 /= NUM_SAMPLES;
+        fprintf(stderr, "Reading %6zu bytes from PRNG took %8" PRIu64 " %s\n",
+                sz, t2, perf_time_unit);
+        if (t3) {
+            double d3 = (double)t3, d2 = (double)t2;
+            fprintf(stderr, "    +%.2f%%\n",
+                    (d2 - d3) / ((d2 + d3) * 0.5) * 100.);
+        }
+        t3 = t2;
+    }
+    free(buf);
+    xmpp_rand_free(ctx, rng);
+}
+
+int main()
+{
+    /* pass NULL instead to silence output */
+    xmpp_log_t *log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    /* create a context */
+    xmpp_ctx_t *ctx = xmpp_ctx_new(NULL, log);
+
+    init_timer();
+
+    perf_rand(ctx);
+
+    return 0;
+}
+
+#define TIMES 100000
+static uint64_t timer, skew = 0;
+
+/* RDTSC from Scott Duplichan */
+static uint64_t rdtsc(void)
+{
+#if defined __GNUC__
+#if defined(__i386__) || defined(__x86_64__)
+    /* version from http://www.mcs.anl.gov/~kazutomo/rdtsc.html
+     * the old code always got a warning issued by gcc, clang did not
+     * complain...
+     */
+    unsigned hi, lo;
+    __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
+    return ((uint64_t)lo) | (((uint64_t)hi) << 32);
+#elif defined(__POWERPC__)
+    unsigned long a, b;
+    __asm__ __volatile__("mftbu %1 \nmftb %0\n" : "=r"(a), "=r"(b));
+    return (((uint64_t)b) << 32ULL) | ((uint64_t)a);
+#elif defined(__ia64__) /* gcc-IA64 version */
+    unsigned long result;
+    __asm__ __volatile__("mov %0=ar.itc" : "=r"(result)::"memory");
+    while (__builtin_expect((int)result == -1, 0))
+        __asm__ __volatile__("mov %0=ar.itc" : "=r"(result)::"memory");
+    return result;
+#elif defined(__sparc__)
+#if defined(__arch64__)
+    uint64_t a;
+    asm volatile("rd %%tick,%0" : "=r"(a));
+    return a;
+#else
+    register unsigned long x, y;
+    __asm__ __volatile__("rd %%tick, %0; clruw %0, %1; srlx %0, 32, %0"
+                         : "=r"(x), "=r"(y)
+                         : "0"(x), "1"(y));
+    return ((unsigned long long)x << 32) | y;
+#endif
+#elif defined(__aarch64__)
+    uint64_t CNTVCT_EL0;
+    __asm__ __volatile__("mrs %0, cntvct_el0" : "=r"(CNTVCT_EL0));
+    return CNTVCT_EL0;
+#elif defined HAVE_CLOCK_GETTIME
+#define USE_CLOCK_GETTIME
+    struct timespec result;
+    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &result);
+    return result.tv_sec * 1000000000 + result.tv_nsec;
+#else
+    return clock();
+#endif /* __GNUC__ */
+
+/* Microsoft and Intel Windows compilers */
+#elif defined _M_IX86
+    __asm rdtsc
+#elif defined _M_AMD64
+    return __rdtsc();
+#elif defined _M_IA64
+#if defined __INTEL_COMPILER
+#include <ia64intrin.h>
+#endif
+    return __getReg(3116);
+#elif defined HAVE_CLOCK_GETTIME
+#define USE_CLOCK_GETTIME
+    struct timespec result;
+    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &result);
+    return result.tv_sec * 1000000000 + result.tv_nsec;
+#else
+    return clock();
+#endif
+}
+
+#if defined USE_CLOCK_GETTIME
+static const char *perf_time_unit = "ns";
+#else
+static const char *perf_time_unit = "cycles";
+#endif
+
+static void t_start(void)
+{
+    timer = rdtsc();
+}
+
+static uint64_t t_read(void)
+{
+    return rdtsc() - timer;
+}
+
+static void init_timer(void)
+{
+    uint64_t c1, c2, t1, t2;
+    unsigned long y1;
+
+    c1 = c2 = (uint64_t)-1;
+    for (y1 = 0; y1 < TIMES * 100; y1++) {
+        t_start();
+        t1 = t_read();
+        t2 = (t_read() - t1) >> 1;
+
+        c1 = (t1 > c1) ? t1 : c1;
+        c2 = (t2 > c2) ? t2 : c2;
+    }
+    skew = c2 - c1;
+    fprintf(stderr, "Clock Skew: %lu\n", (unsigned long)skew);
+}
--- a/examples/register.c
+++ b/examples/register.c
@@ -102,9 +102,7 @@ iq_reg_send_form(xmpp_reg_t *reg, xmpp_conn_t *conn, xmpp_stanza_t *stanza)
    }
 }

-static int iq_reg2_cb(xmpp_conn_t *const conn,
-                      xmpp_stanza_t *const stanza,
-                      void *const userdata)
+static int iq_reg2_cb(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    const char *type;

@@ -129,9 +127,7 @@ quit:
    return 0;
 }

-static int iq_reg_cb(xmpp_conn_t *const conn,
-                     xmpp_stanza_t *const stanza,
-                     void *const userdata)
+static int iq_reg_cb(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
    xmpp_stanza_t *registered = NULL;
@@ -166,9 +162,8 @@ quit:
    return 0;
 }

-static int _handle_error(xmpp_conn_t *const conn,
-                         xmpp_stanza_t *const stanza,
-                         void *const userdata)
+static int
+_handle_error(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    (void)stanza;
    (void)userdata;
@@ -179,9 +174,9 @@ static int _handle_error(xmpp_conn_t *const conn,
    return 0;
 }

-static int _handle_proceedtls_default(xmpp_conn_t *const conn,
-                                      xmpp_stanza_t *const stanza,
-                                      void *const userdata)
+static int _handle_proceedtls_default(xmpp_conn_t *conn,
+                                      xmpp_stanza_t *stanza,
+                                      void *userdata)
 {
    const char *name = xmpp_stanza_get_name(stanza);

@@ -201,8 +196,7 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn,
    return 0;
 }

-static int _handle_missing_features(xmpp_conn_t *const conn,
-                                    void *const userdata)
+static int _handle_missing_features(xmpp_conn_t *conn, void *userdata)
 {
    (void)userdata;

@@ -212,9 +206,8 @@ static int _handle_missing_features(xmpp_conn_t *const conn,
    return 0;
 }

-static int _handle_features(xmpp_conn_t *const conn,
-                            xmpp_stanza_t *const stanza,
-                            void *const userdata)
+static int
+_handle_features(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
    xmpp_ctx_t *ctx = reg->ctx;
@@ -265,11 +258,11 @@ static int _handle_features(xmpp_conn_t *const conn,
    return 0;
 }

-static void conn_handler(xmpp_conn_t *const conn,
-                         const xmpp_conn_event_t status,
-                         const int error,
-                         xmpp_stream_error_t *const stream_error,
-                         void *const userdata)
+static void conn_handler(xmpp_conn_t *conn,
+                         xmpp_conn_event_t status,
+                         int error,
+                         xmpp_stream_error_t *stream_error,
+                         void *userdata)
 {
    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
    int secured;
--- a/examples/roster.c
+++ b/examples/roster.c
@@ -18,9 +18,7 @@

 #include <strophe.h>

-int handle_reply(xmpp_conn_t *const conn,
-                 xmpp_stanza_t *const stanza,
-                 void *const userdata)
+int handle_reply(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    xmpp_stanza_t *query, *item;
    const char *type, *name;
@@ -51,11 +49,11 @@ int handle_reply(xmpp_conn_t *const conn,
    return 0;
 }

-void conn_handler(xmpp_conn_t *const conn,
-                  const xmpp_conn_event_t status,
-                  const int error,
-                  xmpp_stream_error_t *const stream_error,
-                  void *const userdata)
+void conn_handler(xmpp_conn_t *conn,
+                  xmpp_conn_event_t status,
+                  int error,
+                  xmpp_stream_error_t *stream_error,
+                  void *userdata)
 {
    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
    xmpp_stanza_t *iq, *query;
--- a/examples/vcard.c
+++ b/examples/vcard.c
@@ -160,7 +160,7 @@ exit:
    return cb;
 }

-static int timedout(xmpp_conn_t *const conn, void *const userdata)
+static int timedout(xmpp_conn_t *conn, void *userdata)
 {
    (void)userdata;

@@ -170,9 +170,7 @@ static int timedout(xmpp_conn_t *const conn, void *const userdata)
    return 0;
 }

-static int recv_vcard(xmpp_conn_t *const conn,
-                      xmpp_stanza_t *const stanza,
-                      void *const userdata)
+static int recv_vcard(xmpp_conn_t *conn, xmpp_stanza_t *stanza, void *userdata)
 {
    vcard_t *vc = userdata;
    vcard_cb_t cb;
@@ -217,11 +215,11 @@ static void send_vcard_req(xmpp_conn_t *conn, const char *to, const char *id)
                         xmpp_conn_get_bound_jid(conn), to, id);
 }

-static void conn_handler(xmpp_conn_t *const conn,
-                         const xmpp_conn_event_t status,
-                         const int error,
-                         xmpp_stream_error_t *const stream_error,
-                         void *const userdata)
+static void conn_handler(xmpp_conn_t *conn,
+                         xmpp_conn_event_t status,
+                         int error,
+                         xmpp_stream_error_t *stream_error,
+                         void *userdata)
 {
    vcard_t *vc = userdata;

--- a/m4/ac_try_compile2.m4
+++ b/m4/ac_try_compile2.m4
@@ -0,0 +1,28 @@
+dnl Like AC_TRY_EVAL but also errors out if the compiler generates
+dnl _any_ output. Some compilers might issue warnings which we want
+dnl to catch.
+AC_DEFUN([AC_TRY_EVAL2],
+[{ (eval echo configure:__oline__: \"[$]$1\") 1>&AS_MESSAGE_LOG_FD; dnl
+(eval [$]$1) 2>&AS_MESSAGE_LOG_FD; _out=`eval [$]$1 2>&1` && test "x$_out" = x; }])
+
+dnl Like AC_TRY_COMPILE but calls AC_TRY_EVAL2 instead of AC_TRY_EVAL
+AC_DEFUN([AC_TRY_COMPILE2],
+[cat > conftest.$ac_ext <<EOF
+[#]line __oline__ "configure"
+#include "confdefs.h"
+[$1]
+int main(void) {
+[$2]
+; return 0; }
+EOF
+if AC_TRY_EVAL2(ac_compile); then
+  ifelse([$3], , :, [rm -rf conftest*
+  $3])
+else
+  echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
+  cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+ifelse([$4], , , [  rm -rf conftest*
+  $4
+])dnl
+fi
+rm -f conftest*])
--- a/m4/ax_valgrind_check.m4
+++ b/m4/ax_valgrind_check.m4
@@ -0,0 +1,239 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_VALGRIND_DFLT(memcheck|helgrind|drd|sgcheck, on|off)
+#   AX_VALGRIND_CHECK()
+#
+# DESCRIPTION
+#
+#   AX_VALGRIND_CHECK checks whether Valgrind is present and, if so, allows
+#   running `make check` under a variety of Valgrind tools to check for
+#   memory and threading errors.
+#
+#   Defines VALGRIND_CHECK_RULES which should be substituted in your
+#   Makefile; and $enable_valgrind which can be used in subsequent configure
+#   output. VALGRIND_ENABLED is defined and substituted, and corresponds to
+#   the value of the --enable-valgrind option, which defaults to being
+#   enabled if Valgrind is installed and disabled otherwise. Individual
+#   Valgrind tools can be disabled via --disable-valgrind-<tool>, the
+#   default is configurable via the AX_VALGRIND_DFLT command or is to use
+#   all commands not disabled via AX_VALGRIND_DFLT. All AX_VALGRIND_DFLT
+#   calls must be made before the call to AX_VALGRIND_CHECK.
+#
+#   If unit tests are written using a shell script and automake's
+#   LOG_COMPILER system, the $(VALGRIND) variable can be used within the
+#   shell scripts to enable Valgrind, as described here:
+#
+#     https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
+#
+#   Usage example:
+#
+#   configure.ac:
+#
+#     AX_VALGRIND_DFLT([sgcheck], [off])
+#     AX_VALGRIND_CHECK
+#
+#   in each Makefile.am with tests:
+#
+#     @VALGRIND_CHECK_RULES@
+#     VALGRIND_SUPPRESSIONS_FILES = my-project.supp
+#     EXTRA_DIST = my-project.supp
+#
+#   This results in a "check-valgrind" rule being added. Running `make
+#   check-valgrind` in that directory will recursively run the module's test
+#   suite (`make check`) once for each of the available Valgrind tools (out
+#   of memcheck, helgrind and drd) while the sgcheck will be skipped unless
+#   enabled again on the commandline with --enable-valgrind-sgcheck. The
+#   results for each check will be output to test-suite-$toolname.log. The
+#   target will succeed if there are zero errors and fail otherwise.
+#
+#   Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
+#   memcheck, helgrind, drd and sgcheck. These are useful because often only
+#   some of those tools can be ran cleanly on a codebase.
+#
+#   The macro supports running with and without libtool.
+#
+# LICENSE
+#
+#   Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall@collabora.co.uk>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 23
+
+dnl Configured tools
+m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]])
+m4_set_add_all([valgrind_exp_tool_set], [sgcheck])
+m4_foreach([vgtool], [valgrind_tool_list],
+           [m4_define([en_dflt_valgrind_]vgtool, [on])])
+
+AC_DEFUN([AX_VALGRIND_DFLT],[
+	m4_define([en_dflt_valgrind_$1], [$2])
+])dnl
+
+AC_DEFUN([AX_VALGRIND_CHECK],[
+	AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
+	m4_foreach([vgtool], [valgrind_tool_list],
+		[AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
+
+	dnl Check for --enable-valgrind
+	AC_ARG_ENABLE([valgrind],
+	              [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
+	              [enable_valgrind=$enableval],[enable_valgrind=])
+
+	AS_IF([test "$enable_valgrind" != "no"],[
+		# Check for Valgrind.
+		AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
+		AS_IF([test "$VALGRIND" = ""],[
+			AS_IF([test "$enable_valgrind" = "yes"],[
+				AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
+			],[
+				enable_valgrind=no
+			])
+		],[
+			enable_valgrind=yes
+		])
+	])
+
+	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
+	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
+
+	# Check for Valgrind tools we care about.
+	[valgrind_enabled_tools=]
+	m4_foreach([vgtool],[valgrind_tool_list],[
+		AC_ARG_ENABLE([valgrind-]vgtool,
+		    m4_if(m4_defn([en_dflt_valgrind_]vgtool),[off],dnl
+[AS_HELP_STRING([--enable-valgrind-]vgtool, [Whether to use ]vgtool[ during the Valgrind tests])],dnl
+[AS_HELP_STRING([--disable-valgrind-]vgtool, [Whether to skip ]vgtool[ during the Valgrind tests])]),
+		              [enable_valgrind_]vgtool[=$enableval],
+		              [enable_valgrind_]vgtool[=])
+		AS_IF([test "$enable_valgrind" = "no"],[
+			enable_valgrind_]vgtool[=no],
+		      [test "$enable_valgrind_]vgtool[" ]dnl
+m4_if(m4_defn([en_dflt_valgrind_]vgtool), [off], [= "yes"], [!= "no"]),[
+			AC_CACHE_CHECK([for Valgrind tool ]vgtool,
+			               [ax_cv_valgrind_tool_]vgtool,[
+				ax_cv_valgrind_tool_]vgtool[=no
+				m4_set_contains([valgrind_exp_tool_set],vgtool,
+				    [m4_define([vgtoolx],[exp-]vgtool)],
+				    [m4_define([vgtoolx],vgtool)])
+				AS_IF([`$VALGRIND --tool=]vgtoolx[ --help >/dev/null 2>&1`],[
+					ax_cv_valgrind_tool_]vgtool[=yes
+				])
+			])
+			AS_IF([test "$ax_cv_valgrind_tool_]vgtool[" = "no"],[
+				AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
+					AC_MSG_ERROR([Valgrind does not support ]vgtool[; reconfigure with --disable-valgrind-]vgtool)
+				],[
+					enable_valgrind_]vgtool[=no
+				])
+			],[
+				enable_valgrind_]vgtool[=yes
+			])
+		])
+		AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
+			valgrind_enabled_tools="$valgrind_enabled_tools ]m4_bpatsubst(vgtool,[^exp-])["
+		])
+		AC_SUBST([ENABLE_VALGRIND_]vgtool,[$enable_valgrind_]vgtool)
+	])
+	AC_SUBST([valgrind_tools],["]m4_join([ ], valgrind_tool_list)["])
+	AC_SUBST([valgrind_enabled_tools],[$valgrind_enabled_tools])
+
+[VALGRIND_CHECK_RULES='
+# Valgrind check
+#
+# Optional:
+#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
+#    files to load. (Default: empty)
+#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
+#    (Default: --num-callers=30)
+#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
+#    memcheck, helgrind, drd, sgcheck). (Default: various)
+
+# Optional variables
+VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
+VALGRIND_FLAGS ?= --num-callers=30
+VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
+VALGRIND_helgrind_FLAGS ?= --history-level=approx
+VALGRIND_drd_FLAGS ?=
+VALGRIND_sgcheck_FLAGS ?=
+
+# Internal use
+valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
+
+valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
+valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
+valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
+valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
+
+valgrind_quiet = $(valgrind_quiet_$(V))
+valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
+valgrind_quiet_0 = --quiet
+valgrind_v_use   = $(valgrind_v_use_$(V))
+valgrind_v_use_  = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
+valgrind_v_use_0 = @echo "  USE   " $(patsubst check-valgrind-%-local,%,$''@):;
+
+# Support running with and without libtool.
+ifneq ($(LIBTOOL),)
+valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
+else
+valgrind_lt =
+endif
+
+# Use recursive makes in order to ignore errors during check
+check-valgrind-local:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
+		$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+# Valgrind running
+VALGRIND_TESTS_ENVIRONMENT = \
+	$(TESTS_ENVIRONMENT) \
+	env VALGRIND=$(VALGRIND) \
+	G_SLICE=always-malloc,debug-blocks \
+	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
+
+VALGRIND_LOG_COMPILER = \
+	$(valgrind_lt) \
+	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
+
+define valgrind_tool_rule
+check-valgrind-$(1)-local:
+ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
+ifneq ($$(TESTS),)
+	$$(valgrind_v_use)$$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$$(valgrind_$(1)_flags)" \
+		TEST_SUITE_LOG=test-suite-$(1).log
+endif
+else ifeq ($$(VALGRIND_ENABLED),yes)
+	@echo "Need to reconfigure with --enable-valgrind-$(1)"
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+endef
+
+$(foreach tool,$(valgrind_tools),$(eval $(call valgrind_tool_rule,$(tool))))
+
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
+
+MOSTLYCLEANFILES ?=
+MOSTLYCLEANFILES += $(valgrind_log_files)
+
+.PHONY: check-valgrind $(addprefix check-valgrind-,$(valgrind_tools))
+']
+
+	AC_SUBST([VALGRIND_CHECK_RULES])
+	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
+])
--- a/src/auth.c
+++ b/src/auth.c
--- a/src/common.h
+++ b/src/common.h
@@ -26,7 +26,6 @@
 #include "hash.h"
 #include "util.h"
 #include "parser.h"
-#include "rand.h"
 #include "snprintf.h"

 /** handlers **/
@@ -77,6 +76,7 @@ typedef struct _xmpp_connlist_t {
 struct _xmpp_ctx_t {
    const xmpp_mem_t *mem;
    const xmpp_log_t *log;
+    int verbosity;

    xmpp_rand_t *rand;
    xmpp_loop_status_t loop_status;
@@ -87,33 +87,37 @@ struct _xmpp_ctx_t {
 };

 /* convenience functions for accessing the context */
-void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size);
-void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size);
-char *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s);
-
-void xmpp_log(const xmpp_ctx_t *const ctx,
-              const xmpp_log_level_t level,
-              const char *const area,
-              const char *const fmt,
-              va_list ap);
+void *strophe_alloc(const xmpp_ctx_t *ctx, size_t size);
+void *strophe_realloc(const xmpp_ctx_t *ctx, void *p, size_t size);
+char *strophe_strdup(const xmpp_ctx_t *ctx, const char *s);
+char *strophe_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len);
+void strophe_free(const xmpp_ctx_t *ctx, void *p);

 /* wrappers for xmpp_log at specific levels */
-void xmpp_error(const xmpp_ctx_t *const ctx,
-                const char *const area,
-                const char *const fmt,
-                ...);
-void xmpp_warn(const xmpp_ctx_t *const ctx,
-               const char *const area,
-               const char *const fmt,
-               ...);
-void xmpp_info(const xmpp_ctx_t *const ctx,
-               const char *const area,
-               const char *const fmt,
-               ...);
-void xmpp_debug(const xmpp_ctx_t *const ctx,
-                const char *const area,
-                const char *const fmt,
-                ...);
+void strophe_error(const xmpp_ctx_t *ctx,
+                   const char *area,
+                   const char *fmt,
+                   ...);
+void strophe_warn(const xmpp_ctx_t *ctx,
+                  const char *area,
+                  const char *fmt,
+                  ...);
+void strophe_info(const xmpp_ctx_t *ctx,
+                  const char *area,
+                  const char *fmt,
+                  ...);
+void strophe_debug(const xmpp_ctx_t *ctx,
+                   const char *area,
+                   const char *fmt,
+                   ...);
+void strophe_debug_verbose(
+    int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+
+void strophe_log_internal(const xmpp_ctx_t *ctx,
+                          xmpp_log_level_t level,
+                          const char *area,
+                          const char *fmt,
+                          va_list ap);

 /** connection **/

@@ -124,13 +128,24 @@ typedef enum {
    XMPP_STATE_CONNECTED
 } xmpp_conn_state_t;

+typedef enum {
+    XMPP_QUEUE_STROPHE = 0x1,
+    XMPP_QUEUE_USER = 0x2,
+    XMPP_QUEUE_SM = 0x800,
+    XMPP_QUEUE_SM_STROPHE = XMPP_QUEUE_SM | XMPP_QUEUE_STROPHE,
+} xmpp_send_queue_owner_t;
+
 typedef struct _xmpp_send_queue_t xmpp_send_queue_t;
 struct _xmpp_send_queue_t {
    char *data;
    size_t len;
    size_t written;
+    int wip;
+    xmpp_send_queue_owner_t owner;
+    void *userdata;
+    uint32_t sm_h;

-    xmpp_send_queue_t *next;
+    xmpp_send_queue_t *prev, *next;
 };

 #define UNUSED(x) ((void)(x))
@@ -143,6 +158,7 @@ struct _xmpp_send_queue_t {
 #define SASL_MASK_SCRAMSHA1 (1 << 3)
 #define SASL_MASK_SCRAMSHA256 (1 << 4)
 #define SASL_MASK_SCRAMSHA512 (1 << 5)
+#define SASL_MASK_EXTERNAL (1 << 6)

 #define SASL_MASK_SCRAM \
    (SASL_MASK_SCRAMSHA1 | SASL_MASK_SCRAMSHA256 | SASL_MASK_SCRAMSHA512)
@@ -153,7 +169,23 @@ enum {
    XMPP_PORT_COMPONENT = 5347,
 };

-typedef void (*xmpp_open_handler)(xmpp_conn_t *const conn);
+typedef void (*xmpp_open_handler)(xmpp_conn_t *conn);
+
+typedef struct {
+    xmpp_send_queue_t *head, *tail;
+} xmpp_queue_t;
+
+struct _xmpp_sm_t {
+    xmpp_ctx_t *ctx;
+    int sm_support;
+    int sm_enabled;
+    int can_resume, resume, dont_request_resume;
+    uint32_t sm_handled_nr;
+    uint32_t sm_sent_nr;
+    xmpp_queue_t sm_queue;
+    char *id, *previd, *bound_jid;
+    xmpp_stanza_t *bind;
+};

 struct _xmpp_conn_t {
    unsigned int ref;
@@ -169,6 +201,7 @@ struct _xmpp_conn_t {
    sock_t sock;
    int ka_timeout;  /* TCP keepalive timeout */
    int ka_interval; /* TCP keepalive interval */
+    int ka_count;    /* TCP keepalive count */

    tls_t *tls;
    int tls_support;
@@ -176,15 +209,30 @@ struct _xmpp_conn_t {
    int tls_mandatory;
    int tls_legacy_ssl;
    int tls_trust;
+    char *tls_cafile;
+    char *tls_capath;
+    char *tls_client_cert;
+    char *tls_client_key;
    int tls_failed;   /* set when tls fails, so we don't try again */
    int sasl_support; /* if true, field is a bitfield of supported
                         mechanisms */
    int auth_legacy_enabled;
    int secured; /* set when stream is secured with TLS */
+    xmpp_certfail_handler certfail_handler;
+    xmpp_password_callback password_callback;
+    void *password_callback_userdata;
+    struct {
+        char pass[1024];
+        unsigned char fname_hash[XMPP_SHA1_DIGEST_SIZE];
+        size_t passlen, fnamelen;
+    } password_cache;
+    unsigned int password_retries;

    /* if server returns <bind/> or <session/> we must do them */
    int bind_required;
    int session_required;
+    int sm_disable;
+    xmpp_sm_state_t *sm_state;

    char *lang;
    char *domain;
@@ -197,6 +245,7 @@ struct _xmpp_conn_t {
    int blocking_send;
    int send_queue_max;
    int send_queue_len;
+    int send_queue_user_len;
    xmpp_send_queue_t *send_queue_head;
    xmpp_send_queue_t *send_queue_tail;

@@ -223,15 +272,16 @@ struct _xmpp_conn_t {
    xmpp_handlist_t *timed_handlers;
    hash_t *id_handlers;
    xmpp_handlist_t *handlers;
+    xmpp_sockopt_callback sockopt_cb;
 };

-void conn_disconnect(xmpp_conn_t *const conn);
-void conn_disconnect_clean(xmpp_conn_t *const conn);
-void conn_established(xmpp_conn_t *const conn);
-void conn_open_stream(xmpp_conn_t *const conn);
-int conn_tls_start(xmpp_conn_t *const conn);
-void conn_prepare_reset(xmpp_conn_t *const conn, xmpp_open_handler handler);
-void conn_parser_reset(xmpp_conn_t *const conn);
+void conn_disconnect(xmpp_conn_t *conn);
+void conn_disconnect_clean(xmpp_conn_t *conn);
+void conn_established(xmpp_conn_t *conn);
+void conn_open_stream(xmpp_conn_t *conn);
+int conn_tls_start(xmpp_conn_t *conn);
+void conn_prepare_reset(xmpp_conn_t *conn, xmpp_open_handler handler);
+void conn_parser_reset(xmpp_conn_t *conn);

 typedef enum {
    XMPP_STANZA_UNKNOWN,
@@ -256,32 +306,51 @@ struct _xmpp_stanza_t {
 };

 /* handler management */
-void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza);
-uint64_t handler_fire_timed(xmpp_ctx_t *const ctx);
+void handler_fire_stanza(xmpp_conn_t *conn, xmpp_stanza_t *stanza);
+uint64_t handler_fire_timed(xmpp_ctx_t *ctx);
 void handler_reset_timed(xmpp_conn_t *conn, int user_only);
-void handler_add_timed(xmpp_conn_t *const conn,
+void handler_add_timed(xmpp_conn_t *conn,
                       xmpp_timed_handler handler,
-                       const unsigned long period,
-                       void *const userdata);
-void handler_add_id(xmpp_conn_t *const conn,
+                       unsigned long period,
+                       void *userdata);
+void handler_add_id(xmpp_conn_t *conn,
                    xmpp_handler handler,
-                    const char *const id,
-                    void *const userdata);
-void handler_add(xmpp_conn_t *const conn,
+                    const char *id,
+                    void *userdata);
+void handler_add(xmpp_conn_t *conn,
                 xmpp_handler handler,
-                 const char *const ns,
-                 const char *const name,
-                 const char *const type,
-                 void *const userdata);
+                 const char *ns,
+                 const char *name,
+                 const char *type,
+                 void *userdata);
 void handler_system_delete_all(xmpp_conn_t *conn);

 /* utility functions */
-void disconnect_mem_error(xmpp_conn_t *const conn);
+void disconnect_mem_error(xmpp_conn_t *conn);

 /* auth functions */
-void auth_handle_open(xmpp_conn_t *const conn);
-void auth_handle_component_open(xmpp_conn_t *const conn);
-void auth_handle_open_raw(xmpp_conn_t *const conn);
-void auth_handle_open_stub(xmpp_conn_t *const conn);
+void auth_handle_open(xmpp_conn_t *conn);
+void auth_handle_component_open(xmpp_conn_t *conn);
+void auth_handle_open_raw(xmpp_conn_t *conn);
+void auth_handle_open_stub(xmpp_conn_t *conn);
+
+/* queue functions */
+void add_queue_back(xmpp_queue_t *queue, xmpp_send_queue_t *item);
+xmpp_send_queue_t *pop_queue_front(xmpp_queue_t *queue);
+char *queue_element_free(xmpp_ctx_t *ctx, xmpp_send_queue_t *e);
+
+/* send functions */
+void send_raw(xmpp_conn_t *conn,
+              const char *data,
+              size_t len,
+              xmpp_send_queue_owner_t owner,
+              void *userdata);
+/* this is a bit special as it will always mark the sent string as
+ * owned by libstrophe
+ */
+void send_raw_string(xmpp_conn_t *conn, const char *fmt, ...);
+void send_stanza(xmpp_conn_t *conn,
+                 xmpp_stanza_t *stanza,
+                 xmpp_send_queue_owner_t owner);

 #endif /* __LIBSTROPHE_COMMON_H__ */
--- a/src/conn.c
+++ b/src/conn.c
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -22,11 +22,11 @@
 #include <assert.h>
 #include <string.h> /* memset, memcpy */

-#include "common.h"  /* xmpp_alloc */
+#include "common.h"  /* strophe_alloc */
 #include "ostypes.h" /* uint8_t, size_t */
 #include "sha1.h"
 #include "snprintf.h" /* xmpp_snprintf */
-#include "strophe.h"  /* xmpp_ctx_t, xmpp_free */
+#include "strophe.h"  /* xmpp_ctx_t, strophe_free */

 struct _xmpp_sha1_t {
    xmpp_ctx_t *xmpp_ctx;
@@ -42,7 +42,7 @@ static char *digest_to_string(const uint8_t *digest, char *s, size_t len)
        return NULL;

    for (i = 0; i < SHA1_DIGEST_SIZE; ++i)
-        xmpp_snprintf(s + i * 2, 3, "%02x", digest[i]);
+        strophe_snprintf(s + i * 2, 3, "%02x", digest[i]);

    return s;
 }
@@ -53,7 +53,7 @@ static char *digest_to_string_alloc(xmpp_ctx_t *ctx, const uint8_t *digest)
    size_t slen;

    slen = SHA1_DIGEST_SIZE * 2 + 1;
-    s = xmpp_alloc(ctx, slen);
+    s = strophe_alloc(ctx, slen);
    if (s) {
        s = digest_to_string(digest, s, slen);
        assert(s != NULL);
@@ -122,7 +122,7 @@ xmpp_sha1_t *xmpp_sha1_new(xmpp_ctx_t *ctx)
 {
    xmpp_sha1_t *sha1;

-    sha1 = xmpp_alloc(ctx, sizeof(*sha1));
+    sha1 = strophe_alloc(ctx, sizeof(*sha1));
    if (sha1) {
        memset(sha1, 0, sizeof(*sha1));
        crypto_SHA1_Init(&sha1->ctx);
@@ -139,7 +139,7 @@ xmpp_sha1_t *xmpp_sha1_new(xmpp_ctx_t *ctx)
 */
 void xmpp_sha1_free(xmpp_sha1_t *sha1)
 {
-    xmpp_free(sha1->xmpp_ctx, sha1);
+    strophe_free(sha1->xmpp_ctx, sha1);
 }

 /** Update SHA1 context with the next portion of data.
@@ -187,9 +187,9 @@ char *xmpp_sha1_to_string(xmpp_sha1_t *sha1, char *s, size_t slen)
 }

 /** Return message digest rendered as a string.
- *  Returns an allocated string. Free the string using the Strophe context
- *  which is passed to xmpp_sha1_new(). Call this function after
- *  xmpp_sha1_final().
+ *  Returns an allocated string. Free the string by calling xmpp_free() using
+ *  the Strophe context which is passed to xmpp_sha1_new(). Call this function
+ *  after xmpp_sha1_final().
 *
 *  @param sha1 a SHA1 object
 *
@@ -244,15 +244,14 @@ static const char _base64_charmap[65] = {
    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '='};

-static size_t base64_encoded_len(const size_t len)
+static size_t base64_encoded_len(size_t len)
 {
    /* encoded steam is 4 bytes for every three, rounded up */
    return ((len + 2) / 3) << 2;
 }

-static char *base64_encode(xmpp_ctx_t *ctx,
-                           const unsigned char *const buffer,
-                           const size_t len)
+static char *
+base64_encode(xmpp_ctx_t *ctx, const unsigned char *buffer, size_t len)
 {
    size_t clen;
    char *cbuf, *c;
@@ -260,7 +259,7 @@ static char *base64_encode(xmpp_ctx_t *ctx,
    size_t i;

    clen = base64_encoded_len(len);
-    cbuf = xmpp_alloc(ctx, clen + 1);
+    cbuf = strophe_alloc(ctx, clen + 1);
    if (cbuf != NULL) {
        c = cbuf;
        /* loop over data, turning every 3 bytes into 4 characters */
@@ -304,7 +303,7 @@ static char *base64_encode(xmpp_ctx_t *ctx,
    return cbuf;
 }

-static size_t base64_decoded_len(const char *const buffer, const size_t len)
+static size_t base64_decoded_len(const char *buffer, size_t len)
 {
    size_t nudge = 0;
    unsigned char c;
@@ -331,8 +330,8 @@ static size_t base64_decoded_len(const char *const buffer, const size_t len)
 }

 static void base64_decode(xmpp_ctx_t *ctx,
-                          const char *const buffer,
-                          const size_t len,
+                          const char *buffer,
+                          size_t len,
                          unsigned char **out,
                          size_t *outlen)
 {
@@ -349,7 +348,7 @@ static void base64_decode(xmpp_ctx_t *ctx,
    if (dlen == 0)
        goto _base64_error;

-    dbuf = xmpp_alloc(ctx, dlen + 1);
+    dbuf = strophe_alloc(ctx, dlen + 1);
    if (dbuf != NULL) {
        d = dbuf;
        /* loop over each set of 4 characters, decoding 3 bytes */
@@ -428,7 +427,7 @@ static void base64_decode(xmpp_ctx_t *ctx,

 _base64_decode_error:
    /* invalid character; abort decoding! */
-    xmpp_free(ctx, dbuf);
+    strophe_free(ctx, dbuf);
 _base64_error:
    *out = NULL;
    *outlen = 0;
@@ -470,7 +469,7 @@ char *xmpp_base64_decode_str(xmpp_ctx_t *ctx, const char *base64, size_t len)

    if (len == 0) {
        /* handle empty string */
-        buf = xmpp_alloc(ctx, 1);
+        buf = strophe_alloc(ctx, 1);
        if (buf)
            buf[0] = '\0';
        buflen = 0;
@@ -479,7 +478,7 @@ char *xmpp_base64_decode_str(xmpp_ctx_t *ctx, const char *base64, size_t len)
    }
    if (buf) {
        if (buflen != strlen((char *)buf)) {
-            xmpp_free(ctx, buf);
+            strophe_free(ctx, buf);
            buf = NULL;
        }
    }
--- a/src/ctx.c
+++ b/src/ctx.c
@@ -50,10 +50,22 @@
 #include "resolver.h"
 #include "util.h"

-/* Workaround for systems without va_copy support. */
-#if defined(_MSC_VER) && _MSC_VER < 1800 || \
-    !defined(_MSC_VER) && !defined(HAVE_DECL_VA_COPY)
-#define va_copy(d, s) (memcpy(&d, &s, sizeof(va_list)))
+#ifndef va_copy
+#ifdef HAVE_VA_COPY
+#define va_copy(dest, src) va_copy(dest, src)
+#else
+#ifdef HAVE___VA_COPY
+#define va_copy(dest, src) __va_copy(dest, src)
+#else
+#ifndef VA_LIST_IS_ARRAY
+#define va_copy(dest, src) (dest) = (src)
+#else
+#include <string.h>
+#define va_copy(dest, src) \
+    memcpy((char *)(dest), (char *)(src), sizeof(va_list))
+#endif
+#endif
+#endif
 #endif

 /** Initialize the Strophe library.
@@ -122,19 +134,19 @@ int xmpp_version_check(int major, int minor)
 /* Wrap stdlib routines malloc, free, and realloc for default memory
 * management.
 */
-static void *_malloc(const size_t size, void *const userdata)
+static void *_malloc(size_t size, void *userdata)
 {
    UNUSED(userdata);
    return malloc(size);
 }

-static void _free(void *p, void *const userdata)
+static void _free(void *p, void *userdata)
 {
    UNUSED(userdata);
    free(p);
 }

-static void *_realloc(void *p, const size_t size, void *const userdata)
+static void *_realloc(void *p, size_t size, void *userdata)
 {
    UNUSED(userdata);
    return realloc(p, size);
@@ -146,8 +158,7 @@ static xmpp_mem_t xmpp_default_mem = {
    _free, _realloc, NULL};

 /* log levels and names */
-static const char *const _xmpp_log_level_name[4] = {"DEBUG", "INFO", "WARN",
-                                                    "ERROR"};
+static const char *_xmpp_log_level_name[4] = {"DEBUG", "INFO", "WARN", "ERROR"};
 static const xmpp_log_level_t _xmpp_default_logger_levels[] = {
    XMPP_LEVEL_DEBUG, XMPP_LEVEL_INFO, XMPP_LEVEL_WARN, XMPP_LEVEL_ERROR};

@@ -160,10 +171,10 @@ static const xmpp_log_level_t _xmpp_default_logger_levels[] = {
 *  @param area the area the log message is for
 *  @param msg the log message
 */
-static void xmpp_default_logger(void *const userdata,
-                                const xmpp_log_level_t level,
-                                const char *const area,
-                                const char *const msg)
+static void xmpp_default_logger(void *userdata,
+                                xmpp_log_level_t level,
+                                const char *area,
+                                const char *msg)
 {
    xmpp_log_level_t filter_level = *(xmpp_log_level_t *)userdata;
    if (level >= filter_level)
@@ -212,7 +223,7 @@ static xmpp_log_t xmpp_default_log = {NULL, NULL};
 *
 *  @return a pointer to the allocated memory or NULL on an error
 */
-void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
+void *strophe_alloc(const xmpp_ctx_t *ctx, size_t size)
 {
    return ctx->mem->alloc(size, ctx->mem->userdata);
 }
@@ -223,11 +234,21 @@ void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
 *  @param ctx a Strophe context object
 *  @param p a pointer referencing memory to be freed
 */
-void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
+void strophe_free(const xmpp_ctx_t *ctx, void *p)
 {
    ctx->mem->free(p, ctx->mem->userdata);
 }

+/** Trampoline to \ref strophe_free
+ *
+ *  @param ctx \ref strophe_free
+ *  @param p \ref strophe_free
+ */
+void xmpp_free(const xmpp_ctx_t *ctx, void *p)
+{
+    strophe_free(ctx, p);
+}
+
 /** Reallocate memory in a Strophe context.
 *  All Strophe functions will use this to reallocate memory.
 *
@@ -237,7 +258,7 @@ void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
 *
 *  @return a pointer to the reallocated memory or NULL on an error
 */
-void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size)
+void *strophe_realloc(const xmpp_ctx_t *ctx, void *p, size_t size)
 {
    return ctx->mem->realloc(p, size, ctx->mem->userdata);
 }
@@ -246,8 +267,8 @@ void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size)
 *  Write a log message to the logger for the context for the specified
 *  level and area.  This function takes a printf-style format string and a
 *  variable argument list (in va_list) format.  This function is not meant
- *  to be called directly, but is used via xmpp_error, xmpp_warn, xmpp_info,
- *  and xmpp_debug.
+ *  to be called directly, but is used via strophe_error, strophe_warn,
+ * strophe_info, and strophe_debug.
 *
 *  @param ctx a Strophe context object
 *  @param level the level at which to log
@@ -255,32 +276,40 @@ void *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size)
 *  @param fmt a printf-style format string for the message
 *  @param ap variable argument list supplied for the format string
 */
-void xmpp_log(const xmpp_ctx_t *const ctx,
-              const xmpp_log_level_t level,
-              const char *const area,
-              const char *const fmt,
-              va_list ap)
+static void _strophe_log(const xmpp_ctx_t *ctx,
+                         xmpp_log_level_t level,
+                         const char *area,
+                         const char *fmt,
+                         va_list ap)
 {
    int oldret, ret;
    char smbuf[1024];
    char *buf;
    va_list copy;

+    if (!ctx->log->handler)
+        return;
+
+    if (ctx->log->handler == xmpp_default_logger &&
+        level < *(xmpp_log_level_t *)ctx->log->userdata)
+        return;
+
    va_copy(copy, ap);
-    ret = xmpp_vsnprintf(smbuf, sizeof(smbuf), fmt, ap);
+    ret = strophe_vsnprintf(smbuf, sizeof(smbuf), fmt, ap);
    if (ret >= (int)sizeof(smbuf)) {
-        buf = (char *)xmpp_alloc(ctx, ret + 1);
+        buf = (char *)strophe_alloc(ctx, ret + 1);
        if (!buf) {
            buf = NULL;
-            xmpp_error(ctx, "log", "Failed allocating memory for log message.");
+            strophe_error(ctx, "log",
+                          "Failed allocating memory for log message.");
            va_end(copy);
            return;
        }
        oldret = ret;
-        ret = xmpp_vsnprintf(buf, ret + 1, fmt, copy);
+        ret = strophe_vsnprintf(buf, ret + 1, fmt, copy);
        if (ret > oldret) {
-            xmpp_error(ctx, "log", "Unexpected error");
-            xmpp_free(ctx, buf);
+            strophe_error(ctx, "log", "Unexpected error");
+            strophe_free(ctx, buf);
            va_end(copy);
            return;
        }
@@ -289,11 +318,20 @@ void xmpp_log(const xmpp_ctx_t *const ctx,
    }
    va_end(copy);

-    if (ctx->log->handler)
-        ctx->log->handler(ctx->log->userdata, level, area, buf);
+    ctx->log->handler(ctx->log->userdata, level, area, buf);

    if (buf != smbuf)
-        xmpp_free(ctx, buf);
+        strophe_free(ctx, buf);
+}
+
+/* Dummy trampoline, will be removed when deprecated.c is deleted */
+void strophe_log_internal(const xmpp_ctx_t *ctx,
+                          xmpp_log_level_t level,
+                          const char *area,
+                          const char *fmt,
+                          va_list ap)
+{
+    _strophe_log(ctx, level, area, fmt, ap);
 }

 /** Write to the log at the ERROR level.
@@ -306,15 +344,15 @@ void xmpp_log(const xmpp_ctx_t *const ctx,
 *  @param fmt a printf-style format string followed by a variable list of
 *      arguments to format
 */
-void xmpp_error(const xmpp_ctx_t *const ctx,
-                const char *const area,
-                const char *const fmt,
-                ...)
+void strophe_error(const xmpp_ctx_t *ctx,
+                   const char *area,
+                   const char *fmt,
+                   ...)
 {
    va_list ap;

    va_start(ap, fmt);
-    xmpp_log(ctx, XMPP_LEVEL_ERROR, area, fmt, ap);
+    _strophe_log(ctx, XMPP_LEVEL_ERROR, area, fmt, ap);
    va_end(ap);
 }

@@ -328,15 +366,12 @@ void xmpp_error(const xmpp_ctx_t *const ctx,
 *  @param fmt a printf-style format string followed by a variable list of
 *      arguments to format
 */
-void xmpp_warn(const xmpp_ctx_t *const ctx,
-               const char *const area,
-               const char *const fmt,
-               ...)
+void strophe_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
 {
    va_list ap;

    va_start(ap, fmt);
-    xmpp_log(ctx, XMPP_LEVEL_WARN, area, fmt, ap);
+    _strophe_log(ctx, XMPP_LEVEL_WARN, area, fmt, ap);
    va_end(ap);
 }

@@ -350,15 +385,12 @@ void xmpp_warn(const xmpp_ctx_t *const ctx,
 *  @param fmt a printf-style format string followed by a variable list of
 *      arguments to format
 */
-void xmpp_info(const xmpp_ctx_t *const ctx,
-               const char *const area,
-               const char *const fmt,
-               ...)
+void strophe_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
 {
    va_list ap;

    va_start(ap, fmt);
-    xmpp_log(ctx, XMPP_LEVEL_INFO, area, fmt, ap);
+    _strophe_log(ctx, XMPP_LEVEL_INFO, area, fmt, ap);
    va_end(ap);
 }

@@ -372,15 +404,39 @@ void xmpp_info(const xmpp_ctx_t *const ctx,
 *  @param fmt a printf-style format string followed by a variable list of
 *      arguments to format
 */
-void xmpp_debug(const xmpp_ctx_t *const ctx,
-                const char *const area,
-                const char *const fmt,
-                ...)
+void strophe_debug(const xmpp_ctx_t *ctx,
+                   const char *area,
+                   const char *fmt,
+                   ...)
 {
    va_list ap;

    va_start(ap, fmt);
-    xmpp_log(ctx, XMPP_LEVEL_DEBUG, area, fmt, ap);
+    _strophe_log(ctx, XMPP_LEVEL_DEBUG, area, fmt, ap);
+    va_end(ap);
+}
+
+/** Write to the log at the DEBUG level if verbosity is enabled.
+ *  This is a convenience function for writing to the log at the DEBUG level.
+ *  It takes a printf-style format string followed by a variable list of
+ *  arguments for formatting.
+ *
+ *  @param level the verbosity level
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ */
+void strophe_debug_verbose(
+    int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ctx->verbosity < level)
+        return;
+
+    va_start(ap, fmt);
+    _strophe_log(ctx, XMPP_LEVEL_DEBUG, area, fmt, ap);
    va_end(ap);
 }

@@ -398,8 +454,7 @@ void xmpp_debug(const xmpp_ctx_t *const ctx,
 *
 *  @ingroup Context
 */
-xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
-                         const xmpp_log_t *const log)
+xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *mem, const xmpp_log_t *log)
 {
    xmpp_ctx_t *ctx = NULL;

@@ -424,8 +479,9 @@ xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
        ctx->loop_status = XMPP_LOOP_NOTSTARTED;
        ctx->rand = xmpp_rand_new(ctx);
        ctx->timeout = EVENT_LOOP_DEFAULT_TIMEOUT;
+        ctx->verbosity = 0;
        if (ctx->rand == NULL) {
-            xmpp_free(ctx, ctx);
+            strophe_free(ctx, ctx);
            ctx = NULL;
        }
    }
@@ -439,21 +495,21 @@ xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
 *
 *  @ingroup Context
 */
-void xmpp_ctx_free(xmpp_ctx_t *const ctx)
+void xmpp_ctx_free(xmpp_ctx_t *ctx)
 {
    /* mem and log are owned by their suppliers */
    xmpp_rand_free(ctx, ctx->rand);
-    xmpp_free(ctx, ctx); /* pull the hole in after us */
+    strophe_free(ctx, ctx); /* pull the hole in after us */
 }

-/** Set the timeout to use when calling xmpp_run().
+/** Set the verbosity level of a Strophe context.
 *
 *  @param ctx a Strophe context object
- *  @param timeout the time to wait for events in milliseconds
+ *  @param level the verbosity level
 *
 *  @ingroup Context
 */
-void xmpp_ctx_set_timeout(xmpp_ctx_t *const ctx, const unsigned long timeout)
+void xmpp_ctx_set_verbosity(xmpp_ctx_t *ctx, int level)
 {
-    ctx->timeout = timeout;
+    ctx->verbosity = level;
 }
--- a/src/deprecated.c
+++ b/src/deprecated.c
@@ -0,0 +1,256 @@
+/* deprecated.c
+** strophe XMPP client library -- File with deprecated API functions.
+**
+** Copyright (C) 2022 Steffen Jaeckel
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+/** @file
+ *  File with deprecated API functions.
+ */
+
+/** @defgroup Deprecated All deprecated functions
+ *  These functions will be removed in the next release.
+ */
+
+#include "common.h"
+
+/** Allocate memory in a Strophe context.
+ *  All Strophe functions will use this to allocate memory.
+ *
+ *  @param ctx a Strophe context object
+ *  @param size the number of bytes to allocate
+ *
+ *  @return a pointer to the allocated memory or NULL on an error
+ *
+ *  @ingroup Deprecated
+ */
+void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size)
+{
+    return strophe_alloc(ctx, size);
+}
+
+/** Reallocate memory in a Strophe context.
+ *  All Strophe functions will use this to reallocate memory.
+ *
+ *  @param ctx a Strophe context object
+ *  @param p a pointer to previously allocated memory
+ *  @param size the new size in bytes to allocate
+ *
+ *  @return a pointer to the reallocated memory or NULL on an error
+ *
+ *  @ingroup Deprecated
+ */
+void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size)
+{
+    return strophe_realloc(ctx, p, size);
+}
+
+/** implement our own strdup that uses the ctx allocator */
+/** Duplicate a string.
+ *  This function replaces the standard strdup library call with a version
+ *  that uses the Strophe context object's allocator.
+ *
+ *  @param ctx a Strophe context object
+ *  @param s a string
+ *
+ *  @return a newly allocated string with the same data as s or NULL on error
+ *
+ *  @ingroup Deprecated
+ */
+char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s)
+{
+    return strophe_strdup(ctx, s);
+}
+
+/** Duplicate a string with a maximum length.
+ *  This function replaces the standard strndup library call with a version
+ *  that uses the Strophe context object's allocator.
+ *
+ *  @param ctx a Strophe context object
+ *  @param s a string
+ *  @param len the maximum length of the string to copy
+ *
+ *  @return a newly allocated string that contains at most `len` symbols
+ *             of the original string or NULL on error
+ *
+ *  @ingroup Deprecated
+ */
+char *xmpp_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len)
+{
+    return strophe_strndup(ctx, s, len);
+}
+
+void xmpp_log(const xmpp_ctx_t *ctx,
+              xmpp_log_level_t level,
+              const char *area,
+              const char *fmt,
+              va_list ap)
+{
+    strophe_log_internal(ctx, level, area, fmt, ap);
+}
+
+/** Write to the log at the ERROR level.
+ *  This is a convenience function for writing to the log at the
+ *  ERROR level.  It takes a printf-style format string followed by a
+ *  variable list of arguments for formatting.
+ *
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    strophe_log_internal(ctx, XMPP_LEVEL_ERROR, area, fmt, ap);
+    va_end(ap);
+}
+
+/** Write to the log at the WARN level.
+ *  This is a convenience function for writing to the log at the WARN level.
+ *  It takes a printf-style format string followed by a variable list of
+ *  arguments for formatting.
+ *
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    strophe_log_internal(ctx, XMPP_LEVEL_WARN, area, fmt, ap);
+    va_end(ap);
+}
+
+/** Write to the log at the INFO level.
+ *  This is a convenience function for writing to the log at the INFO level.
+ *  It takes a printf-style format string followed by a variable list of
+ *  arguments for formatting.
+ *
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    strophe_log_internal(ctx, XMPP_LEVEL_INFO, area, fmt, ap);
+    va_end(ap);
+}
+
+/** Write to the log at the DEBUG level.
+ *  This is a convenience function for writing to the log at the DEBUG level.
+ *  It takes a printf-style format string followed by a variable list of
+ *  arguments for formatting.
+ *
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    strophe_log_internal(ctx, XMPP_LEVEL_DEBUG, area, fmt, ap);
+    va_end(ap);
+}
+
+/** Write to the log at the DEBUG level if verbosity is enabled.
+ *  This is a convenience function for writing to the log at the DEBUG level.
+ *  It takes a printf-style format string followed by a variable list of
+ *  arguments for formatting.
+ *
+ *  @param level the verbosity level
+ *  @param ctx a Strophe context object
+ *  @param area the area to log for
+ *  @param fmt a printf-style format string followed by a variable list of
+ *      arguments to format
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_debug_verbose(
+    int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...)
+{
+    va_list ap;
+
+    if (ctx->verbosity < level)
+        return;
+
+    va_start(ap, fmt);
+    strophe_log_internal(ctx, XMPP_LEVEL_DEBUG, area, fmt, ap);
+    va_end(ap);
+}
+
+/** strtok_r(3) implementation.
+ *  This function has appeared in POSIX.1-2001, but not in C standard.
+ *  For example, visual studio older than 2005 doesn't provide strtok_r()
+ *  nor strtok_s().
+ *
+ *  @ingroup Deprecated
+ */
+char *xmpp_strtok_r(char *s, const char *delim, char **saveptr)
+{
+    return strophe_strtok_r(s, delim, saveptr);
+}
+
+int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
+{
+    va_list ap;
+    int ret;
+
+    va_start(ap, fmt);
+    ret = strophe_vsnprintf(str, count, fmt, ap);
+    va_end(ap);
+    return ret;
+}
+
+int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list arg)
+{
+    return strophe_vsnprintf(str, count, fmt, arg);
+}
+
+/** Set TCP keepalive parameters
+ *  Turn on TCP keepalive and set timeout and interval. Zero timeout
+ *  disables TCP keepalives. The parameters are applied immediately for
+ *  a non disconnected object. Also, they are applied when the connection
+ *  object connects successfully.
+ *
+ *  @param conn a Strophe connection object
+ *  @param timeout TCP keepalive timeout in seconds
+ *  @param interval TCP keepalive interval in seconds
+ *
+ *  @note this function is deprecated
+ *  @see xmpp_conn_set_sockopt_callback()
+ *
+ *  @ingroup Deprecated
+ */
+void xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval)
+{
+    conn->ka_timeout = timeout;
+    conn->ka_interval = interval;
+    conn->ka_count = 0;
+    xmpp_conn_set_sockopt_callback(conn, xmpp_sockopt_cb_keepalive);
+}
--- a/src/event.c
+++ b/src/event.c
@@ -73,7 +73,7 @@
 *
 *  @ingroup EventLoop
 */
-void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
+void xmpp_run_once(xmpp_ctx_t *ctx, unsigned long timeout)
 {
    xmpp_connlist_t *connitem;
    xmpp_conn_t *conn;
@@ -107,9 +107,11 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)

            if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls))) {
                /* an error occurred */
-                xmpp_debug(ctx, "xmpp", "Send error occurred, disconnecting.");
+                strophe_debug(ctx, "xmpp",
+                              "Send error occurred, disconnecting.");
                conn->error = ECONNABORTED;
                conn_disconnect(conn);
+                goto next_item;
            }
        }

@@ -129,15 +131,32 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
            }
            if (ret > 0 && ret < towrite)
                sq->written += ret; /* not all data could be sent now */
+            sq->wip = 1;
            if (ret != towrite)
                break; /* partial write or an error */

            /* all data for this queue item written, delete and move on */
-            xmpp_free(ctx, sq->data);
+            strophe_debug(conn->ctx, "conn", "SENT: %s", sq->data);
+            strophe_debug_verbose(1, ctx, "xmpp", "Q_SENT: %p", sq);
            tsq = sq;
            sq = sq->next;
            conn->send_queue_len--;
-            xmpp_free(ctx, tsq);
+            if (tsq->owner & XMPP_QUEUE_USER)
+                conn->send_queue_user_len--;
+            if (!(tsq->owner & XMPP_QUEUE_SM) && conn->sm_state->sm_enabled) {
+                tsq->sm_h = conn->sm_state->sm_sent_nr;
+                conn->sm_state->sm_sent_nr++;
+                strophe_debug_verbose(1, ctx, "xmpp", "SM_Q_MOVE: %p", tsq);
+                add_queue_back(&conn->sm_state->sm_queue, tsq);
+                tsq = NULL;
+            }
+            if (tsq) {
+                strophe_debug_verbose(2, ctx, "xmpp", "Q_FREE: %p", tsq);
+                strophe_debug_verbose(3, ctx, "conn", "Q_CONTENT: %s",
+                                      tsq->data);
+                strophe_free(ctx, tsq->data);
+                strophe_free(ctx, tsq);
+            }

            /* pop the top item */
            conn->send_queue_head = sq;
@@ -150,11 +169,11 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
        if (conn->error) {
            /* FIXME: need to tear down send queues and random other things
             * maybe this should be abstracted */
-            xmpp_debug(ctx, "xmpp", "Send error occurred, disconnecting.");
+            strophe_debug(ctx, "xmpp", "Send error occurred, disconnecting.");
            conn->error = ECONNABORTED;
            conn_disconnect(conn);
        }
-
+next_item:
        connitem = connitem->next;
    }

@@ -191,7 +210,7 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
                FD_SET(conn->sock, &wfds);
            else {
                conn->error = ETIMEDOUT;
-                xmpp_info(ctx, "xmpp", "Connection attempt timed out.");
+                strophe_info(ctx, "xmpp", "Connection attempt timed out.");
                conn_disconnect(conn);
            }
            break;
@@ -228,8 +247,8 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
    /* select errored */
    if (ret < 0) {
        if (!sock_is_recoverable(sock_error()))
-            xmpp_error(ctx, "xmpp", "event watcher internal error %d",
-                       sock_error());
+            strophe_error(ctx, "xmpp", "event watcher internal error %d",
+                          sock_error());
        return;
    }

@@ -251,13 +270,14 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
                ret = sock_connect_error(conn->sock);
                if (ret != 0) {
                    /* connection failed */
-                    xmpp_debug(ctx, "xmpp", "connection failed, error %d", ret);
+                    strophe_debug(ctx, "xmpp", "connection failed, error %d",
+                                  ret);
                    conn_disconnect(conn);
                    break;
                }

                conn->state = XMPP_STATE_CONNECTED;
-                xmpp_debug(ctx, "xmpp", "connection successful");
+                strophe_debug(ctx, "xmpp", "connection successful");
                conn_established(conn);
            }

@@ -275,23 +295,23 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
                if (ret > 0) {
                    ret = parser_feed(conn->parser, buf, ret);
                    if (!ret) {
-                        xmpp_debug(ctx, "xmpp", "parse error [%s]", buf);
+                        strophe_debug(ctx, "xmpp", "parse error [%s]", buf);
                        xmpp_send_error(conn, XMPP_SE_INVALID_XML,
                                        "parse error");
                    }
                } else {
                    if (conn->tls) {
                        if (!tls_is_recoverable(tls_error(conn->tls))) {
-                            xmpp_debug(ctx, "xmpp",
-                                       "Unrecoverable TLS error, %d.",
-                                       tls_error(conn->tls));
+                            strophe_debug(ctx, "xmpp",
+                                          "Unrecoverable TLS error, %d.",
+                                          tls_error(conn->tls));
                            conn->error = tls_error(conn->tls);
                            conn_disconnect(conn);
                        }
                    } else {
                        /* return of 0 means socket closed by server */
-                        xmpp_debug(ctx, "xmpp",
-                                   "Socket closed by remote host.");
+                        strophe_debug(ctx, "xmpp",
+                                      "Socket closed by remote host.");
                        conn->error = ECONNRESET;
                        conn_disconnect(conn);
                    }
@@ -333,7 +353,7 @@ void xmpp_run(xmpp_ctx_t *ctx)
    /* make it possible to start event loop again */
    ctx->loop_status = XMPP_LOOP_NOTSTARTED;

-    xmpp_debug(ctx, "event", "Event loop completed.");
+    strophe_debug(ctx, "event", "Event loop completed.");
 }

 /** Stop the event loop.
@@ -346,8 +366,20 @@ void xmpp_run(xmpp_ctx_t *ctx)
 */
 void xmpp_stop(xmpp_ctx_t *ctx)
 {
-    xmpp_debug(ctx, "event", "Stopping event loop.");
+    strophe_debug(ctx, "event", "Stopping event loop.");

    if (ctx->loop_status == XMPP_LOOP_RUNNING)
        ctx->loop_status = XMPP_LOOP_QUIT;
 }
+
+/** Set the timeout to use when calling xmpp_run().
+ *
+ *  @param ctx a Strophe context object
+ *  @param timeout the time to wait for events in milliseconds
+ *
+ *  @ingroup EventLoop
+ */
+void xmpp_ctx_set_timeout(xmpp_ctx_t *ctx, unsigned long timeout)
+{
+    ctx->timeout = timeout;
+}
--- a/src/handler.c
+++ b/src/handler.c
@@ -46,6 +46,17 @@ static void _handler_item_remove(xmpp_handlist_t **head, xmpp_handlist_t *item)
    }
 }

+static void _free_handlist_item(xmpp_ctx_t *ctx, xmpp_handlist_t *item)
+{
+    if (item->u.ns)
+        strophe_free(ctx, item->u.ns);
+    if (item->u.name)
+        strophe_free(ctx, item->u.name);
+    if (item->u.type)
+        strophe_free(ctx, item->u.type);
+    strophe_free(ctx, item);
+}
+
 /** Fire off all stanza handlers that match.
 *  This function is called internally by the event loop whenever stanzas
 *  are received from the XMPP server.
@@ -53,7 +64,7 @@ static void _handler_item_remove(xmpp_handlist_t **head, xmpp_handlist_t *item)
 *  @param conn a Strophe connection object
 *  @param stanza a Strophe stanza object
 */
-void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
+void handler_fire_stanza(xmpp_conn_t *conn, xmpp_stanza_t *stanza)
 {
    xmpp_handlist_t *item, *next, *head, *head_old;
    const char *id, *ns, *name, *type;
@@ -87,8 +98,8 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
                    /* replace old value */
                    hash_add(conn->id_handlers, id, head);
                }
-                xmpp_free(conn->ctx, item->u.id);
-                xmpp_free(conn->ctx, item);
+                strophe_free(conn->ctx, item->u.id);
+                strophe_free(conn->ctx, item);
            }
            item = next;
        }
@@ -124,13 +135,7 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
            if (!ret) {
                /* handler is one-shot, so delete it */
                _handler_item_remove(&conn->handlers, item);
-                if (item->u.ns)
-                    xmpp_free(conn->ctx, item->u.ns);
-                if (item->u.name)
-                    xmpp_free(conn->ctx, item->u.name);
-                if (item->u.type)
-                    xmpp_free(conn->ctx, item->u.type);
-                xmpp_free(conn->ctx, item);
+                _free_handlist_item(conn->ctx, item);
            }
        }
        item = next;
@@ -144,7 +149,7 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
 *
 *  @return the time in milliseconds until the next handler will be ready
 */
-uint64_t handler_fire_timed(xmpp_ctx_t *const ctx)
+uint64_t handler_fire_timed(xmpp_ctx_t *ctx)
 {
    xmpp_connlist_t *connitem;
    xmpp_handlist_t *item, *next;
@@ -189,7 +194,7 @@ uint64_t handler_fire_timed(xmpp_ctx_t *const ctx)
                if (!ret) {
                    /* delete handler if it returned false */
                    _handler_item_remove(&conn->timed_handlers, item);
-                    xmpp_free(ctx, item);
+                    strophe_free(ctx, item);
                }
            } else if (min > (item->u.period - elapsed))
                min = item->u.period - elapsed;
@@ -220,7 +225,7 @@ uint64_t handler_fire_timed(xmpp_ctx_t *const ctx)
            if (!ret) {
                /* delete handler if it returned false */
                _handler_item_remove(&ctx->timed_handlers, item);
-                xmpp_free(ctx, item);
+                strophe_free(ctx, item);
            }
        } else if (min > (item->u.period - elapsed))
            min = item->u.period - elapsed;
@@ -253,16 +258,16 @@ void handler_reset_timed(xmpp_conn_t *conn, int user_only)
 static void _timed_handler_add(xmpp_ctx_t *ctx,
                               xmpp_handlist_t **handlers_list,
                               xmpp_void_handler handler,
-                               const unsigned long period,
-                               void *const userdata,
-                               const int user_handler)
+                               unsigned long period,
+                               void *userdata,
+                               int user_handler)
 {
    xmpp_handlist_t *item;

    /* check if handler is already in the list */
    for (item = *handlers_list; item; item = item->next) {
        if (item->handler == handler && item->userdata == userdata) {
-            xmpp_warn(ctx, "xmpp", "Timed handler already exists.");
+            strophe_warn(ctx, "xmpp", "Timed handler already exists.");
            break;
        }
    }
@@ -270,7 +275,7 @@ static void _timed_handler_add(xmpp_ctx_t *ctx,
        return;

    /* build new item */
-    item = xmpp_alloc(ctx, sizeof(xmpp_handlist_t));
+    item = strophe_alloc(ctx, sizeof(xmpp_handlist_t));
    if (!item)
        return;

@@ -297,7 +302,7 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,
        item = *handlers_list;
        if (item->handler == handler) {
            *handlers_list = item->next;
-            xmpp_free(ctx, item);
+            strophe_free(ctx, item);
        } else {
            handlers_list = &item->next;
        }
@@ -311,16 +316,15 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,
 *
 *  @ingroup Handlers
 */
-void xmpp_timed_handler_delete(xmpp_conn_t *const conn,
-                               xmpp_timed_handler handler)
+void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler)
 {
    _timed_handler_delete(conn->ctx, &conn->timed_handlers, handler);
 }

-static void _id_handler_add(xmpp_conn_t *const conn,
+static void _id_handler_add(xmpp_conn_t *conn,
                            xmpp_handler handler,
-                            const char *const id,
-                            void *const userdata,
+                            const char *id,
+                            void *userdata,
                            int user_handler)
 {
    xmpp_handlist_t *item, *tail;
@@ -329,7 +333,7 @@ static void _id_handler_add(xmpp_conn_t *const conn,
    item = (xmpp_handlist_t *)hash_get(conn->id_handlers, id);
    while (item) {
        if (item->handler == handler && item->userdata == userdata) {
-            xmpp_warn(conn->ctx, "xmpp", "Id handler already exists.");
+            strophe_warn(conn->ctx, "xmpp", "Id handler already exists.");
            break;
        }
        item = item->next;
@@ -338,7 +342,7 @@ static void _id_handler_add(xmpp_conn_t *const conn,
        return;

    /* build new item */
-    item = xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
+    item = strophe_alloc(conn->ctx, sizeof(xmpp_handlist_t));
    if (!item)
        return;

@@ -348,9 +352,9 @@ static void _id_handler_add(xmpp_conn_t *const conn,
    item->enabled = 0;
    item->next = NULL;

-    item->u.id = xmpp_strdup(conn->ctx, id);
+    item->u.id = strophe_strdup(conn->ctx, id);
    if (!item->u.id) {
-        xmpp_free(conn->ctx, item);
+        strophe_free(conn->ctx, item);
        return;
    }

@@ -373,9 +377,9 @@ static void _id_handler_add(xmpp_conn_t *const conn,
 *
 *  @ingroup Handlers
 */
-void xmpp_id_handler_delete(xmpp_conn_t *const conn,
+void xmpp_id_handler_delete(xmpp_conn_t *conn,
                            xmpp_handler handler,
-                            const char *const id)
+                            const char *id)
 {
    xmpp_handlist_t *item, *prev, *next;

@@ -395,8 +399,8 @@ void xmpp_id_handler_delete(xmpp_conn_t *const conn,
                hash_add(conn->id_handlers, id, next);
            }

-            xmpp_free(conn->ctx, item->u.id);
-            xmpp_free(conn->ctx, item);
+            strophe_free(conn->ctx, item->u.id);
+            strophe_free(conn->ctx, item);
            item = next;
        } else {
            prev = item;
@@ -405,13 +409,23 @@ void xmpp_id_handler_delete(xmpp_conn_t *const conn,
    }
 }

+static int _dup_string(xmpp_ctx_t *ctx, const char *src, char **dest)
+{
+    if (src) {
+        *dest = strophe_strdup(ctx, src);
+        if (!(*dest))
+            return 1;
+    }
+    return 0;
+}
+
 /* add a stanza handler */
-static void _handler_add(xmpp_conn_t *const conn,
+static void _handler_add(xmpp_conn_t *conn,
                         xmpp_handler handler,
-                         const char *const ns,
-                         const char *const name,
-                         const char *const type,
-                         void *const userdata,
+                         const char *ns,
+                         const char *name,
+                         const char *type,
+                         void *userdata,
                         int user_handler)
 {
    xmpp_handlist_t *item, *tail;
@@ -421,7 +435,7 @@ static void _handler_add(xmpp_conn_t *const conn,
        /* same handler function can process different stanzas and
           distinguish them according to userdata. */
        if (item->handler == handler && item->userdata == userdata) {
-            xmpp_warn(conn->ctx, "xmpp", "Stanza handler already exists.");
+            strophe_warn(conn->ctx, "xmpp", "Stanza handler already exists.");
            break;
        }
    }
@@ -429,47 +443,21 @@ static void _handler_add(xmpp_conn_t *const conn,
        return;

    /* build new item */
-    item = (xmpp_handlist_t *)xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
+    item = (xmpp_handlist_t *)strophe_alloc(conn->ctx, sizeof(xmpp_handlist_t));
    if (!item)
        return;

+    memset(item, 0, sizeof(*item));
    item->user_handler = user_handler;
    item->handler = handler;
    item->userdata = userdata;
-    item->enabled = 0;
-    item->next = NULL;

-    if (ns) {
-        item->u.ns = xmpp_strdup(conn->ctx, ns);
-        if (!item->u.ns) {
-            xmpp_free(conn->ctx, item);
-            return;
-        }
-    } else
-        item->u.ns = NULL;
-
-    if (name) {
-        item->u.name = xmpp_strdup(conn->ctx, name);
-        if (!item->u.name) {
-            if (item->u.ns)
-                xmpp_free(conn->ctx, item->u.ns);
-            xmpp_free(conn->ctx, item);
-            return;
-        }
-    } else
-        item->u.name = NULL;
-
-    if (type) {
-        item->u.type = xmpp_strdup(conn->ctx, type);
-        if (!item->u.type) {
-            if (item->u.ns)
-                xmpp_free(conn->ctx, item->u.ns);
-            if (item->u.name)
-                xmpp_free(conn->ctx, item->u.name);
-            xmpp_free(conn->ctx, item);
-        }
-    } else
-        item->u.type = NULL;
+    if (_dup_string(conn->ctx, ns, &item->u.ns))
+        goto error_out;
+    if (_dup_string(conn->ctx, name, &item->u.name))
+        goto error_out;
+    if (_dup_string(conn->ctx, type, &item->u.type))
+        goto error_out;

    /* append to list */
    if (!conn->handlers)
@@ -480,6 +468,11 @@ static void _handler_add(xmpp_conn_t *const conn,
            tail = tail->next;
        tail->next = item;
    }
+
+    return;
+
+error_out:
+    _free_handlist_item(conn->ctx, item);
 }

 /** Delete a stanza handler.
@@ -489,7 +482,7 @@ static void _handler_add(xmpp_conn_t *const conn,
 *
 *  @ingroup Handlers
 */
-void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler)
+void xmpp_handler_delete(xmpp_conn_t *conn, xmpp_handler handler)
 {
    xmpp_handlist_t *prev, *item;

@@ -505,13 +498,7 @@ void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler)
            else
                conn->handlers = item->next;

-            if (item->u.ns)
-                xmpp_free(conn->ctx, item->u.ns);
-            if (item->u.name)
-                xmpp_free(conn->ctx, item->u.name);
-            if (item->u.type)
-                xmpp_free(conn->ctx, item->u.type);
-            xmpp_free(conn->ctx, item);
+            _free_handlist_item(conn->ctx, item);
            item = prev ? prev->next : conn->handlers;
        } else {
            prev = item;
@@ -536,10 +523,10 @@ void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler)
 *
 *  @ingroup Handlers
 */
-void xmpp_timed_handler_add(xmpp_conn_t *const conn,
+void xmpp_timed_handler_add(xmpp_conn_t *conn,
                            xmpp_timed_handler handler,
-                            const unsigned long period,
-                            void *const userdata)
+                            unsigned long period,
+                            void *userdata)
 {
    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
                       userdata, 1);
@@ -554,10 +541,10 @@ void xmpp_timed_handler_add(xmpp_conn_t *const conn,
 *  @param period the time in milliseconds between firings
 *  @param userdata an opaque data pointer that will be passed to the handler
 */
-void handler_add_timed(xmpp_conn_t *const conn,
+void handler_add_timed(xmpp_conn_t *conn,
                       xmpp_timed_handler handler,
-                       const unsigned long period,
-                       void *const userdata)
+                       unsigned long period,
+                       void *userdata)
 {
    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
                       userdata, 0);
@@ -579,10 +566,10 @@ void handler_add_timed(xmpp_conn_t *const conn,
 *
 *  @ingroup Handlers
 */
-void xmpp_id_handler_add(xmpp_conn_t *const conn,
+void xmpp_id_handler_add(xmpp_conn_t *conn,
                         xmpp_handler handler,
-                         const char *const id,
-                         void *const userdata)
+                         const char *id,
+                         void *userdata)
 {
    _id_handler_add(conn, handler, id, userdata, 1);
 }
@@ -596,10 +583,10 @@ void xmpp_id_handler_add(xmpp_conn_t *const conn,
 *  @param id a string with the id
 *  @param userdata an opaque data pointer that will be passed to the handler
 */
-void handler_add_id(xmpp_conn_t *const conn,
+void handler_add_id(xmpp_conn_t *conn,
                    xmpp_handler handler,
-                    const char *const id,
-                    void *const userdata)
+                    const char *id,
+                    void *userdata)
 {
    _id_handler_add(conn, handler, id, userdata, 0);
 }
@@ -626,12 +613,12 @@ void handler_add_id(xmpp_conn_t *const conn,
 *
 *  @ingroup Handlers
 */
-void xmpp_handler_add(xmpp_conn_t *const conn,
+void xmpp_handler_add(xmpp_conn_t *conn,
                      xmpp_handler handler,
-                      const char *const ns,
-                      const char *const name,
-                      const char *const type,
-                      void *const userdata)
+                      const char *ns,
+                      const char *name,
+                      const char *type,
+                      void *userdata)
 {
    _handler_add(conn, handler, ns, name, type, userdata, 1);
 }
@@ -647,12 +634,12 @@ void xmpp_handler_add(xmpp_conn_t *const conn,
 *  @param type a string with the 'type' attribute value to match
 *  @param userdata an opaque data pointer that will be passed to the handler
 */
-void handler_add(xmpp_conn_t *const conn,
+void handler_add(xmpp_conn_t *conn,
                 xmpp_handler handler,
-                 const char *const ns,
-                 const char *const name,
-                 const char *const type,
-                 void *const userdata)
+                 const char *ns,
+                 const char *name,
+                 const char *type,
+                 void *userdata)
 {
    _handler_add(conn, handler, ns, name, type, userdata, 0);
 }
@@ -666,8 +653,7 @@ void handler_system_delete_all(xmpp_conn_t *conn)
 {
    xmpp_handlist_t *item, *next, *head, *head_old;
    hash_iterator_t *iter;
-    const char *key;
-    char *key2 = NULL;
+    const char *key, *key2;

    /* TODO unify all kinds of handlers and avoid copy-paste below */

@@ -676,13 +662,7 @@ void handler_system_delete_all(xmpp_conn_t *conn)
        if (!item->user_handler) {
            next = item->next;
            _handler_item_remove(&conn->handlers, item);
-            if (item->u.ns)
-                xmpp_free(conn->ctx, item->u.ns);
-            if (item->u.name)
-                xmpp_free(conn->ctx, item->u.name);
-            if (item->u.type)
-                xmpp_free(conn->ctx, item->u.type);
-            xmpp_free(conn->ctx, item);
+            _free_handlist_item(conn->ctx, item);
            item = next;
        } else
            item = item->next;
@@ -693,7 +673,7 @@ void handler_system_delete_all(xmpp_conn_t *conn)
        if (!item->user_handler) {
            next = item->next;
            _handler_item_remove(&conn->timed_handlers, item);
-            xmpp_free(conn->ctx, item);
+            strophe_free(conn->ctx, item);
            item = next;
        } else
            item = item->next;
@@ -708,26 +688,24 @@ void handler_system_delete_all(xmpp_conn_t *conn)
            if (!item->user_handler) {
                next = item->next;
                _handler_item_remove(&head, item);
-                xmpp_free(conn->ctx, item->u.id);
-                xmpp_free(conn->ctx, item);
+                strophe_free(conn->ctx, item->u.id);
+                strophe_free(conn->ctx, item);
                item = next;
            } else
                item = item->next;
        }
-        if (head != head_old)
-            key2 = xmpp_strdup(conn->ctx, key);
        /* Hash table implementation is not perfect, so we need to find next
           key before dropping current one. Otherwise, we will get access to
           freed memory. */
-        key = hash_iter_next(iter);
+        key2 = hash_iter_next(iter);
        if (head != head_old) {
            /* hash_add() replaces value if the key exists */
            if (head != NULL)
-                hash_add(conn->id_handlers, key2, head);
+                hash_add(conn->id_handlers, key, head);
            else
-                hash_drop(conn->id_handlers, key2);
-            xmpp_free(conn->ctx, key2);
+                hash_drop(conn->id_handlers, key);
        }
+        key = key2;
    }
    if (iter)
        hash_iter_release(iter);
@@ -762,10 +740,10 @@ void handler_system_delete_all(xmpp_conn_t *conn)
 *
 *  @ingroup Handlers
 */
-void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
+void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
                                   xmpp_global_timed_handler handler,
-                                   const unsigned long period,
-                                   void *const userdata)
+                                   unsigned long period,
+                                   void *userdata)
 {
    _timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1);
 }
@@ -777,7 +755,7 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
 *
 *  @ingroup Handlers
 */
-void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx,
+void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,
                                      xmpp_global_timed_handler handler)
 {
    _timed_handler_delete(ctx, &ctx->timed_handlers, handler);
--- a/src/hash.c
+++ b/src/hash.c
@@ -46,16 +46,15 @@ struct _hash_iterator_t {
 };

 /** allocate and initialize a new hash table */
-hash_t *
-hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func)
+hash_t *hash_new(xmpp_ctx_t *ctx, int size, hash_free_func free_func)
 {
    hash_t *result = NULL;

-    result = xmpp_alloc(ctx, sizeof(hash_t));
+    result = strophe_alloc(ctx, sizeof(hash_t));
    if (result != NULL) {
-        result->entries = xmpp_alloc(ctx, size * sizeof(hashentry_t *));
+        result->entries = strophe_alloc(ctx, size * sizeof(hashentry_t *));
        if (result->entries == NULL) {
-            xmpp_free(ctx, result);
+            strophe_free(ctx, result);
            return NULL;
        }
        memset(result->entries, 0, size * sizeof(hashentry_t *));
@@ -72,14 +71,14 @@ hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func)
 }

 /** obtain a new reference to an existing hash table */
-hash_t *hash_clone(hash_t *const table)
+hash_t *hash_clone(hash_t *table)
 {
    table->ref++;
    return table;
 }

 /** release a hash table that is no longer needed */
-void hash_release(hash_t *const table)
+void hash_release(hash_t *table)
 {
    xmpp_ctx_t *ctx = table->ctx;
    hashentry_t *entry, *next;
@@ -92,15 +91,15 @@ void hash_release(hash_t *const table)
            entry = table->entries[i];
            while (entry != NULL) {
                next = entry->next;
-                xmpp_free(ctx, entry->key);
+                strophe_free(ctx, entry->key);
                if (table->free)
                    table->free(ctx, entry->value);
-                xmpp_free(ctx, entry);
+                strophe_free(ctx, entry);
                entry = next;
            }
        }
-        xmpp_free(ctx, table->entries);
-        xmpp_free(ctx, table);
+        strophe_free(ctx, table->entries);
+        strophe_free(ctx, table);
    }
 }

@@ -143,7 +142,7 @@ hashentry_t *_hash_entry_find(hash_t *table, const char *key)
 *  each key can appear only once; the value of any
 *  identical key will be replaced
 */
-int hash_add(hash_t *table, const char *const key, void *data)
+int hash_add(hash_t *table, const char *key, void *data)
 {
    xmpp_ctx_t *ctx = table->ctx;
    hashentry_t *entry = NULL;
@@ -154,12 +153,12 @@ int hash_add(hash_t *table, const char *const key, void *data)

    if (entry == NULL) {
        /* allocate and fill a new entry */
-        entry = xmpp_alloc(ctx, sizeof(hashentry_t));
+        entry = strophe_alloc(ctx, sizeof(hashentry_t));
        if (!entry)
            return -1;
-        entry->key = xmpp_strdup(ctx, key);
+        entry->key = strophe_strdup(ctx, key);
        if (!entry->key) {
-            xmpp_free(ctx, entry);
+            strophe_free(ctx, entry);
            return -1;
        }
        /* insert ourselves in the linked list */
@@ -199,7 +198,7 @@ int hash_drop(hash_t *table, const char *key)
        /* traverse the linked list looking for the key */
        if (!strcmp(key, entry->key)) {
            /* match, remove the entry */
-            xmpp_free(ctx, entry->key);
+            strophe_free(ctx, entry->key);
            if (table->free)
                table->free(ctx, entry->value);
            if (prev == NULL) {
@@ -207,7 +206,7 @@ int hash_drop(hash_t *table, const char *key)
            } else {
                prev->next = entry->next;
            }
-            xmpp_free(ctx, entry);
+            strophe_free(ctx, entry);
            table->num_keys--;
            return 0;
        }
@@ -229,7 +228,7 @@ hash_iterator_t *hash_iter_new(hash_t *table)
    xmpp_ctx_t *ctx = table->ctx;
    hash_iterator_t *iter;

-    iter = xmpp_alloc(ctx, sizeof(*iter));
+    iter = strophe_alloc(ctx, sizeof(*iter));
    if (iter != NULL) {
        iter->ref = 1;
        iter->table = hash_clone(table);
@@ -249,7 +248,7 @@ void hash_iter_release(hash_iterator_t *iter)

    if (iter->ref == 0) { // ref is unsigned!!!
        hash_release(iter->table);
-        xmpp_free(ctx, iter);
+        strophe_free(ctx, iter);
    }
 }

--- a/src/hash.h
+++ b/src/hash.h
@@ -18,23 +18,22 @@

 typedef struct _hash_t hash_t;

-typedef void (*hash_free_func)(const xmpp_ctx_t *const ctx, void *p);
+typedef void (*hash_free_func)(const xmpp_ctx_t *ctx, void *p);

 /** allocate and initialize a new hash table */
-hash_t *
-hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func);
+hash_t *hash_new(xmpp_ctx_t *ctx, int size, hash_free_func free_func);

 /** allocate a new reference to an existing hash table */
-hash_t *hash_clone(hash_t *const table);
+hash_t *hash_clone(hash_t *table);

 /** release a hash table when no longer needed */
-void hash_release(hash_t *const table);
+void hash_release(hash_t *table);

 /** add a key, value pair to a hash table.
 *  each key can appear only once; the value of any
 *  identical key will be replaced
 */
-int hash_add(hash_t *table, const char *const key, void *data);
+int hash_add(hash_t *table, const char *key, void *data);

 /** look up a key in a hash table */
 void *hash_get(hash_t *table, const char *key);
--- a/src/jid.c
+++ b/src/jid.c
@@ -47,7 +47,7 @@ char *xmpp_jid_new(xmpp_ctx_t *ctx,
    len = nlen + dlen + rlen;

    /* concat components */
-    result = xmpp_alloc(ctx, len + 1);
+    result = strophe_alloc(ctx, len + 1);
    if (result != NULL) {
        if (node != NULL) {
            memcpy(result, node, nlen - 1);
@@ -77,7 +77,7 @@ char *xmpp_jid_bare(xmpp_ctx_t *ctx, const char *jid)
    size_t len;

    len = strcspn(jid, "/");
-    result = xmpp_alloc(ctx, len + 1);
+    result = strophe_alloc(ctx, len + 1);
    if (result != NULL) {
        memcpy(result, jid, len);
        result[len] = '\0';
@@ -101,7 +101,7 @@ char *xmpp_jid_node(xmpp_ctx_t *ctx, const char *jid)

    c = strchr(jid, '@');
    if (c != NULL) {
-        result = xmpp_alloc(ctx, (c - jid) + 1);
+        result = strophe_alloc(ctx, (c - jid) + 1);
        if (result != NULL) {
            memcpy(result, jid, (c - jid));
            result[c - jid] = '\0';
@@ -133,7 +133,7 @@ char *xmpp_jid_domain(xmpp_ctx_t *ctx, const char *jid)
        c++;
    }
    dlen = strcspn(c, "/"); /* do not include resource */
-    result = xmpp_alloc(ctx, dlen + 1);
+    result = strophe_alloc(ctx, dlen + 1);
    if (result != NULL) {
        memcpy(result, c, dlen);
        result[dlen] = '\0';
@@ -155,5 +155,5 @@ char *xmpp_jid_resource(xmpp_ctx_t *ctx, const char *jid)
    const char *c;

    c = strchr(jid, '/');
-    return c != NULL ? xmpp_strdup(ctx, c + 1) : NULL;
+    return c != NULL ? strophe_strdup(ctx, c + 1) : NULL;
 }
--- a/src/parser.h
+++ b/src/parser.h
@@ -20,12 +20,9 @@

 typedef struct _parser_t parser_t;

-typedef void (*parser_start_callback)(char *name,
-                                      char **attrs,
-                                      void *const userdata);
-typedef void (*parser_end_callback)(char *name, void *const userdata);
-typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza,
-                                       void *const userdata);
+typedef void (*parser_start_callback)(char *name, char **attrs, void *userdata);
+typedef void (*parser_end_callback)(char *name, void *userdata);
+typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza, void *userdata);

 parser_t *parser_new(xmpp_ctx_t *ctx,
                     parser_start_callback startcb,
--- a/src/parser_expat.c
+++ b/src/parser_expat.c
@@ -60,7 +60,7 @@ static xmpp_ctx_t *mem_ctx = NULL;
 static void *parser_mem_malloc(size_t size)
 {
    if (mem_ctx != NULL)
-        return xmpp_alloc(mem_ctx, size);
+        return strophe_alloc(mem_ctx, size);
    else
        return NULL;
 }
@@ -68,7 +68,7 @@ static void *parser_mem_malloc(size_t size)
 static void *parser_mem_realloc(void *ptr, size_t size)
 {
    if (mem_ctx != NULL)
-        return xmpp_realloc(mem_ctx, ptr, size);
+        return strophe_realloc(mem_ctx, ptr, size);
    else
        return NULL;
 }
@@ -76,7 +76,7 @@ static void *parser_mem_realloc(void *ptr, size_t size)
 static void parser_mem_free(void *ptr)
 {
    if (mem_ctx != NULL)
-        xmpp_free(mem_ctx, ptr);
+        strophe_free(mem_ctx, ptr);
 }

 static const XML_Memory_Handling_Suite parser_mem_suite = {
@@ -95,11 +95,11 @@ static char *_xml_name(xmpp_ctx_t *ctx, const char *nsname)

    c = strchr(nsname, namespace_sep);
    if (c == NULL)
-        return xmpp_strdup(ctx, nsname);
+        return strophe_strdup(ctx, nsname);

    c++;
    len = strlen(c);
-    result = xmpp_alloc(ctx, len + 1);
+    result = strophe_alloc(ctx, len + 1);
    if (result != NULL) {
        memcpy(result, c, len);
        result[len] = '\0';
@@ -116,7 +116,7 @@ static char *_xml_namespace(xmpp_ctx_t *ctx, const char *nsname)

    c = strchr(nsname, namespace_sep);
    if (c != NULL) {
-        result = xmpp_alloc(ctx, (c - nsname) + 1);
+        result = strophe_alloc(ctx, (c - nsname) + 1);
        if (result != NULL) {
            memcpy(result, nsname, (c - nsname));
            result[c - nsname] = '\0';
@@ -138,7 +138,7 @@ static void _set_attributes(xmpp_stanza_t *stanza, const XML_Char **attrs)
        /* namespaced attributes aren't used in xmpp, discard namespace */
        attr = _xml_name(stanza->ctx, attrs[i]);
        xmpp_stanza_set_attribute(stanza, attr, attrs[i + 1]);
-        xmpp_free(stanza->ctx, attr);
+        strophe_free(stanza->ctx, attr);
    }
 }

@@ -155,7 +155,7 @@ static void complete_inner_text(parser_t *parser)
            xmpp_stanza_add_child(parser->stanza, stanza);
            xmpp_stanza_release(stanza);
        }
-        xmpp_free(parser->ctx, parser->inner_text);
+        strophe_free(parser->ctx, parser->inner_text);
        parser->inner_text = NULL;
        parser->inner_text_size = 0;
        parser->inner_text_used = 0;
@@ -181,7 +181,8 @@ _start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
        if (!parser->stanza && parser->depth != 1) {
            /* something terrible happened */
            /* FIXME: shutdown disconnect */
-            xmpp_error(parser->ctx, "parser", "oops, where did our stanza go?");
+            strophe_error(parser->ctx, "parser",
+                          "oops, where did our stanza go?");
        } else {
            child = xmpp_stanza_new(parser->ctx);
            if (!child) {
@@ -202,9 +203,9 @@ _start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
    }

    if (ns)
-        xmpp_free(parser->ctx, ns);
+        strophe_free(parser->ctx, ns);
    if (name)
-        xmpp_free(parser->ctx, name);
+        strophe_free(parser->ctx, name);

    parser->depth++;
 }
@@ -246,10 +247,10 @@ static void _characters(void *userdata, const XML_Char *s, int len)
    if (parser->inner_text_used + len >= parser->inner_text_size) {
        parser->inner_text_size =
            parser->inner_text_used + len + 1 + INNER_TEXT_PADDING;
-        p = xmpp_realloc(parser->ctx, parser->inner_text,
-                         parser->inner_text_size);
+        p = strophe_realloc(parser->ctx, parser->inner_text,
+                            parser->inner_text_size);
        if (p == NULL) {
-            xmpp_free(parser->ctx, parser->inner_text);
+            strophe_free(parser->ctx, parser->inner_text);
            parser->inner_text = NULL;
            parser->inner_text_used = 0;
            parser->inner_text_size = 0;
@@ -270,7 +271,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
 {
    parser_t *parser;

-    parser = xmpp_alloc(ctx, sizeof(parser_t));
+    parser = strophe_alloc(ctx, sizeof(parser_t));
    if (parser != NULL) {
        parser->ctx = ctx;
        parser->expat = NULL;
@@ -295,18 +296,32 @@ char *parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
    return _xml_name(ctx, nsname);
 }

+static void _free_parent_stanza(xmpp_stanza_t *stanza)
+{
+    xmpp_stanza_t *parent;
+
+    for (parent = stanza; parent->parent != NULL; parent = parent->parent)
+        ;
+    xmpp_stanza_release(parent);
+}
+
 /* free a parser */
 void parser_free(parser_t *parser)
 {
    if (parser->expat)
        XML_ParserFree(parser->expat);

+    if (parser->stanza) {
+        _free_parent_stanza(parser->stanza);
+        parser->stanza = NULL;
+    }
+
    if (parser->inner_text) {
-        xmpp_free(parser->ctx, parser->inner_text);
+        strophe_free(parser->ctx, parser->inner_text);
        parser->inner_text = NULL;
    }

-    xmpp_free(parser->ctx, parser);
+    strophe_free(parser->ctx, parser);
 }

 /* shuts down and restarts XML parser.  true on success */
@@ -330,12 +345,12 @@ int parser_reset(parser_t *parser)
    }

    if (parser->stanza) {
-        xmpp_stanza_release(parser->stanza);
+        _free_parent_stanza(parser->stanza);
        parser->stanza = NULL;
    }

    if (parser->inner_text) {
-        xmpp_free(parser->ctx, parser->inner_text);
+        strophe_free(parser->ctx, parser->inner_text);
        parser->inner_text = NULL;
    }

--- a/src/parser_libxml2.c
+++ b/src/parser_libxml2.c
@@ -48,12 +48,12 @@ _set_attributes(xmpp_stanza_t *stanza, int nattrs, const xmlChar **attrs)
    /* SAX2 uses array of localname/prefix/uri/value_begin/value_end */
    for (i = 0; i < nattrs * 5; i += 5) {
        len = attrs[i + 4] - attrs[i + 3];
-        value = xmpp_alloc(stanza->ctx, len + 1);
+        value = strophe_alloc(stanza->ctx, len + 1);
        if (value) {
            memcpy(value, attrs[i + 3], len);
            value[len] = '\0';
            xmpp_stanza_set_attribute(stanza, (const char *)attrs[i], value);
-            xmpp_free(stanza->ctx, value);
+            strophe_free(stanza->ctx, value);
        }
    }
 }
@@ -70,7 +70,7 @@ _convert_attrs(parser_t *parser, int nattrs, const xmlChar **attrs)
    if (!attrs)
        return NULL;

-    ret = xmpp_alloc(parser->ctx, (nattrs + 1) * 2 * sizeof(char *));
+    ret = strophe_alloc(parser->ctx, (nattrs + 1) * 2 * sizeof(char *));
    if (!ret)
        return NULL;
    memset(ret, 0, (nattrs + 1) * 2 * sizeof(char *));
@@ -80,11 +80,11 @@ _convert_attrs(parser_t *parser, int nattrs, const xmlChar **attrs)
        o = c * 2;

        len = attrs[i + 4] - attrs[i + 3];
-        value = xmpp_alloc(parser->ctx, len + 1);
+        value = strophe_alloc(parser->ctx, len + 1);
        if (value) {
            memcpy(value, attrs[i + 3], len);
            value[len] = '\0';
-            ret[o] = xmpp_strdup(parser->ctx, (char *)attrs[i]);
+            ret[o] = strophe_strdup(parser->ctx, (char *)attrs[i]);
            ret[o + 1] = value;
        }
    }
@@ -101,12 +101,12 @@ static void _free_cbattrs(parser_t *parser, char **attrs)

    for (i = 0; attrs[i]; i += 2) {
        if (attrs[i])
-            xmpp_free(parser->ctx, attrs[i]);
+            strophe_free(parser->ctx, attrs[i]);
        if (attrs[i + 1])
-            xmpp_free(parser->ctx, attrs[i + 1]);
+            strophe_free(parser->ctx, attrs[i + 1]);
    }

-    xmpp_free(parser->ctx, attrs);
+    strophe_free(parser->ctx, attrs);
 }

 static void _start_element(void *userdata,
@@ -140,7 +140,8 @@ static void _start_element(void *userdata,
        if (!parser->stanza && parser->depth != 1) {
            /* something terrible happened */
            /* FIXME: we should probably trigger a disconnect */
-            xmpp_error(parser->ctx, "parser", "oops, where did our stanza go?");
+            strophe_error(parser->ctx, "parser",
+                          "oops, where did our stanza go?");
        } else if (!parser->stanza) {
            /* starting a new toplevel stanza */
            parser->stanza = xmpp_stanza_new(parser->ctx);
@@ -235,7 +236,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
 {
    parser_t *parser;

-    parser = xmpp_alloc(ctx, sizeof(parser_t));
+    parser = strophe_alloc(ctx, sizeof(parser_t));
    if (parser != NULL) {
        parser->ctx = ctx;
        parser->xmlctx = NULL;
@@ -259,7 +260,16 @@ parser_t *parser_new(xmpp_ctx_t *ctx,

 char *parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
 {
-    return xmpp_strdup(ctx, nsname);
+    return strophe_strdup(ctx, nsname);
+}
+
+static void _free_parent_stanza(xmpp_stanza_t *stanza)
+{
+    xmpp_stanza_t *parent;
+
+    for (parent = stanza; parent->parent != NULL; parent = parent->parent)
+        ;
+    xmpp_stanza_release(parent);
 }

 /* free a parser */
@@ -268,8 +278,8 @@ void parser_free(parser_t *parser)
    if (parser->xmlctx)
        xmlFreeParserCtxt(parser->xmlctx);
    if (parser->stanza)
-        xmpp_stanza_release(parser->stanza);
-    xmpp_free(parser->ctx, parser);
+        _free_parent_stanza(parser->stanza);
+    strophe_free(parser->ctx, parser);
 }

 /* shuts down and restarts XML parser.  true on success */
@@ -278,7 +288,7 @@ int parser_reset(parser_t *parser)
    if (parser->xmlctx)
        xmlFreeParserCtxt(parser->xmlctx);
    if (parser->stanza)
-        xmpp_stanza_release(parser->stanza);
+        _free_parent_stanza(parser->stanza);

    parser->stanza = NULL;
    parser->depth = 0;
--- a/src/rand.c
+++ b/src/rand.c
@@ -23,12 +23,24 @@
 #include <string.h> /* memeset */
 #include <time.h>   /* clock, time */

-#include "common.h"  /* xmpp_alloc, xmpp_free */
-#include "ostypes.h" /* uint8_t, uint32_t, size_t */
-#include "sha1.h"
-#include "snprintf.h" /* xmpp_snprintf */
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif

-#include "rand.h" /* xmpp_rand_t */
+#if !defined(DONT_USE_GETRANDOM) && defined(__linux__) && \
+    defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 25)
+#define USE_GETRANDOM
+#include <sys/random.h>
+#include <errno.h>
+#endif
+#endif
+
+#include "common.h"  /* strophe_alloc, strophe_free */
+#include "ostypes.h" /* uint8_t, uint32_t, size_t */
+
+#ifndef USE_GETRANDOM
+#include "sha1.h"

 #define outlen SHA1_DIGEST_SIZE
 #define seedlen (440 / 8)
@@ -261,7 +273,7 @@ static void xmpp_rand_reseed(xmpp_rand_t *rand)

 xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx)
 {
-    xmpp_rand_t *out = xmpp_alloc(ctx, sizeof(*out));
+    xmpp_rand_t *out = strophe_alloc(ctx, sizeof(*out));
    if (out != NULL) {
        memset(out, 0, sizeof(*out));
    }
@@ -270,21 +282,72 @@ xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx)

 void xmpp_rand_free(xmpp_ctx_t *ctx, xmpp_rand_t *rand)
 {
-    xmpp_free(ctx, rand);
+    strophe_free(ctx, rand);
 }

 void xmpp_rand_bytes(xmpp_rand_t *rand, unsigned char *output, size_t len)
 {
    int rc;
-
-    rc = Hash_DRBG_Generate(&rand->ctx, (uint8_t *)output, len);
-    if (rc == RESEED_NEEDED) {
-        xmpp_rand_reseed(rand);
-        rc = Hash_DRBG_Generate(&rand->ctx, (uint8_t *)output, len);
-        assert(rc == 0);
+    size_t gen, tot = 0;
+    while (tot < len) {
+        gen = len - tot;
+        if (gen > GENERATE_MAX)
+            gen = GENERATE_MAX;
+        rc = Hash_DRBG_Generate(&rand->ctx, (uint8_t *)output + tot, gen);
+        if (rc == RESEED_NEEDED) {
+            xmpp_rand_reseed(rand);
+            rc = Hash_DRBG_Generate(&rand->ctx, (uint8_t *)output + tot, gen);
+            assert(rc == 0);
+        }
+        tot += gen;
    }
 }

+#else
+
+static int _read_getrandom(void *p, size_t n)
+{
+    unsigned char *q = (unsigned char *)p;
+    while (n > 0u) {
+        ssize_t ret = getrandom(q, n, 0);
+        if (ret < 0) {
+            if (errno == EINTR) {
+                continue;
+            }
+            return 1;
+        }
+        q += ret;
+        n -= (size_t)ret;
+    }
+    return 0;
+}
+
+struct _xmpp_rand_t {
+    char nothing;
+};
+
+static xmpp_rand_t _xmpp_rand;
+
+xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx)
+{
+    UNUSED(ctx);
+    return &_xmpp_rand;
+}
+
+void xmpp_rand_free(xmpp_ctx_t *ctx, xmpp_rand_t *rand)
+{
+    UNUSED(ctx);
+    assert(rand == &_xmpp_rand);
+}
+
+void xmpp_rand_bytes(xmpp_rand_t *rand, unsigned char *output, size_t len)
+{
+    assert(rand == &_xmpp_rand);
+    assert(_read_getrandom(output, len) == 0);
+}
+
+#endif
+
 int xmpp_rand(xmpp_rand_t *rand)
 {
    int result;
--- a/src/rand.h
+++ b/src/rand.h
@@ -1,65 +0,0 @@
-/* rand.h
- * strophe XMPP client library -- pseudo-random number generator
- *
- * Copyright (C) 2014 Dmitry Podgorny <pasis.ua@gmail.com>
- *
- *  This software is provided AS-IS with no warranty, either express
- *  or implied.
- *
- *  This program is dual licensed under the MIT and GPLv3 licenses.
- */
-
-/** @file
- *  Pseudo-random number generator.
- */
-
-#ifndef __LIBSTROPHE_RAND_H__
-#define __LIBSTROPHE_RAND_H__
-
-#include <stddef.h>  /* size_t */
-#include "strophe.h" /* xmpp_ctx_t */
-
-typedef struct _xmpp_rand_t xmpp_rand_t;
-
-/** Create new xmpp_rand_t object.
- *
- *  @param ctx A Strophe context object
- *
- *  @ingroup Random
- */
-xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx);
-/** Destroy an xmpp_rand_t object.
- *
- *  @param ctx A Strophe context object
- *
- *  @ingroup Random
- */
-void xmpp_rand_free(xmpp_ctx_t *ctx, xmpp_rand_t *rand);
-
-/** Generate random integer.
- *  Analogue of rand(3).
- *
- *  @ingroup Random
- */
-int xmpp_rand(xmpp_rand_t *rand);
-
-/** Generate random bytes.
- *  Generates len bytes and stores them to the output buffer.
- *
- *  @ingroup Random
- */
-void xmpp_rand_bytes(xmpp_rand_t *rand, unsigned char *output, size_t len);
-
-/** Generate a nonce that is printable randomized string.
- *  This function doesn't allocate memory and doesn't fail.
- *
- *  @param output A buffer where a NULL-terminated string will be placed.
- *                The string will contain len-1 printable symbols.
- *  @param len Number of bytes reserved for the output string, including
- *             end of line '\0'.
- *
- *  @ingroup Random
- */
-void xmpp_rand_nonce(xmpp_rand_t *rand, char *output, size_t len);
-
-#endif /* __LIBSTROPHE_RAND_H__ */
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -179,8 +179,8 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx,
    (void)buf;
    (void)len;

-    xmpp_snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s", service, proto,
-                  domain);
+    strophe_snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s", service,
+                     proto, domain);

    *srv_rr_list = NULL;

@@ -196,7 +196,7 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx,
        return set;
 #endif /* _WIN32 */

-    buf = xmpp_alloc(ctx, RESOLVER_BUF_MAX);
+    buf = strophe_alloc(ctx, RESOLVER_BUF_MAX);
    if (buf == NULL)
        return XMPP_DOMAIN_NOT_FOUND;

@@ -210,7 +210,7 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx,
    if (len > 0)
        set = resolver_srv_lookup_buf(ctx, buf, (size_t)len, srv_rr_list);

-    xmpp_free(ctx, buf);
+    strophe_free(ctx, buf);

 #endif /* HAVE_CARES */

@@ -223,7 +223,7 @@ void resolver_srv_free(xmpp_ctx_t *ctx, resolver_srv_rr_t *srv_rr_list)

    while (srv_rr_list != NULL) {
        rr = srv_rr_list->next;
-        xmpp_free(ctx, srv_rr_list);
+        strophe_free(ctx, srv_rr_list);
        srv_rr_list = rr;
    }
 }
@@ -321,6 +321,9 @@ static unsigned message_name_get(const unsigned char *buf,
            if (i >= buf_len)
                return 0;
            pointer = (label_len & 0x3f) << 8 | buf[i++];
+            /* Prevent infinite looping */
+            if (pointer >= buf_offset)
+                return 0;
            if (name != NULL && name_len >= name_max && name_max > 0) {
                /* We have filled the name buffer. Don't pass it recursively. */
                name[name_max - 1] = '\0';
@@ -431,7 +434,7 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
        rdlength = xmpp_ntohs_ptr(&buf[j + 8]);
        j += 10;
        if (type == MESSAGE_T_SRV && class == MESSAGE_C_IN) {
-            rr = xmpp_alloc(ctx, sizeof(*rr));
+            rr = strophe_alloc(ctx, sizeof(*rr));
            rr->next = *srv_rr_list;
            rr->priority = xmpp_ntohs_ptr(&buf[j]);
            rr->weight = xmpp_ntohs_ptr(&buf[j + 2]);
@@ -441,7 +444,7 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
            if (name_len > 0)
                *srv_rr_list = rr;
            else
-                xmpp_free(ctx, rr); /* skip broken record */
+                strophe_free(ctx, rr); /* skip broken record */
        }
        j += rdlength;
    }
@@ -480,7 +483,7 @@ static int resolver_ares_srv_lookup_buf(xmpp_ctx_t *ctx,

    item = srv;
    while (item != NULL) {
-        rr = xmpp_alloc(ctx, sizeof(*rr));
+        rr = strophe_alloc(ctx, sizeof(*rr));
        if (rr == NULL)
            break;
        rr->next = *srv_rr_list;
@@ -705,15 +708,15 @@ static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx,

                while (current) {
                    if (current->wType == DNS_TYPE_SRV) {
-                        rr = xmpp_alloc(ctx, sizeof(*rr));
+                        rr = strophe_alloc(ctx, sizeof(*rr));
                        if (rr == NULL)
                            break;
                        rr->next = *srv_rr_list;
                        rr->port = current->Data.Srv.wPort;
                        rr->priority = current->Data.Srv.wPriority;
                        rr->weight = current->Data.Srv.wWeight;
-                        xmpp_snprintf(rr->target, sizeof(rr->target), "%s",
-                                      current->Data.Srv.pNameTarget);
+                        strophe_snprintf(rr->target, sizeof(rr->target), "%s",
+                                         current->Data.Srv.pNameTarget);
                        *srv_rr_list = rr;
                    }
                    current = current->pNext;
--- a/src/sasl.c
+++ b/src/sasl.c
@@ -22,7 +22,6 @@
 #include "sasl.h"
 #include "md5.h"
 #include "scram.h"
-#include "rand.h"
 #include "util.h"

 /* strtok_s() has appeared in visual studio 2005.
@@ -49,14 +48,14 @@ char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password)
    idlen = strlen(authid);
    passlen = strlen(password);
    msglen = 2 + idlen + passlen;
-    msg = xmpp_alloc(ctx, msglen);
+    msg = strophe_alloc(ctx, msglen);
    if (msg != NULL) {
        msg[0] = '\0';
        memcpy(msg + 1, authid, idlen);
        msg[1 + idlen] = '\0';
        memcpy(msg + 1 + idlen + 1, password, passlen);
        result = xmpp_base64_encode(ctx, (unsigned char *)msg, msglen);
-        xmpp_free(ctx, msg);
+        strophe_free(ctx, msg);
    }

    return result;
@@ -65,11 +64,11 @@ char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password)
 /** helpers for digest auth */

 /* create a new, null-terminated string from a substring */
-static char *_make_string(xmpp_ctx_t *ctx, const char *s, const unsigned len)
+static char *_make_string(xmpp_ctx_t *ctx, const char *s, unsigned len)
 {
    char *result;

-    result = xmpp_alloc(ctx, len + 1);
+    result = strophe_alloc(ctx, len + 1);
    if (result != NULL) {
        memcpy(result, s, len);
        result[len] = '\0';
@@ -83,7 +82,7 @@ static char *_make_quoted(xmpp_ctx_t *ctx, const char *s)
    char *result;
    size_t len = strlen(s);

-    result = xmpp_alloc(ctx, len + 3);
+    result = strophe_alloc(ctx, len + 3);
    if (result != NULL) {
        result[0] = '"';
        memcpy(result + 1, s, len);
@@ -103,11 +102,11 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)

    text = (unsigned char *)xmpp_base64_decode_str(ctx, msg, strlen(msg));
    if (text == NULL) {
-        xmpp_error(ctx, "SASL", "couldn't Base64 decode challenge!");
+        strophe_error(ctx, "SASL", "couldn't Base64 decode challenge!");
        return NULL;
    }

-    result = hash_new(ctx, 10, xmpp_free);
+    result = hash_new(ctx, 10, strophe_free);
    if (result != NULL) {
        s = text;
        while (*s != '\0') {
@@ -145,16 +144,16 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
                s = t;
            }
            if (value == NULL) {
-                xmpp_free(ctx, key);
+                strophe_free(ctx, key);
                break;
            }
            /* TODO: check for collisions per spec */
            hash_add(result, key, value);
            /* hash table now owns the value, free the key */
-            xmpp_free(ctx, key);
+            strophe_free(ctx, key);
        }
    }
-    xmpp_free(ctx, text);
+    strophe_free(ctx, text);

    return result;
 }
@@ -182,7 +181,7 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)

    /* allocate a zero-length string if necessary */
    if (buf == NULL) {
-        buf = xmpp_alloc(ctx, 1);
+        buf = strophe_alloc(ctx, 1);
        buf[0] = '\0';
    }
    if (buf == NULL)
@@ -192,7 +191,7 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
    olen = strlen(buf);
    value = hash_get(table, key);
    if (value == NULL) {
-        xmpp_error(ctx, "SASL", "couldn't retrieve value for '%s'", key);
+        strophe_error(ctx, "SASL", "couldn't retrieve value for '%s'", key);
        value = "";
    }
    if (quote) {
@@ -205,7 +204,7 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
    keylen = strlen(key);
    valuelen = strlen(qvalue);
    nlen = (olen ? 1 : 0) + keylen + 1 + valuelen + 1;
-    buf = xmpp_realloc(ctx, buf, olen + nlen);
+    buf = strophe_realloc(ctx, buf, olen + nlen);

    if (buf != NULL) {
        c = buf + olen;
@@ -220,7 +219,7 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
    }

    if (quote)
-        xmpp_free(ctx, (char *)qvalue);
+        strophe_free(ctx, (char *)qvalue);

    return buf;
 }
@@ -255,7 +254,7 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
    /* parse the challenge */
    table = _parse_digest_challenge(ctx, challenge);
    if (table == NULL) {
-        xmpp_error(ctx, "SASL", "couldn't parse digest challenge");
+        strophe_error(ctx, "SASL", "couldn't parse digest challenge");
        return NULL;
    }

@@ -266,18 +265,18 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
       server */
    realm = hash_get(table, "realm");
    if (realm == NULL || strlen(realm) == 0) {
-        hash_add(table, "realm", xmpp_strdup(ctx, domain));
+        hash_add(table, "realm", strophe_strdup(ctx, domain));
        realm = hash_get(table, "realm");
    }

    /* add our response fields */
-    hash_add(table, "username", xmpp_strdup(ctx, node));
+    hash_add(table, "username", strophe_strdup(ctx, node));
    xmpp_rand_nonce(ctx->rand, cnonce, sizeof(cnonce));
-    hash_add(table, "cnonce", xmpp_strdup(ctx, cnonce));
-    hash_add(table, "nc", xmpp_strdup(ctx, "00000001"));
+    hash_add(table, "cnonce", strophe_strdup(ctx, cnonce));
+    hash_add(table, "nc", strophe_strdup(ctx, "00000001"));
    if (hash_get(table, "qop") == NULL)
-        hash_add(table, "qop", xmpp_strdup(ctx, "auth"));
-    value = xmpp_alloc(ctx, 5 + strlen(domain) + 1);
+        hash_add(table, "qop", strophe_strdup(ctx, "auth"));
+    value = strophe_alloc(ctx, 5 + strlen(domain) + 1);
    memcpy(value, "xmpp/", 5);
    memcpy(value + 5, domain, strlen(domain));
    value[5 + strlen(domain)] = '\0';
@@ -343,7 +342,7 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
    MD5Update(&MD5, (unsigned char *)hex, 32);
    MD5Final(digest, &MD5);

-    response = xmpp_alloc(ctx, 32 + 1);
+    response = strophe_alloc(ctx, 32 + 1);
    _digest_to_hex((char *)digest, hex);
    memcpy(response, hex, 32);
    response[32] = '\0';
@@ -361,13 +360,13 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
    result = _add_key(ctx, table, "response", result, 0);
    result = _add_key(ctx, table, "charset", result, 0);

-    xmpp_free(ctx, node);
-    xmpp_free(ctx, domain);
+    strophe_free(ctx, node);
+    strophe_free(ctx, domain);
    hash_release(table); /* also frees value strings */

    /* reuse response for the base64 encode of our result */
    response = xmpp_base64_encode(ctx, (unsigned char *)result, strlen(result));
-    xmpp_free(ctx, result);
+    strophe_free(ctx, result);

    return response;
 }
@@ -401,7 +400,7 @@ char *sasl_scram(xmpp_ctx_t *ctx,

    UNUSED(jid);

-    tmp = xmpp_strdup(ctx, challenge);
+    tmp = strophe_strdup(ctx, challenge);
    if (!tmp) {
        return NULL;
    }
@@ -429,21 +428,21 @@ char *sasl_scram(xmpp_ctx_t *ctx,
    ival = strtol(i, &saveptr, 10);

    auth_len = 10 + strlen(r) + strlen(first_bare) + strlen(challenge);
-    auth = xmpp_alloc(ctx, auth_len);
+    auth = strophe_alloc(ctx, auth_len);
    if (!auth) {
        goto out_sval;
    }

    /* "c=biws," + r + ",p=" + sign_b64 + '\0' */
    response_len = 7 + strlen(r) + 3 + ((alg->digest_size + 2) / 3 * 4) + 1;
-    response = xmpp_alloc(ctx, response_len);
+    response = strophe_alloc(ctx, response_len);
    if (!response) {
        goto out_auth;
    }

-    xmpp_snprintf(response, response_len, "c=biws,%s", r);
-    xmpp_snprintf(auth, auth_len, "%s,%s,%s", first_bare + 3, challenge,
-                  response);
+    strophe_snprintf(response, response_len, "c=biws,%s", r);
+    strophe_snprintf(auth, auth_len, "%s,%s,%s", first_bare + 3, challenge,
+                     response);

    SCRAM_ClientKey(alg, (uint8_t *)password, strlen(password), (uint8_t *)sval,
                    sval_len, (uint32_t)ival, key);
@@ -457,12 +456,12 @@ char *sasl_scram(xmpp_ctx_t *ctx,

    /* Check for buffer overflow */
    if (strlen(response) + strlen(sign_b64) + 3 + 1 > response_len) {
-        xmpp_free(ctx, sign_b64);
+        strophe_free(ctx, sign_b64);
        goto out_response;
    }
    strcat(response, ",p=");
    strcat(response, sign_b64);
-    xmpp_free(ctx, sign_b64);
+    strophe_free(ctx, sign_b64);

    response_b64 =
        xmpp_base64_encode(ctx, (unsigned char *)response, strlen(response));
@@ -472,12 +471,12 @@ char *sasl_scram(xmpp_ctx_t *ctx,
    result = response_b64;

 out_response:
-    xmpp_free(ctx, response);
+    strophe_free(ctx, response);
 out_auth:
-    xmpp_free(ctx, auth);
+    strophe_free(ctx, auth);
 out_sval:
-    xmpp_free(ctx, sval);
+    strophe_free(ctx, sval);
 out:
-    xmpp_free(ctx, tmp);
+    strophe_free(ctx, tmp);
    return result;
 }
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -206,9 +206,7 @@ void crypto_SHA1_Init(SHA1_CTX *context)
 }

 /* Run your data through this. */
-void crypto_SHA1_Update(SHA1_CTX *context,
-                        const uint8_t *data,
-                        const size_t len)
+void crypto_SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
 {
    size_t i, j;

--- a/src/sha1.h
+++ b/src/sha1.h
@@ -24,9 +24,7 @@ typedef struct {
 #define SHA1_DIGEST_SIZE 20

 void crypto_SHA1_Init(SHA1_CTX *context);
-void crypto_SHA1_Update(SHA1_CTX *context,
-                        const uint8_t *data,
-                        const size_t len);
+void crypto_SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len);
 void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest);
 void crypto_SHA1(const uint8_t *data, size_t len, uint8_t *digest);

--- a/src/snprintf.c
+++ b/src/snprintf.c
@@ -61,7 +61,7 @@

 /* JAM: we don't need this - #include "config.h" */

-/* JAM: changed declarations to xmpp_snprintf and xmpp_vsnprintf to
+/* JAM: changed declarations to strophe_snprintf and strophe_vsnprintf to
   avoid namespace collision. */

 #include "snprintf.h"
@@ -706,7 +706,7 @@ static int dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
    return 1;
 }

-int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list args)
+int strophe_vsnprintf(char *str, size_t count, const char *fmt, va_list args)
 {
    if (str != NULL && count > 0)
        str[0] = 0;
@@ -716,13 +716,13 @@ int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list args)

 #ifndef HAVE_SNPRINTF
 /* VARARGS3 */
-int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
+int strophe_snprintf(char *str, size_t count, const char *fmt, ...)
 {
    VA_LOCAL_DECL;
    int total;

    VA_START(fmt);
-    total = xmpp_vsnprintf(str, count, fmt, ap);
+    total = strophe_vsnprintf(str, count, fmt, ap);
    VA_END;
    return total;
 }
--- a/src/snprintf.h
+++ b/src/snprintf.h
@@ -20,15 +20,15 @@
 #endif

 #ifdef HAVE_SNPRINTF
-#define xmpp_snprintf snprintf
+#define strophe_snprintf snprintf
 #else
-int xmpp_snprintf(char *str, size_t count, const char *fmt, ...);
+int strophe_snprintf(char *str, size_t count, const char *fmt, ...);
 #endif

 #ifdef HAVE_VSNPRINTF
-#define xmpp_vsnprintf vsnprintf
+#define strophe_vsnprintf vsnprintf
 #else
-int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
+int strophe_vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
 #endif

 #endif /* __LIBSTROPHE_SNPRINTF_H__ */
--- a/src/sock.c
+++ b/src/sock.c
@@ -33,8 +33,7 @@
 #include <fcntl.h>
 #endif

-#include "sock.h"
-#include "snprintf.h"
+#include "common.h"

 void sock_initialize(void)
 {
@@ -69,14 +68,14 @@ static int _in_progress(int error)
 #endif
 }

-sock_t sock_connect(const char *const host, const unsigned short port)
+sock_t sock_connect(xmpp_conn_t *conn, const char *host, unsigned short port)
 {
    sock_t sock;
    char service[6];
    struct addrinfo *res, *ainfo, hints;
    int err;

-    xmpp_snprintf(service, 6, "%u", port);
+    strophe_snprintf(service, 6, "%u", port);

    memset(&hints, 0, sizeof(struct addrinfo));
    hints.ai_family = AF_UNSPEC;
@@ -95,6 +94,14 @@ sock_t sock_connect(const char *const host, const unsigned short port)
        if (sock < 0)
            continue;

+        if (conn->sockopt_cb != NULL)
+            err = (conn->sockopt_cb)(conn, &sock);
+
+        if (err != 0) {
+            sock_close(sock);
+            continue;
+        }
+
        err = sock_set_nonblocking(sock);
        if (err == 0) {
            err = connect(sock, ainfo->ai_addr, ainfo->ai_addrlen);
@@ -109,12 +116,17 @@ sock_t sock_connect(const char *const host, const unsigned short port)
    return sock;
 }

-int sock_set_keepalive(const sock_t sock, int timeout, int interval)
+int sock_set_keepalive(sock_t sock,
+                       int timeout,
+                       int interval,
+                       int count,
+                       unsigned int user_timeout)
 {
    int ret;
    int optval = (timeout && interval) ? 1 : 0;

-    /* This function doesn't change maximum number of keepalive probes */
+    UNUSED(count);
+    UNUSED(user_timeout);

 #ifdef _WIN32
    struct tcp_keepalive ka;
@@ -149,12 +161,58 @@ int sock_set_keepalive(const sock_t sock, int timeout, int interval)
            return ret;
 #endif /* TCP_KEEPINTVL */
    }
+
+    if (count) {
+#ifdef TCP_KEEPCNT
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count));
+        if (ret < 0)
+            return ret;
+#endif /* TCP_KEEPCNT */
+    }
+
+    if (user_timeout) {
+#ifdef TCP_USER_TIMEOUT
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_USER_TIMEOUT, &user_timeout,
+                         sizeof(user_timeout));
+        if (ret < 0)
+            return ret;
+#elif defined(TCP_RXT_CONNDROPTIME)
+        int rxt = user_timeout / 1000;
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_RXT_CONNDROPTIME, &rxt,
+                         sizeof(rxt));
+        if (ret < 0)
+            return ret;
+#endif /* TCP_USER_TIMEOUT */
+    }
+
 #endif /* _WIN32 */

    return ret;
 }

-int sock_close(const sock_t sock)
+/** Example sockopt callback function
+ *  An example function that can be used to set reasonable default keepalive
+ *  options on sockets when registered for a connection with
+ *  xmpp_conn_set_sockopt_callback()
+ *
+ *  @param conn a Strophe connection object
+ *  @param socket pointer to a socket descriptor
+ *
+ *  @see xmpp_sockopt_callback for details on the `socket` parameter
+ *  @ingroup Connections
+ */
+int xmpp_sockopt_cb_keepalive(xmpp_conn_t *conn, void *socket)
+{
+    sock_t sock = *((sock_t *)socket);
+
+    return sock_set_keepalive(
+        sock, conn->ka_timeout, conn->ka_interval, conn->ka_count,
+        conn->ka_count
+            ? (conn->ka_timeout + conn->ka_interval * conn->ka_count) * 1000
+            : 0);
+}
+
+int sock_close(sock_t sock)
 {
 #ifdef _WIN32
    return closesocket(sock);
@@ -180,27 +238,27 @@ static int _sock_set_blocking_mode(sock_t sock, int blocking)
 #endif
 }

-int sock_set_blocking(const sock_t sock)
+int sock_set_blocking(sock_t sock)
 {
    return _sock_set_blocking_mode(sock, 1);
 }

-int sock_set_nonblocking(const sock_t sock)
+int sock_set_nonblocking(sock_t sock)
 {
    return _sock_set_blocking_mode(sock, 0);
 }

-int sock_read(const sock_t sock, void *const buff, const size_t len)
+int sock_read(sock_t sock, void *buff, size_t len)
 {
    return recv(sock, buff, len, 0);
 }

-int sock_write(const sock_t sock, const void *const buff, const size_t len)
+int sock_write(sock_t sock, const void *buff, size_t len)
 {
    return send(sock, buff, len, 0);
 }

-int sock_is_recoverable(const int error)
+int sock_is_recoverable(int error)
 {
 #ifdef _WIN32
    return (error == WSAEINTR || error == WSAEWOULDBLOCK ||
@@ -210,7 +268,7 @@ int sock_is_recoverable(const int error)
 #endif
 }

-int sock_connect_error(const sock_t sock)
+int sock_connect_error(sock_t sock)
 {
    struct sockaddr_storage ss;
    struct sockaddr *sa = (struct sockaddr *)&ss;
--- a/src/sock.h
+++ b/src/sock.h
@@ -22,6 +22,9 @@
 typedef int sock_t;
 #else
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+#include <mstcpip.h> /* tcp_keepalive */
 typedef SOCKET sock_t;
 #endif

@@ -30,16 +33,20 @@ void sock_shutdown(void);

 int sock_error(void);

-sock_t sock_connect(const char *const host, const unsigned short port);
-int sock_close(const sock_t sock);
+sock_t sock_connect(xmpp_conn_t *conn, const char *host, unsigned short port);
+int sock_close(sock_t sock);

-int sock_set_blocking(const sock_t sock);
-int sock_set_nonblocking(const sock_t sock);
-int sock_read(const sock_t sock, void *const buff, const size_t len);
-int sock_write(const sock_t sock, const void *const buff, const size_t len);
-int sock_is_recoverable(const int error);
+int sock_set_blocking(sock_t sock);
+int sock_set_nonblocking(sock_t sock);
+int sock_read(sock_t sock, void *buff, size_t len);
+int sock_write(sock_t sock, const void *buff, size_t len);
+int sock_is_recoverable(int error);
 /* checks for an error after connect, return 0 if connect successful */
-int sock_connect_error(const sock_t sock);
-int sock_set_keepalive(const sock_t sock, int timeout, int interval);
+int sock_connect_error(sock_t sock);
+int sock_set_keepalive(sock_t sock,
+                       int timeout,
+                       int interval,
+                       int count,
+                       unsigned int user_timeout);

 #endif /* __LIBSTROPHE_SOCK_H__ */
--- a/src/stanza.c
+++ b/src/stanza.c
@@ -39,7 +39,7 @@ xmpp_stanza_t *xmpp_stanza_new(xmpp_ctx_t *ctx)
 {
    xmpp_stanza_t *stanza;

-    stanza = xmpp_alloc(ctx, sizeof(xmpp_stanza_t));
+    stanza = strophe_alloc(ctx, sizeof(xmpp_stanza_t));
    if (stanza != NULL) {
        stanza->ref = 1;
        stanza->ctx = ctx;
@@ -64,7 +64,7 @@ xmpp_stanza_t *xmpp_stanza_new(xmpp_ctx_t *ctx)
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza)
+xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *stanza)
 {
    stanza->ref++;

@@ -74,8 +74,7 @@ xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza)
 /*
 * Copy the attributes of stanza src into stanza dst. Return -1 on error.
 */
-static int _stanza_copy_attributes(xmpp_stanza_t *dst,
-                                   const xmpp_stanza_t *const src)
+static int _stanza_copy_attributes(xmpp_stanza_t *dst, const xmpp_stanza_t *src)
 {
    hash_iterator_t *iter;
    const char *key;
@@ -114,7 +113,7 @@ static int _stanza_copy_attributes(xmpp_stanza_t *dst,
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza)
+xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *stanza)
 {
    xmpp_stanza_t *copy, *child, *copychild, *tail;

@@ -125,7 +124,7 @@ xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza)
    copy->type = stanza->type;

    if (stanza->data) {
-        copy->data = xmpp_strdup(stanza->ctx, stanza->data);
+        copy->data = strophe_strdup(stanza->ctx, stanza->data);
        if (!copy->data)
            goto copy_error;
    }
@@ -169,7 +168,7 @@ copy_error:
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_release(xmpp_stanza_t *const stanza)
+int xmpp_stanza_release(xmpp_stanza_t *stanza)
 {
    int released = 0;
    xmpp_stanza_t *child, *tchild;
@@ -189,8 +188,8 @@ int xmpp_stanza_release(xmpp_stanza_t *const stanza)
        if (stanza->attributes)
            hash_release(stanza->attributes);
        if (stanza->data)
-            xmpp_free(stanza->ctx, stanza->data);
-        xmpp_free(stanza->ctx, stanza);
+            strophe_free(stanza->ctx, stanza->data);
+        strophe_free(stanza->ctx, stanza);
        released = 1;
    }

@@ -205,7 +204,7 @@ int xmpp_stanza_release(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza)
+xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *stanza)
 {
    return stanza->ctx;
 }
@@ -218,7 +217,7 @@ xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_is_text(xmpp_stanza_t *const stanza)
+int xmpp_stanza_is_text(xmpp_stanza_t *stanza)
 {
    return (stanza && stanza->type == XMPP_STANZA_TEXT);
 }
@@ -231,7 +230,7 @@ int xmpp_stanza_is_text(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza)
+int xmpp_stanza_is_tag(xmpp_stanza_t *stanza)
 {
    return (stanza && stanza->type == XMPP_STANZA_TAG);
 }
@@ -242,7 +241,7 @@ int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza)
 * On failure, returns NULL.
 */

-static char *_escape_xml(xmpp_ctx_t *const ctx, char *text)
+static char *_escape_xml(xmpp_ctx_t *ctx, char *text)
 {
    size_t len = 0;
    char *src;
@@ -264,7 +263,7 @@ static char *_escape_xml(xmpp_ctx_t *const ctx, char *text)
            len++;
        }
    }
-    if ((buf = xmpp_alloc(ctx, (len + 1) * sizeof(char))) == NULL)
+    if ((buf = strophe_alloc(ctx, (len + 1) * sizeof(char))) == NULL)
        return NULL; /* Error */
    dst = buf;
    for (src = text; *src != '\0'; src++) {
@@ -295,11 +294,8 @@ static char *_escape_xml(xmpp_ctx_t *const ctx, char *text)
 }

 /* small helper function */
-static void _render_update(int *written,
-                           const int length,
-                           const int lastwrite,
-                           size_t *left,
-                           char **ptr)
+static void _render_update(
+    int *written, int length, int lastwrite, size_t *left, char **ptr)
 {
    *written += lastwrite;

@@ -317,9 +313,8 @@ static void _render_update(int *written,
 * return values < 0 indicate some error occurred,
 * and return values > buflen indicate buffer was not large enough
 */
-static int _render_stanza_recursive(xmpp_stanza_t *stanza,
-                                    char *const buf,
-                                    size_t const buflen)
+static int
+_render_stanza_recursive(xmpp_stanza_t *stanza, char *buf, size_t buflen)
 {
    char *ptr = buf;
    size_t left = buflen;
@@ -341,8 +336,8 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
        tmp = _escape_xml(stanza->ctx, stanza->data);
        if (tmp == NULL)
            return XMPP_EMEM;
-        ret = xmpp_snprintf(ptr, left, "%s", tmp);
-        xmpp_free(stanza->ctx, tmp);
+        ret = strophe_snprintf(ptr, left, "%s", tmp);
+        strophe_free(stanza->ctx, tmp);
        if (ret < 0)
            return XMPP_EMEM;
        _render_update(&written, buflen, ret, &left, &ptr);
@@ -351,7 +346,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
            return XMPP_EINVOP;

        /* write beginning of tag and attributes */
-        ret = xmpp_snprintf(ptr, left, "<%s", stanza->data);
+        ret = strophe_snprintf(ptr, left, "<%s", stanza->data);
        if (ret < 0)
            return XMPP_EMEM;
        _render_update(&written, buflen, ret, &left, &ptr);
@@ -379,8 +374,8 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
                    hash_iter_release(iter);
                    return XMPP_EMEM;
                }
-                ret = xmpp_snprintf(ptr, left, " %s=\"%s\"", key, tmp);
-                xmpp_free(stanza->ctx, tmp);
+                ret = strophe_snprintf(ptr, left, " %s=\"%s\"", key, tmp);
+                strophe_free(stanza->ctx, tmp);
                if (ret < 0) {
                    hash_iter_release(iter);
                    return XMPP_EMEM;
@@ -392,7 +387,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,

        if (!stanza->children) {
            /* write end if singleton tag */
-            ret = xmpp_snprintf(ptr, left, "/>");
+            ret = strophe_snprintf(ptr, left, "/>");
            if (ret < 0)
                return XMPP_EMEM;
            _render_update(&written, buflen, ret, &left, &ptr);
@@ -400,7 +395,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
            /* this stanza has child stanzas */

            /* write end of start tag */
-            ret = xmpp_snprintf(ptr, left, ">");
+            ret = strophe_snprintf(ptr, left, ">");
            if (ret < 0)
                return XMPP_EMEM;
            _render_update(&written, buflen, ret, &left, &ptr);
@@ -418,7 +413,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
            }

            /* write end tag */
-            ret = xmpp_snprintf(ptr, left, "</%s>", stanza->data);
+            ret = strophe_snprintf(ptr, left, "</%s>", stanza->data);
            if (ret < 0)
                return XMPP_EMEM;

@@ -444,9 +439,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
-                        char **const buf,
-                        size_t *const buflen)
+int xmpp_stanza_to_text(xmpp_stanza_t *stanza, char **buf, size_t *buflen)
 {
    char *buffer, *tmp;
    size_t length;
@@ -454,7 +447,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,

    /* allocate a default sized buffer and attempt to render */
    length = 1024;
-    buffer = xmpp_alloc(stanza->ctx, length);
+    buffer = strophe_alloc(stanza->ctx, length);
    if (!buffer) {
        *buf = NULL;
        *buflen = 0;
@@ -463,16 +456,16 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,

    ret = _render_stanza_recursive(stanza, buffer, length);
    if (ret < 0) {
-        xmpp_free(stanza->ctx, buffer);
+        strophe_free(stanza->ctx, buffer);
        *buf = NULL;
        *buflen = 0;
        return ret;
    }

    if ((size_t)ret > length - 1) {
-        tmp = xmpp_realloc(stanza->ctx, buffer, ret + 1);
+        tmp = strophe_realloc(stanza->ctx, buffer, ret + 1);
        if (!tmp) {
-            xmpp_free(stanza->ctx, buffer);
+            strophe_free(stanza->ctx, buffer);
            *buf = NULL;
            *buflen = 0;
            return XMPP_EMEM;
@@ -482,7 +475,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,

        ret = _render_stanza_recursive(stanza, buffer, length);
        if ((size_t)ret > length - 1) {
-            xmpp_free(stanza->ctx, buffer);
+            strophe_free(stanza->ctx, buffer);
            *buf = NULL;
            *buflen = 0;
            return XMPP_EMEM;
@@ -507,16 +500,16 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name)
+int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *name)
 {
    if (stanza->type == XMPP_STANZA_TEXT)
        return XMPP_EINVOP;

    if (stanza->data)
-        xmpp_free(stanza->ctx, stanza->data);
+        strophe_free(stanza->ctx, stanza->data);

    stanza->type = XMPP_STANZA_TAG;
-    stanza->data = xmpp_strdup(stanza->ctx, name);
+    stanza->data = strophe_strdup(stanza->ctx, name);

    return stanza->data == NULL ? XMPP_EMEM : XMPP_EOK;
 }
@@ -531,7 +524,7 @@ int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_name(xmpp_stanza_t *stanza)
 {
    if (stanza->type == XMPP_STANZA_TEXT)
        return NULL;
@@ -546,7 +539,7 @@ const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza)
+int xmpp_stanza_get_attribute_count(xmpp_stanza_t *stanza)
 {
    if (stanza->attributes == NULL) {
        return 0;
@@ -569,7 +562,7 @@ int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza,
+int xmpp_stanza_get_attributes(xmpp_stanza_t *stanza,
                               const char **attr,
                               int attrlen)
 {
@@ -611,9 +604,9 @@ int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
-                              const char *const key,
-                              const char *const value)
+int xmpp_stanza_set_attribute(xmpp_stanza_t *stanza,
+                              const char *key,
+                              const char *value)
 {
    char *val;
    int rc;
@@ -622,19 +615,19 @@ int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
        return XMPP_EINVOP;

    if (!stanza->attributes) {
-        stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free);
+        stanza->attributes = hash_new(stanza->ctx, 8, strophe_free);
        if (!stanza->attributes)
            return XMPP_EMEM;
    }

-    val = xmpp_strdup(stanza->ctx, value);
+    val = strophe_strdup(stanza->ctx, value);
    if (!val) {
        return XMPP_EMEM;
    }

    rc = hash_add(stanza->attributes, key, val);
    if (rc < 0) {
-        xmpp_free(stanza->ctx, val);
+        strophe_free(stanza->ctx, val);
        return XMPP_EMEM;
    }

@@ -652,7 +645,7 @@ int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_ns(xmpp_stanza_t *const stanza, const char *const ns)
+int xmpp_stanza_set_ns(xmpp_stanza_t *stanza, const char *ns)
 {
    return xmpp_stanza_set_attribute(stanza, "xmlns", ns);
 }
@@ -727,7 +720,7 @@ int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text)
+int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *text)
 {
    if (stanza->type == XMPP_STANZA_TAG)
        return XMPP_EINVOP;
@@ -735,8 +728,8 @@ int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text)
    stanza->type = XMPP_STANZA_TEXT;

    if (stanza->data)
-        xmpp_free(stanza->ctx, stanza->data);
-    stanza->data = xmpp_strdup(stanza->ctx, text);
+        strophe_free(stanza->ctx, stanza->data);
+    stanza->data = strophe_strdup(stanza->ctx, text);

    return stanza->data == NULL ? XMPP_EMEM : XMPP_EOK;
 }
@@ -756,8 +749,8 @@ int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text)
 *  @ingroup Stanza
 */
 int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
-                                   const char *const text,
-                                   const size_t size)
+                                   const char *text,
+                                   size_t size)
 {
    if (stanza->type == XMPP_STANZA_TAG)
        return XMPP_EINVOP;
@@ -765,8 +758,8 @@ int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
    stanza->type = XMPP_STANZA_TEXT;

    if (stanza->data)
-        xmpp_free(stanza->ctx, stanza->data);
-    stanza->data = xmpp_alloc(stanza->ctx, size + 1);
+        strophe_free(stanza->ctx, stanza->data);
+    stanza->data = strophe_alloc(stanza->ctx, size + 1);
    if (!stanza->data)
        return XMPP_EMEM;

@@ -786,7 +779,7 @@ int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_id(xmpp_stanza_t *stanza)
 {
    return xmpp_stanza_get_attribute(stanza, "id");
 }
@@ -801,7 +794,7 @@ const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_ns(xmpp_stanza_t *stanza)
 {
    return xmpp_stanza_get_attribute(stanza, "xmlns");
 }
@@ -816,7 +809,7 @@ const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_type(xmpp_stanza_t *stanza)
 {
    return xmpp_stanza_get_attribute(stanza, "type");
 }
@@ -831,7 +824,7 @@ const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_to(xmpp_stanza_t *stanza)
 {
    return xmpp_stanza_get_attribute(stanza, "to");
 }
@@ -846,11 +839,87 @@ const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_from(xmpp_stanza_t *stanza)
 {
    return xmpp_stanza_get_attribute(stanza, "from");
 }

+/** Get the first child of stanza following a path-like list of names.
+ *  This function searches the children and their children that match
+ *  the given path.
+ *
+ *  * "name" - Search 'name'
+ *
+ *  * "name[@ns='foo']" - Search 'name' which is in the namespace 'foo'
+ *
+ *  The Syntax to pass namespaces is inspired by the XPATH way of passing
+ *  attributes.
+ *
+ *  The namespace syntax only supports single quotes `'`.
+ *
+ *  The \ref XMPP_STANZA_NAME_IN_NS macro is provided as a helper for names
+ *  in namespaces.
+ *
+ *  @param stanza a Strophe stanza object
+ *  @param ... a var-args list that must be terminated by a NULL entry
+ *
+ *  @return the matching child stanza object or NULL if no match was found
+ *
+ *  @ingroup Stanza
+ */
+xmpp_stanza_t *xmpp_stanza_get_child_by_path(xmpp_stanza_t *stanza, ...)
+{
+    xmpp_stanza_t *child = NULL;
+    char *p, *tok, *attr, *saveattr, *ns = NULL;
+    const char *xmlns;
+    va_list ap;
+
+    va_start(ap, stanza);
+
+    while ((p = va_arg(ap, char *)) != NULL) {
+        tok = strophe_strdup(stanza->ctx, p);
+        if (!tok) {
+            child = NULL;
+            break;
+        }
+        saveattr = ns = NULL;
+        attr = strophe_strtok_r(tok, "[", &saveattr);
+        if (attr) {
+            attr = strophe_strtok_r(NULL, "]", &saveattr);
+            if (attr) {
+                if (!strncmp(attr, "@ns='", 5)) {
+                    ns = attr + 5;
+                    strophe_strtok_r(ns, "'", &saveattr);
+                }
+            }
+        }
+        if (!child) {
+            if (strcmp(xmpp_stanza_get_name(stanza), tok))
+                goto error_out;
+
+            if (ns) {
+                xmlns = xmpp_stanza_get_ns(stanza);
+                if (!xmlns || strcmp(xmlns, ns))
+                    goto error_out;
+            }
+            child = stanza;
+        } else {
+            if (!ns)
+                child = xmpp_stanza_get_child_by_name(child, tok);
+            else
+                child = xmpp_stanza_get_child_by_name_and_ns(child, tok, ns);
+        }
+error_out:
+        strophe_free(stanza->ctx, tok);
+        if (!child)
+            break;
+    }
+
+    va_end(ap);
+
+    return p == NULL ? child : NULL;
+}
+
 /** Get the first child of stanza with name.
 *  This function searches all the immediate children of stanza for a child
 *  stanza that matches the name.  The first matching child is returned.
@@ -862,8 +931,8 @@ const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza,
-                                             const char *const name)
+xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *stanza,
+                                             const char *name)
 {
    xmpp_stanza_t *child;

@@ -888,8 +957,8 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza,
-                                           const char *const ns)
+xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *stanza,
+                                           const char *ns)
 {
    xmpp_stanza_t *child;
    const char *child_ns;
@@ -916,9 +985,9 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza,
-                                                    const char *const name,
-                                                    const char *const ns)
+xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *stanza,
+                                                    const char *name,
+                                                    const char *ns)
 {
    xmpp_stanza_t *child;
    const char *child_ns;
@@ -947,7 +1016,7 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza)
+xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *stanza)
 {
    return stanza->children;
 }
@@ -960,7 +1029,7 @@ xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza)
+xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *stanza)
 {
    return stanza->next;
 }
@@ -976,7 +1045,7 @@ xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)
+char *xmpp_stanza_get_text(xmpp_stanza_t *stanza)
 {
    size_t len, clen;
    xmpp_stanza_t *child;
@@ -984,7 +1053,7 @@ char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)

    if (stanza->type == XMPP_STANZA_TEXT) {
        if (stanza->data)
-            return xmpp_strdup(stanza->ctx, stanza->data);
+            return strophe_strdup(stanza->ctx, stanza->data);
        else
            return NULL;
    }
@@ -997,7 +1066,7 @@ char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)
    if (len == 0)
        return NULL;

-    text = (char *)xmpp_alloc(stanza->ctx, len + 1);
+    text = (char *)strophe_alloc(stanza->ctx, len + 1);
    if (!text)
        return NULL;

@@ -1027,7 +1096,7 @@ char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza)
+const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *stanza)
 {
    if (stanza->type == XMPP_STANZA_TEXT)
        return stanza->data;
@@ -1046,7 +1115,7 @@ const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id)
+int xmpp_stanza_set_id(xmpp_stanza_t *stanza, const char *id)
 {
    return xmpp_stanza_set_attribute(stanza, "id", id);
 }
@@ -1062,7 +1131,7 @@ int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type)
+int xmpp_stanza_set_type(xmpp_stanza_t *stanza, const char *type)
 {
    return xmpp_stanza_set_attribute(stanza, "type", type);
 }
@@ -1079,7 +1148,7 @@ int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to)
+int xmpp_stanza_set_to(xmpp_stanza_t *stanza, const char *to)
 {
    return xmpp_stanza_set_attribute(stanza, "to", to);
 }
@@ -1096,7 +1165,7 @@ int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to)
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from)
+int xmpp_stanza_set_from(xmpp_stanza_t *stanza, const char *from)
 {
    return xmpp_stanza_set_attribute(stanza, "from", from);
 }
@@ -1112,8 +1181,7 @@ int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from)
 *
 *  @ingroup Stanza
 */
-const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza,
-                                      const char *const name)
+const char *xmpp_stanza_get_attribute(xmpp_stanza_t *stanza, const char *name)
 {
    if (stanza->type != XMPP_STANZA_TAG)
        return NULL;
@@ -1133,8 +1201,7 @@ const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
-                              const char *const name)
+int xmpp_stanza_del_attribute(xmpp_stanza_t *stanza, const char *name)
 {
    if (stanza->type != XMPP_STANZA_TAG)
        return -1;
@@ -1146,8 +1213,8 @@ int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
 }

 /** Create a stanza object in reply to another.
- *  This function makes a copy of a stanza object with the attribute “to” set
- *  its original “from”.
+ *  This function makes a copy of a stanza object with the attribute "to" set
+ *  its original "from".
 *  The stanza will have a reference count of one, so the caller does not
 *  need to clone it.
 *
@@ -1157,7 +1224,7 @@ int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza)
+xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *stanza)
 {
    xmpp_stanza_t *copy = NULL;
    const char *from;
@@ -1174,7 +1241,7 @@ xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza)
    copy->type = stanza->type;

    if (stanza->data) {
-        copy->data = xmpp_strdup(stanza->ctx, stanza->data);
+        copy->data = strophe_strdup(stanza->ctx, stanza->data);
        if (!copy->data)
            goto copy_error;
    }
@@ -1204,7 +1271,7 @@ copy_error:
 *  Check https://tools.ietf.org/html/rfc6120#section-8.3 for details.
 *
 *  @param stanza a Strophe stanza object
- *  @param error_type type attribute in the <error/> child element
+ *  @param error_type type attribute in the `<error/>` child element
 *  @param condition the defined-condition (e.g. "item-not-found")
 *  @param text optional description, may be NULL
 *
@@ -1212,16 +1279,16 @@ copy_error:
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza,
-                                       const char *const error_type,
-                                       const char *const condition,
-                                       const char *const text)
+xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *stanza,
+                                       const char *error_type,
+                                       const char *condition,
+                                       const char *text)
 {
    xmpp_ctx_t *ctx = stanza->ctx;
    xmpp_stanza_t *reply = NULL;
-    xmpp_stanza_t *error;
-    xmpp_stanza_t *item;
-    xmpp_stanza_t *text_stanza;
+    xmpp_stanza_t *error = NULL;
+    xmpp_stanza_t *item = NULL;
+    xmpp_stanza_t *text_stanza = NULL;
    const char *to;

    if (!error_type || !condition)
@@ -1230,41 +1297,53 @@ xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza,
    reply = xmpp_stanza_reply(stanza);
    if (!reply)
        goto quit_err;
-
-    xmpp_stanza_set_type(reply, "error");
+    if (xmpp_stanza_set_type(reply, "error") != XMPP_EOK)
+        goto quit_err;
    to = xmpp_stanza_get_to(stanza);
    if (to)
-        xmpp_stanza_set_from(reply, to);
+        if (xmpp_stanza_set_from(reply, to) != XMPP_EOK)
+            goto quit_err;

    error = xmpp_stanza_new(ctx);
    if (!error)
        goto quit_err;
-    xmpp_stanza_set_name(error, "error");
-    xmpp_stanza_set_type(error, error_type);
-    xmpp_stanza_add_child(reply, error);
+    if (xmpp_stanza_set_name(error, "error") != XMPP_EOK)
+        goto quit_err;
+    if (xmpp_stanza_set_type(error, error_type) != XMPP_EOK)
+        goto quit_err;
+    if (xmpp_stanza_add_child(reply, error) != XMPP_EOK)
+        goto quit_err;
    xmpp_stanza_release(error);

    item = xmpp_stanza_new(ctx);
    if (!item)
        goto quit_err;
-    xmpp_stanza_set_name(item, condition);
-    xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF);
-    xmpp_stanza_add_child(error, item);
+    if (xmpp_stanza_set_name(item, condition) != XMPP_EOK)
+        goto quit_err;
+    if (xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF) != XMPP_EOK)
+        goto quit_err;
+    if (xmpp_stanza_add_child(error, item) != XMPP_EOK)
+        goto quit_err;
    xmpp_stanza_release(item);

    if (text) {
        item = xmpp_stanza_new(ctx);
        if (!item)
            goto quit_err;
-        xmpp_stanza_set_name(item, "text");
-        xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF);
-        xmpp_stanza_add_child(error, item);
+        if (xmpp_stanza_set_name(item, "text") != XMPP_EOK)
+            goto quit_err;
+        if (xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF) != XMPP_EOK)
+            goto quit_err;
+        if (xmpp_stanza_add_child(error, item) != XMPP_EOK)
+            goto quit_err;
        xmpp_stanza_release(item);
        text_stanza = xmpp_stanza_new(ctx);
        if (!text_stanza)
            goto quit_err;
-        xmpp_stanza_set_text(text_stanza, text);
-        xmpp_stanza_add_child(item, text_stanza);
+        if (xmpp_stanza_set_text(text_stanza, text) != XMPP_EOK)
+            goto quit_err;
+        if (xmpp_stanza_add_child(item, text_stanza) != XMPP_EOK)
+            goto quit_err;
        xmpp_stanza_release(text_stanza);
    }

@@ -1273,14 +1352,20 @@ xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza,
 quit_err:
    if (reply)
        xmpp_stanza_release(reply);
+    if (error)
+        xmpp_stanza_release(error);
+    if (item)
+        xmpp_stanza_release(item);
+    if (text_stanza)
+        xmpp_stanza_release(text_stanza);
    return NULL;
 }

 static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
-                                             const char *const name,
-                                             const char *const type,
-                                             const char *const id,
-                                             const char *const to)
+                                             const char *name,
+                                             const char *type,
+                                             const char *id,
+                                             const char *to)
 {
    xmpp_stanza_t *stanza = xmpp_stanza_new(ctx);
    int ret;
@@ -1301,7 +1386,7 @@ static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
    return stanza;
 }

-/** Create a <message/> stanza object with given attributes.
+/** Create a `<message/>` stanza object with given attributes.
 *  Attributes are optional and may be NULL.
 *
 *  @param ctx a Strophe context object
@@ -1314,20 +1399,20 @@ static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
 *  @ingroup Stanza
 */
 xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
-                                const char *const type,
-                                const char *const to,
-                                const char *const id)
+                                const char *type,
+                                const char *to,
+                                const char *id)
 {
    return _stanza_new_with_attrs(ctx, "message", type, id, to);
 }

-/** Get text from <body/> child element.
+/** Get text from `<body/>` child element.
 *  This function returns new allocated string. The caller is responsible
 *  for freeing this string with xmpp_free().
 *
- *  @param msg well formed <message/> stanza
+ *  @param msg well formed `<message/>` stanza
 *
- *  @return allocated string or NULL on failure (no <body/> element or
+ *  @return allocated string or NULL on failure (no `<body/>` element or
 *      memory allocation error)
 *
 *  @ingroup Stanza
@@ -1346,16 +1431,17 @@ char *xmpp_message_get_body(xmpp_stanza_t *msg)
    return text;
 }

-/** Add <body/> child element to a <message/> stanza with the given text.
+/** Add `<body/>` child element to a `<message/>` stanza with the given text.
 *
- *  @param msg a <message> stanza object without <body/> child element.
+ *  @param msg a `<message>` stanza object without `<body/>` child element.
+ *  @param text The text that shall be placed in the body.
 *
 *  @return 0 on success (XMPP_EOK), and a number less than 0 on failure
 *      (XMPP_EMEM, XMPP_EINVOP)
 *
 *  @ingroup Stanza
 */
-int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
+int xmpp_message_set_body(xmpp_stanza_t *msg, const char *text)
 {
    xmpp_ctx_t *ctx = msg->ctx;
    xmpp_stanza_t *body;
@@ -1363,7 +1449,7 @@ int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
    const char *name;
    int ret;

-    /* check that msg is a <message/> stanza and doesn't contain <body/> */
+    /* check that msg is a `<message/>` stanza and doesn't contain `<body/>` */
    name = xmpp_stanza_get_name(msg);
    body = xmpp_stanza_get_child_by_name(msg, "body");
    if (!name || strcmp(name, "message") != 0 || body)
@@ -1390,7 +1476,7 @@ int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
    return ret;
 }

-/** Create an <iq/> stanza object with given attributes.
+/** Create an `<iq/>` stanza object with given attributes.
 *  Attributes are optional and may be NULL.
 *
 *  @param ctx a Strophe context object
@@ -1401,13 +1487,12 @@ int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *
-xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id)
+xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char *type, const char *id)
 {
    return _stanza_new_with_attrs(ctx, "iq", type, id, NULL);
 }

-/** Create a <presence/> stanza object.
+/** Create a `<presence/>` stanza object.
 *
 *  @param ctx a Strophe context object
 *
@@ -1424,7 +1509,7 @@ xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx)
 *  The error text is optional and may be NULL.
 *
 *  @param ctx a Strophe context object
- *  @param type enum of xmpp_error_type_t
+ *  @param type enum of strophe_error_type_t
 *  @param text content of a 'text'
 *
 *  @return a new Strophe stanza object
@@ -1433,9 +1518,8 @@ xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx)
 *
 *  @ingroup Stanza
 */
-xmpp_stanza_t *xmpp_error_new(xmpp_ctx_t *ctx,
-                              xmpp_error_type_t const type,
-                              const char *const text)
+xmpp_stanza_t *
+xmpp_error_new(xmpp_ctx_t *ctx, xmpp_error_type_t type, const char *text)
 {
    xmpp_stanza_t *error =
        _stanza_new_with_attrs(ctx, "stream:error", NULL, NULL, NULL);
@@ -1556,8 +1640,11 @@ static void _stub_stream_end(char *name, void *userdata)

 static void _stream_stanza(xmpp_stanza_t *stanza, void *userdata)
 {
-    stanza = xmpp_stanza_clone(stanza);
-    *(xmpp_stanza_t **)userdata = stanza;
+    xmpp_stanza_t **dest = userdata;
+    if (*dest == NULL) {
+        stanza = xmpp_stanza_clone(stanza);
+        *dest = stanza;
+    }
 }

 /** Create a stanza object from the string.
--- a/src/tls.c
+++ b/src/tls.c
@@ -0,0 +1,254 @@
+/* tls.c
+** strophe XMPP client library -- generic TLS functions
+**
+** Copyright (C) 2021 Steffen Jaeckel <jaeckel-floss@eyet-services.de>
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+/** @file
+ *  Generic TLS functionality.
+ */
+
+/** @defgroup TLS SSL/TLS specific functionality
+ *  These functions provide SSL/TLS specific functionality.
+ */
+
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+
+#include "strophe.h"
+
+#include "common.h"
+
+struct _dnsname_t {
+    char **data;
+    size_t cur, max;
+};
+
+const size_t tlscert_dnsnames_increment = 4;
+
+/** Get the Strophe context which is assigned to this certificate.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *
+ *  @return the Strophe context object where this certificate originates from
+ *
+ *  @ingroup TLS
+ */
+xmpp_ctx_t *xmpp_tlscert_get_ctx(const xmpp_tlscert_t *cert)
+{
+    return cert->ctx;
+}
+
+/** Get the Strophe connection which is assigned to this certificate.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *
+ *  @return the Strophe connection object where this certificate originates from
+ *
+ *  @ingroup TLS
+ */
+xmpp_conn_t *xmpp_tlscert_get_conn(const xmpp_tlscert_t *cert)
+{
+    return cert->conn;
+}
+
+/** Get the complete PEM of this certificate.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *
+ *  @return a string containing the PEM of this certificate
+ *
+ *  @ingroup TLS
+ */
+const char *xmpp_tlscert_get_pem(const xmpp_tlscert_t *cert)
+{
+    return cert->pem;
+}
+
+/** Get the dnsName entries out of the SubjectAlternativeNames.
+ *
+ *  Note: Max. `MAX_NUM_DNSNAMES` are supported.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *  @param n which dnsName entry
+ *
+ *  @return a string with the n'th dnsName
+ *
+ *  @ingroup TLS
+ */
+const char *xmpp_tlscert_get_dnsname(const xmpp_tlscert_t *cert, size_t n)
+{
+    if (n >= cert->dnsnames->cur)
+        return NULL;
+    return cert->dnsnames->data[n];
+}
+
+/** Get various parts of the certificate as String.
+ *
+ *  c.f. \ref xmpp_cert_element_t for details.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *  @param elmnt which part of the certificate
+ *
+ *  @return a string with the part of the certificate
+ *
+ *  @ingroup TLS
+ */
+const char *xmpp_tlscert_get_string(const xmpp_tlscert_t *cert,
+                                    xmpp_cert_element_t elmnt)
+{
+    if (elmnt < 0 || elmnt >= XMPP_CERT_ELEMENT_MAX)
+        return NULL;
+    return cert->elements[elmnt];
+}
+
+/** Get a descriptive string for each xmpp_cert_element_t.
+ *
+ *  c.f. \ref xmpp_cert_element_t for details.
+ *
+ *  @param elmnt which element
+ *
+ *  @return a string with the description
+ *
+ *  @ingroup TLS
+ */
+const char *xmpp_tlscert_get_description(xmpp_cert_element_t elmnt)
+{
+    static const char *descriptions[] = {
+        "X.509 Version",
+        "SerialNumber",
+        "Subject",
+        "Issuer",
+        "Issued On",
+        "Expires On",
+        "Public Key Algorithm",
+        "Certificate Signature Algorithm",
+        "Fingerprint SHA-1",
+        "Fingerprint SHA-256",
+    };
+    if (elmnt < 0 || elmnt >= XMPP_CERT_ELEMENT_MAX)
+        return NULL;
+    return descriptions[elmnt];
+}
+
+/** Allocate and initialize a Strophe TLS certificate object.
+ *
+ *  @param ctx a Strophe context object
+ *
+ *  @return a certificate object or NULL
+ */
+xmpp_tlscert_t *tlscert_new(xmpp_ctx_t *ctx)
+{
+    xmpp_tlscert_t *tlscert = strophe_alloc(ctx, sizeof(*tlscert));
+    if (!tlscert)
+        return NULL;
+    memset(tlscert, 0, sizeof(*tlscert));
+
+    tlscert->dnsnames = strophe_alloc(ctx, sizeof(*tlscert->dnsnames));
+    if (!tlscert->dnsnames) {
+        strophe_free(ctx, tlscert);
+        return NULL;
+    }
+    memset(tlscert->dnsnames, 0, sizeof(*tlscert->dnsnames));
+
+    tlscert->ctx = ctx;
+
+    return tlscert;
+}
+
+/** Free a certificate object.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *
+ *  @ingroup TLS
+ */
+void xmpp_tlscert_free(xmpp_tlscert_t *cert)
+{
+    size_t n;
+    for (n = 0; n < ARRAY_SIZE(cert->elements); ++n) {
+        if (cert->elements[n])
+            strophe_free(cert->ctx, cert->elements[n]);
+    }
+    if (cert->dnsnames->data) {
+        for (n = 0; n < cert->dnsnames->cur; ++n) {
+            if (cert->dnsnames->data[n])
+                strophe_free(cert->ctx, cert->dnsnames->data[n]);
+        }
+    }
+    strophe_free(cert->ctx, cert->dnsnames->data);
+    strophe_free(cert->ctx, cert->dnsnames);
+    if (cert->pem)
+        strophe_free(cert->ctx, cert->pem);
+    strophe_free(cert->ctx, cert);
+}
+
+/** Add a dnsName to the Strophe TLS certificate object.
+ *
+ *  @param cert a Strophe TLS certificate object
+ *  @param dnsname dnsName that shall be stored
+ *
+ *  @return classic Unix style - 0=success, 1=error
+ */
+int tlscert_add_dnsname(xmpp_tlscert_t *cert, const char *dnsname)
+{
+    if ((cert->dnsnames->cur + 1) >= cert->dnsnames->max) {
+        char **dnsnames =
+            strophe_realloc(cert->ctx, cert->dnsnames->data,
+                            (cert->dnsnames->max + tlscert_dnsnames_increment) *
+                                sizeof(char **));
+        if (!dnsnames)
+            return 1;
+        cert->dnsnames->data = dnsnames;
+        cert->dnsnames->max += tlscert_dnsnames_increment;
+    }
+    cert->dnsnames->data[cert->dnsnames->cur++] =
+        strophe_strdup(cert->ctx, dnsname);
+    return 0;
+}
+
+int tls_caching_password_callback(char *pw, size_t pw_max, xmpp_conn_t *conn)
+{
+    int ret;
+    unsigned char hash[XMPP_SHA1_DIGEST_SIZE];
+
+    const char *fname = conn->tls_client_cert;
+    size_t fname_len = strlen(fname);
+    xmpp_sha1_digest((void *)fname, fname_len, hash);
+    if (fname_len && fname_len == conn->password_cache.fnamelen &&
+        memcmp(hash, conn->password_cache.fname_hash, sizeof(hash)) == 0) {
+        if (conn->password_cache.passlen) {
+            memcpy(pw, conn->password_cache.pass,
+                   conn->password_cache.passlen + 1);
+            return conn->password_cache.passlen;
+        }
+    }
+    size_t max_len = pw_max == 256 ? pw_max : sizeof(conn->password_cache.pass);
+    ret = conn->password_callback(conn->password_cache.pass, max_len, conn,
+                                  conn->password_callback_userdata);
+
+    if (ret < 0 || ret >= (ssize_t)max_len) {
+        memset(conn->password_cache.pass, 0, sizeof(conn->password_cache.pass));
+        return -1;
+    }
+    conn->password_cache.pass[ret] = '\0';
+    memcpy(pw, conn->password_cache.pass, ret + 1);
+    conn->password_cache.passlen = ret;
+    conn->password_cache.fnamelen = fname_len;
+    memcpy(conn->password_cache.fname_hash, hash, sizeof(hash));
+    return conn->password_cache.passlen;
+}
+
+void tls_clear_password_cache(xmpp_conn_t *conn)
+{
+    memset(&conn->password_cache, 0, sizeof(conn->password_cache));
+}
--- a/src/tls.h
+++ b/src/tls.h
@@ -21,12 +21,28 @@

 typedef struct _tls tls_t;

+typedef struct _dnsname_t dnsname_t;
+
+struct _xmpp_tlscert_t {
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    char *pem;
+    char *elements[XMPP_CERT_ELEMENT_MAX];
+    dnsname_t *dnsnames;
+};
+
+/* provided by the real TLS implementation */
+
 void tls_initialize(void);
 void tls_shutdown(void);

 tls_t *tls_new(xmpp_conn_t *conn);
 void tls_free(tls_t *tls);

+char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n);
+unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn);
+
+xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn);
 int tls_set_credentials(tls_t *tls, const char *cafilename);

 int tls_start(tls_t *tls);
@@ -35,10 +51,18 @@ int tls_stop(tls_t *tls);
 int tls_error(tls_t *tls);

 int tls_pending(tls_t *tls);
-int tls_read(tls_t *tls, void *const buff, const size_t len);
-int tls_write(tls_t *tls, const void *const buff, const size_t len);
+int tls_read(tls_t *tls, void *buff, size_t len);
+int tls_write(tls_t *tls, const void *buff, size_t len);

 int tls_clear_pending_write(tls_t *tls);
 int tls_is_recoverable(int error);

+/* provided by tls.c */
+
+xmpp_tlscert_t *tlscert_new(xmpp_ctx_t *ctx);
+int tlscert_add_dnsname(xmpp_tlscert_t *cert, const char *dnsname);
+
+int tls_caching_password_callback(char *pw, size_t pw_max, xmpp_conn_t *conn);
+void tls_clear_password_cache(xmpp_conn_t *conn);
+
 #endif /* __LIBSTROPHE_TLS_H__ */
--- a/src/tls_dummy.c
+++ b/src/tls_dummy.c
@@ -33,6 +33,21 @@ void tls_shutdown(void)
    return;
 }

+char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n)
+{
+    UNUSED(conn);
+    UNUSED(n);
+    /* always fail */
+    return NULL;
+}
+
+unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn)
+{
+    UNUSED(conn);
+    /* always fail */
+    return 0;
+}
+
 tls_t *tls_new(xmpp_conn_t *conn)
 {
    UNUSED(conn);
@@ -46,6 +61,12 @@ void tls_free(tls_t *tls)
    return;
 }

+xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn)
+{
+    UNUSED(conn);
+    return NULL;
+}
+
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
    UNUSED(tls);
@@ -78,7 +99,7 @@ int tls_pending(tls_t *tls)
    return 0;
 }

-int tls_read(tls_t *tls, void *const buff, const size_t len)
+int tls_read(tls_t *tls, void *buff, size_t len)
 {
    UNUSED(tls);
    UNUSED(buff);
@@ -86,7 +107,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
    return -1;
 }

-int tls_write(tls_t *tls, const void *const buff, const size_t len)
+int tls_write(tls_t *tls, const void *buff, size_t len)
 {
    UNUSED(tls);
    UNUSED(buff);
--- a/src/tls_gnutls.c
+++ b/src/tls_gnutls.c
@@ -13,20 +13,23 @@
 *  TLS implementation with GNUTLS
 */

+#include <string.h>
 #include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/x509-ext.h>
+#include <gnutls/pkcs11.h>
+#include <gnutls/pkcs12.h>

 #include "common.h"
 #include "tls.h"
 #include "sock.h"

-/* FIXME this shouldn't be a constant string */
-#define CAFILE "/etc/ssl/certs/ca-certificates.crt"
-
 struct _tls {
    xmpp_ctx_t *ctx; /* do we need this? */
-    sock_t sock;
+    xmpp_conn_t *conn;
    gnutls_session_t session;
    gnutls_certificate_credentials_t cred;
+    gnutls_x509_crt_t client_cert;
    int lasterror;
 };

@@ -46,41 +49,502 @@ void tls_shutdown(void)
    gnutls_global_deinit();
 }

+static int _tls_password_callback(void *userdata,
+                                  int attempt,
+                                  const char *token_url,
+                                  const char *token_label,
+                                  unsigned int flags,
+                                  char *pin,
+                                  size_t pin_max)
+{
+    xmpp_conn_t *conn = userdata;
+    UNUSED(attempt);
+    UNUSED(token_url);
+    UNUSED(token_label);
+    UNUSED(flags);
+    int ret = tls_caching_password_callback(pin, pin_max, conn);
+    return ret > 0 ? 0 : GNUTLS_E_PKCS11_PIN_ERROR;
+}
+
+static gnutls_x509_crt_t _tls_load_cert_x509(xmpp_conn_t *conn)
+{
+    gnutls_x509_crt_t cert;
+    gnutls_datum_t data;
+    int res;
+    if (gnutls_x509_crt_init(&cert) < 0)
+        return NULL;
+    if (gnutls_load_file(conn->tls_client_cert, &data) < 0)
+        goto error_out;
+    res = gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM);
+    gnutls_free(data.data);
+    if (res < 0)
+        goto error_out;
+    return cert;
+error_out:
+    gnutls_x509_crt_deinit(cert);
+    return NULL;
+}
+
+static gnutls_x509_crt_t _tls_load_cert_p12(xmpp_conn_t *conn)
+{
+    gnutls_pkcs12_t p12;
+    gnutls_x509_crt_t *cert = NULL;
+    gnutls_datum_t data;
+    gnutls_x509_privkey_t key;
+    unsigned int cert_num = 0, retries = 0;
+    int err = -1;
+    if (gnutls_pkcs12_init(&p12) < 0)
+        return NULL;
+    if (gnutls_load_file(conn->tls_client_cert, &data) < 0)
+        goto error_out;
+    if (gnutls_pkcs12_import(p12, &data, GNUTLS_X509_FMT_DER, 0) < 0)
+        goto error_out2;
+
+    /* First try to open file with no pass */
+    if ((err = gnutls_pkcs12_simple_parse(p12, NULL, &key, &cert, &cert_num,
+                                          NULL, NULL, NULL, 0)) == 0) {
+        goto done;
+    }
+    /* Now let's try to open file with an empty pass */
+    if ((err = gnutls_pkcs12_simple_parse(p12, "", &key, &cert, &cert_num, NULL,
+                                          NULL, NULL, 0)) == 0) {
+        goto done;
+    }
+
+    if (!conn->password_callback) {
+        strophe_error(conn->ctx, "tls", "No password callback set");
+        goto error_out2;
+    }
+    /* ... and only now ask the user for a password */
+    while (retries++ < conn->password_retries) {
+        char pass[GNUTLS_PKCS11_MAX_PIN_LEN];
+        int passlen =
+            _tls_password_callback(conn, 0, NULL, NULL, 0, pass, sizeof(pass));
+        if (passlen < 0)
+            continue;
+
+        err = gnutls_pkcs12_simple_parse(p12, pass, &key, &cert, &cert_num,
+                                         NULL, NULL, NULL, 0);
+        memset(pass, 0, sizeof(pass));
+        if (err == 0)
+            break;
+        tls_clear_password_cache(conn);
+        if (err != GNUTLS_E_DECRYPTION_FAILED &&
+            err != GNUTLS_E_MAC_VERIFY_FAILED) {
+            strophe_error(conn->ctx, "tls", "could not read P12 file");
+            break;
+        }
+        strophe_debug(conn->ctx, "tls", "wrong password?");
+    }
+
+done:
+    gnutls_pkcs12_deinit(p12);
+    gnutls_free(data.data);
+    if (err < 0)
+        goto error_out;
+    gnutls_x509_privkey_deinit(key);
+    if (cert_num > 1) {
+        strophe_error(conn->ctx, "tls", "Can't handle stack of %u certs",
+                      cert_num);
+        goto error_out;
+    }
+    gnutls_x509_crt_t ret = *cert;
+    gnutls_free(cert);
+    return ret;
+error_out2:
+    gnutls_free(data.data);
+error_out:
+    tls_clear_password_cache(conn);
+    if (cert) {
+        for (unsigned int n = 0; n < cert_num; ++n) {
+            gnutls_x509_crt_deinit(cert[n]);
+        }
+        gnutls_free(cert);
+    }
+    return NULL;
+}
+
+static gnutls_x509_crt_t _tls_load_cert(xmpp_conn_t *conn)
+{
+    if (conn->tls && conn->tls->client_cert)
+        return conn->tls->client_cert;
+    if (conn->tls_client_cert && !conn->tls_client_key) {
+        return _tls_load_cert_p12(conn);
+    }
+    return _tls_load_cert_x509(conn);
+}
+
+static void _tls_free_cert(xmpp_conn_t *conn, gnutls_x509_crt_t cert)
+{
+    if (conn->tls && conn->tls->client_cert == cert)
+        return;
+    gnutls_x509_crt_deinit(cert);
+}
+
+static int _tls_get_id_on_xmppaddr(xmpp_conn_t *conn,
+                                   gnutls_x509_crt_t cert,
+                                   unsigned int n,
+                                   char **ret)
+{
+    gnutls_datum_t san;
+    size_t name_len, oid_len;
+    char oid[128], name[128];
+    name_len = oid_len = 128;
+    int res =
+        gnutls_x509_crt_get_subject_alt_name(cert, n, name, &name_len, NULL);
+    if (res == GNUTLS_SAN_OTHERNAME_XMPP) {
+        /* This is the happy flow path with fixed GnuTLS.
+         * While implementing this I stumbled over an issue in GnuTLS
+         * which lead to
+         * https://gitlab.com/gnutls/gnutls/-/merge_requests/1397
+         */
+        if (ret) {
+            *ret = strophe_strdup(conn->ctx, name);
+        }
+        return GNUTLS_SAN_OTHERNAME_XMPP;
+    }
+    if (res == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+        return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+    if (res != GNUTLS_SAN_OTHERNAME)
+        return GNUTLS_E_X509_UNKNOWN_SAN;
+    res = gnutls_x509_crt_get_subject_alt_othername_oid(cert, n, oid, &oid_len);
+    if (res == GNUTLS_SAN_OTHERNAME_XMPP) {
+        gnutls_datum_t xmpp_addr;
+        san.data = (unsigned char *)name;
+        san.size = name_len;
+        res = gnutls_x509_othername_to_virtual(oid, &san, NULL, &xmpp_addr);
+        if (res < 0) {
+            gnutls_free(xmpp_addr.data);
+            return GNUTLS_E_MEMORY_ERROR;
+        }
+        if (ret) {
+            *ret = strophe_strdup(conn->ctx, (char *)xmpp_addr.data);
+        }
+        gnutls_free(xmpp_addr.data);
+        return GNUTLS_SAN_OTHERNAME_XMPP;
+    }
+    return GNUTLS_E_X509_UNKNOWN_SAN;
+}
+
+static int _tls_id_on_xmppaddr(xmpp_conn_t *conn,
+                               gnutls_x509_crt_t cert,
+                               unsigned int n,
+                               char **ret)
+{
+    int res = GNUTLS_E_SUCCESS;
+    unsigned int i, j;
+    for (i = j = 0; res != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; ++i) {
+        res = _tls_get_id_on_xmppaddr(conn, cert, i, NULL);
+        if (res == GNUTLS_SAN_OTHERNAME_XMPP) {
+            if (j == n) {
+                res = _tls_get_id_on_xmppaddr(conn, cert, i, ret);
+                break;
+            }
+            j++;
+        }
+    }
+    return res;
+}
+
+/** Search through the SubjectAlternativeNames and return the next
+ *  id-on-xmppAddr element starting from `n`.
+ */
+char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n)
+{
+    char *ret = NULL;
+    gnutls_x509_crt_t cert = _tls_load_cert(conn);
+    if (cert == NULL)
+        return NULL;
+    _tls_id_on_xmppaddr(conn, cert, n, &ret);
+    _tls_free_cert(conn, cert);
+    return ret;
+}
+
+unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn)
+{
+    unsigned int ret = 0, n;
+    int res = GNUTLS_E_SUCCESS;
+    gnutls_x509_crt_t cert = _tls_load_cert(conn);
+    if (cert == NULL)
+        return 0;
+    for (n = 0; res != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; ++n) {
+        res = _tls_id_on_xmppaddr(conn, cert, n, NULL);
+        if (res == GNUTLS_SAN_OTHERNAME_XMPP)
+            ret++;
+    }
+    _tls_free_cert(conn, cert);
+    return ret;
+}
+
+static xmpp_tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, gnutls_x509_crt_t cert)
+{
+    int res;
+    char buf[512], smallbuf[64];
+    size_t size, m;
+    unsigned int algo, n;
+    gnutls_datum_t data;
+    time_t time_val;
+    xmpp_tlscert_t *tlscert = tlscert_new(ctx);
+
+    gnutls_x509_crt_export2(cert, GNUTLS_X509_FMT_PEM, &data);
+    tlscert->pem = strophe_alloc(ctx, data.size + 1);
+    memcpy(tlscert->pem, data.data, data.size);
+    tlscert->pem[data.size] = '\0';
+    gnutls_free(data.data);
+
+    size = sizeof(buf);
+    gnutls_x509_crt_get_dn(cert, buf, &size);
+    tlscert->elements[XMPP_CERT_SUBJECT] = strophe_strdup(ctx, buf);
+    size = sizeof(buf);
+    gnutls_x509_crt_get_issuer_dn(cert, buf, &size);
+    tlscert->elements[XMPP_CERT_ISSUER] = strophe_strdup(ctx, buf);
+
+    time_val = gnutls_x509_crt_get_activation_time(cert);
+    tlscert->elements[XMPP_CERT_NOTBEFORE] =
+        strophe_strdup(ctx, ctime(&time_val));
+    tlscert->elements[XMPP_CERT_NOTBEFORE]
+                     [strlen(tlscert->elements[XMPP_CERT_NOTBEFORE]) - 1] =
+        '\0';
+    time_val = gnutls_x509_crt_get_expiration_time(cert);
+    tlscert->elements[XMPP_CERT_NOTAFTER] =
+        strophe_strdup(ctx, ctime(&time_val));
+    tlscert->elements[XMPP_CERT_NOTAFTER]
+                     [strlen(tlscert->elements[XMPP_CERT_NOTAFTER]) - 1] = '\0';
+
+    size = sizeof(smallbuf);
+    gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, smallbuf, &size);
+    hex_encode(buf, smallbuf, size);
+    tlscert->elements[XMPP_CERT_FINGERPRINT_SHA1] = strophe_strdup(ctx, buf);
+    size = sizeof(smallbuf);
+    gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA256, smallbuf, &size);
+    hex_encode(buf, smallbuf, size);
+    tlscert->elements[XMPP_CERT_FINGERPRINT_SHA256] = strophe_strdup(ctx, buf);
+
+    strophe_snprintf(buf, sizeof(buf), "%d", gnutls_x509_crt_get_version(cert));
+    tlscert->elements[XMPP_CERT_VERSION] = strophe_strdup(ctx, buf);
+
+    algo = gnutls_x509_crt_get_pk_algorithm(cert, NULL);
+    tlscert->elements[XMPP_CERT_KEYALG] =
+        strophe_strdup(ctx, gnutls_pk_algorithm_get_name(algo));
+    algo = gnutls_x509_crt_get_signature_algorithm(cert);
+    tlscert->elements[XMPP_CERT_SIGALG] =
+        strophe_strdup(ctx, gnutls_sign_get_name(algo));
+
+    size = sizeof(smallbuf);
+    gnutls_x509_crt_get_serial(cert, smallbuf, &size);
+    hex_encode(buf, smallbuf, size);
+    tlscert->elements[XMPP_CERT_SERIALNUMBER] = strophe_strdup(ctx, buf);
+
+    for (n = 0, m = 0, res = 0; res != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+         ++n) {
+        size = sizeof(buf);
+        res = gnutls_x509_crt_get_subject_alt_name(cert, n, buf, &size, NULL);
+        if (res == GNUTLS_SAN_DNSNAME) {
+            if (tlscert_add_dnsname(tlscert, buf))
+                strophe_debug(ctx, "tls", "Can't store dnsName(%zu): %s", m,
+                              buf);
+            m++;
+        }
+    }
+
+    return tlscert;
+}
+
+static int _tls_verify(gnutls_session_t session)
+{
+    tls_t *tls = gnutls_session_get_ptr(session);
+    const gnutls_datum_t *cert_list;
+    gnutls_certificate_type_t type;
+    gnutls_datum_t out;
+    unsigned int cert_list_size = 0, status;
+    gnutls_x509_crt_t cert;
+
+    if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509)
+        return -1;
+
+    if (gnutls_certificate_verify_peers2(session, &status) < 0) {
+        strophe_error(tls->ctx, "tls", "Verify peers failed");
+        return -1;
+    }
+    type = gnutls_certificate_type_get(session);
+    if (gnutls_certificate_verification_status_print(status, type, &out, 0) <
+        0) {
+        strophe_error(tls->ctx, "tls", "Status print failed");
+        return -1;
+    }
+
+    /* Return early if the Certificate is trusted
+     * OR if we trust all Certificates */
+    if (status == 0 || tls->conn->tls_trust) {
+        gnutls_free(out.data);
+        return 0;
+    }
+
+    if (!tls->conn->certfail_handler) {
+        strophe_error(tls->ctx, "tls",
+                      "No certfail handler set, canceling connection attempt");
+        gnutls_free(out.data);
+        return -1;
+    }
+
+    cert_list = gnutls_certificate_get_peers(session, &cert_list_size);
+
+    /* OpenSSL displays the certificate chain in reverse order than GnuTLS.
+     * To show consistent behavior to the user, traverse the list from the
+     * end.
+     */
+    while (cert_list_size--) {
+        gnutls_x509_crt_init(&cert);
+
+        gnutls_x509_crt_import(cert, &cert_list[cert_list_size],
+                               GNUTLS_X509_FMT_DER);
+
+        xmpp_tlscert_t *tlscert = _x509_to_tlscert(tls->ctx, cert);
+
+        if (!tlscert) {
+            gnutls_x509_crt_deinit(cert);
+            gnutls_free(out.data);
+            return -1;
+        }
+
+        if (tls->conn->certfail_handler(tlscert, (char *)out.data) == 0) {
+            xmpp_tlscert_free(tlscert);
+            gnutls_x509_crt_deinit(cert);
+            gnutls_free(out.data);
+            return -1;
+        }
+        xmpp_tlscert_free(tlscert);
+        gnutls_x509_crt_deinit(cert);
+    }
+    gnutls_free(out.data);
+    return 0;
+}
+
 tls_t *tls_new(xmpp_conn_t *conn)
 {
-    tls_t *tls = xmpp_alloc(conn->ctx, sizeof(tls_t));
+    tls_t *tls = strophe_alloc(conn->ctx, sizeof(tls_t));

    if (tls) {
+        memset(tls, 0, sizeof(*tls));
        tls->ctx = conn->ctx;
-        tls->sock = conn->sock;
+        tls->conn = conn;
        gnutls_init(&tls->session, GNUTLS_CLIENT);

        gnutls_certificate_allocate_credentials(&tls->cred);
-        tls_set_credentials(tls, CAFILE);
+        tls_set_credentials(tls, NULL);
+
+        if (conn->password_callback)
+            gnutls_certificate_set_pin_function(tls->cred,
+                                                _tls_password_callback, conn);
+
+        if (conn->tls_client_cert && conn->tls_client_key) {
+            unsigned int retries = 0;
+            tls->client_cert = _tls_load_cert(conn);
+            if (!tls->client_cert) {
+                strophe_error(tls->ctx, "tls",
+                              "could not read client certificate");
+                goto error_out;
+            }
+            while (retries++ < conn->password_retries) {
+                int err = gnutls_certificate_set_x509_key_file(
+                    tls->cred, conn->tls_client_cert, conn->tls_client_key,
+                    GNUTLS_X509_FMT_PEM);
+                if (err == 0)
+                    break;
+                tls_clear_password_cache(conn);
+                if (err != GNUTLS_E_DECRYPTION_FAILED) {
+                    strophe_error(tls->ctx, "tls",
+                                  "could not read private key");
+                    goto error_out;
+                }
+                strophe_debug(tls->ctx, "tls", "wrong password?");
+            }
+        } else if (conn->tls_client_cert) {
+            unsigned int retries = 0;
+
+            while (retries++ < conn->password_retries) {
+                char pass[GNUTLS_PKCS11_MAX_PIN_LEN];
+                pass[0] = '\0';
+                int passlen = _tls_password_callback(conn, 0, NULL, NULL, 0,
+                                                     pass, sizeof(pass));
+                if (passlen < 0)
+                    continue;
+                int err = gnutls_certificate_set_x509_simple_pkcs12_file(
+                    tls->cred, conn->tls_client_cert, GNUTLS_X509_FMT_DER,
+                    pass);
+                memset(pass, 0, sizeof(pass));
+                if (err == 0)
+                    break;
+                tls_clear_password_cache(conn);
+                if (err != GNUTLS_E_DECRYPTION_FAILED &&
+                    err != GNUTLS_E_MAC_VERIFY_FAILED) {
+                    strophe_error(tls->ctx, "tls", "could not read P12 file");
+                    goto error_out;
+                }
+                strophe_debug(tls->ctx, "tls", "wrong password?");
+            }
+        }
+
+        gnutls_certificate_set_verify_function(tls->cred, _tls_verify);

        gnutls_set_default_priority(tls->session);
+        gnutls_session_set_ptr(tls->session, tls);

        /* fixme: this may require setting a callback on win32? */
        gnutls_transport_set_int(tls->session, conn->sock);
    }

    return tls;
+error_out:
+    if (tls->client_cert)
+        gnutls_x509_crt_deinit(tls->client_cert);
+    gnutls_certificate_free_credentials(tls->cred);
+    gnutls_deinit(tls->session);
+    strophe_free(tls->ctx, tls);
+    return NULL;
 }

 void tls_free(tls_t *tls)
 {
+    if (tls->client_cert)
+        gnutls_x509_crt_deinit(tls->client_cert);
    gnutls_deinit(tls->session);
    gnutls_certificate_free_credentials(tls->cred);
-    xmpp_free(tls->ctx, tls);
+    strophe_free(tls->ctx, tls);
+}
+
+xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn)
+{
+    xmpp_tlscert_t *tlscert = NULL;
+    if (conn && conn->tls && conn->tls->session) {
+        unsigned int list_size = 0;
+        const gnutls_datum_t *der_cert =
+            gnutls_certificate_get_peers(conn->tls->session, &list_size);
+        if (der_cert && list_size) {
+            gnutls_x509_crt_t cert;
+            if (gnutls_x509_crt_init(&cert) < 0)
+                return NULL;
+            if (gnutls_x509_crt_import(cert, der_cert, GNUTLS_X509_FMT_DER) ==
+                0)
+                tlscert = _x509_to_tlscert(conn->ctx, cert);
+            gnutls_x509_crt_deinit(cert);
+        }
+    }
+    return tlscert;
 }

 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
-    int err;
+    UNUSED(cafilename);

    /* set trusted credentials -- takes a .pem filename */
-    err = gnutls_certificate_set_x509_trust_file(tls->cred, cafilename,
-                                                 GNUTLS_X509_FMT_PEM);
+    int err = gnutls_certificate_set_x509_system_trust(tls->cred);
+    if (err >= 0 && tls->conn->tls_cafile)
+        err = gnutls_certificate_set_x509_trust_file(
+            tls->cred, tls->conn->tls_cafile, GNUTLS_X509_FMT_PEM);
+    if (err >= 0 && tls->conn->tls_capath)
+        err = gnutls_certificate_set_x509_trust_dir(
+            tls->cred, tls->conn->tls_capath, GNUTLS_X509_FMT_PEM);
    if (err >= 0) {
        err = gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE,
                                     tls->cred);
@@ -92,9 +556,9 @@ int tls_set_credentials(tls_t *tls, const char *cafilename)

 int tls_start(tls_t *tls)
 {
-    sock_set_blocking(tls->sock);
+    sock_set_blocking(tls->conn->sock);
    tls->lasterror = gnutls_handshake(tls->session);
-    sock_set_nonblocking(tls->sock);
+    sock_set_nonblocking(tls->conn->sock);

    return tls->lasterror == GNUTLS_E_SUCCESS;
 }
@@ -120,7 +584,7 @@ int tls_pending(tls_t *tls)
    return gnutls_record_check_pending(tls->session);
 }

-int tls_read(tls_t *tls, void *const buff, const size_t len)
+int tls_read(tls_t *tls, void *buff, size_t len)
 {
    int ret;

@@ -130,7 +594,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
    return ret;
 }

-int tls_write(tls_t *tls, const void *const buff, const size_t len)
+int tls_write(tls_t *tls, const void *buff, size_t len)
 {
    int ret;

--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -26,6 +26,7 @@
 #include <openssl/err.h>
 #include <openssl/opensslv.h>
 #include <openssl/x509v3.h>
+#include <openssl/pkcs12.h>

 #include "common.h"
 #include "tls.h"
@@ -47,11 +48,64 @@
 #endif
 #endif

+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+#define STROPHE_ERR_func_error_string(e) ERR_func_error_string(e)
+#else
+#define STROPHE_ERR_func_error_string(e) ""
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static const unsigned char *ASN1_STRING_get0_data(ASN1_STRING *asn1)
+{
+    return ASN1_STRING_data(asn1);
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+static int SSL_CTX_use_cert_and_key(SSL_CTX *ctx,
+                                    X509 *x509,
+                                    EVP_PKEY *privatekey,
+                                    STACK_OF(X509) * chain,
+                                    int override)
+{
+    UNUSED(override);
+    if (!ctx)
+        return 0;
+    if (x509 && !SSL_CTX_use_certificate(ctx, x509))
+        return 0;
+    if (privatekey && !SSL_CTX_use_PrivateKey(ctx, privatekey))
+        return 0;
+#ifdef SSL_CTX_set1_chain
+    if (chain && !SSL_CTX_set1_chain(ctx, chain))
+        return 0;
+#else
+    UNUSED(chain);
+#endif
+    return 1;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+static int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
+                                       ASN1_OBJECT **poid,
+                                       ASN1_TYPE **pvalue)
+{
+    if (gen->type != GEN_OTHERNAME)
+        return 0;
+    if (poid)
+        *poid = gen->d.otherName->type_id;
+    if (pvalue)
+        *pvalue = gen->d.otherName->value;
+    return 1;
+}
+#endif
+
 struct _tls {
    xmpp_ctx_t *ctx;
    sock_t sock;
    SSL_CTX *ssl_ctx;
    SSL *ssl;
+    X509 *client_cert;
    int lasterror;
 };

@@ -66,6 +120,14 @@ static const char *_tls_error_str(int error, const char **tbl, size_t tbl_size);
 static void _tls_set_error(tls_t *tls, int error);
 static void _tls_log_error(xmpp_ctx_t *ctx);
 static void _tls_dump_cert_info(tls_t *tls);
+static X509 *_tls_cert_read(xmpp_conn_t *conn);
+static X509 *
+_tls_cert_read_p12(xmpp_conn_t *conn, EVP_PKEY **pkey, STACK_OF(X509) * *ca);
+static int _tls_xaddr_nid(void);
+static int _tls_xmppaddr_to_string(GENERAL_NAME *name, char **res);
+static int _tls_dnsname_to_string(GENERAL_NAME *name, char **res);
+static GENERAL_NAMES *_tls_conn_get_names(xmpp_conn_t *conn);
+static GENERAL_NAMES *_tls_cert_get_names(X509 *client_cert);

 #define TLS_ERROR_STR(error, table) \
    _tls_error_str(error, table, ARRAY_SIZE(table))
@@ -81,6 +143,7 @@ const char *tls_errors[] = {
    TLS_ERROR_FIELD(SSL_ERROR_ZERO_RETURN),
    TLS_ERROR_FIELD(SSL_ERROR_WANT_CONNECT),
    TLS_ERROR_FIELD(SSL_ERROR_WANT_ACCEPT),
+#ifndef LIBRESSL_VERSION_NUMBER
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
    TLS_ERROR_FIELD(SSL_ERROR_WANT_ASYNC),
    TLS_ERROR_FIELD(SSL_ERROR_WANT_ASYNC_JOB),
@@ -88,6 +151,7 @@ const char *tls_errors[] = {
 #if OPENSSL_VERSION_NUMBER >= 0x10101000L
    TLS_ERROR_FIELD(SSL_ERROR_WANT_CLIENT_HELLO_CB),
 #endif
+#endif /* !LIBRESSL_VERSION_NUMBER */
 };
 const char *cert_errors[] = {
    TLS_ERROR_FIELD(X509_V_OK),
@@ -148,30 +212,36 @@ const char *cert_errors[] = {
    TLS_ERROR_FIELD(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX),
    TLS_ERROR_FIELD(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX),
    TLS_ERROR_FIELD(X509_V_ERR_CRL_PATH_VALIDATION_ERROR),
+#ifndef LIBRESSL_VERSION_NUMBER
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_VERSION),
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_ALGORITHM),
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_CURVE),
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM),
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED),
    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256),
+#endif /* !LIBRESSL_VERSION_NUMBER */
    TLS_ERROR_FIELD(X509_V_ERR_HOSTNAME_MISMATCH),
    TLS_ERROR_FIELD(X509_V_ERR_EMAIL_MISMATCH),
    TLS_ERROR_FIELD(X509_V_ERR_IP_ADDRESS_MISMATCH),
-#endif
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_CALL),
+    TLS_ERROR_FIELD(X509_V_ERR_STORE_LOOKUP),
+#ifndef LIBRESSL_VERSION_NUMBER
    TLS_ERROR_FIELD(X509_V_ERR_PATH_LOOP),
    TLS_ERROR_FIELD(X509_V_ERR_DANE_NO_MATCH),
    TLS_ERROR_FIELD(X509_V_ERR_EE_KEY_TOO_SMALL),
    TLS_ERROR_FIELD(X509_V_ERR_CA_KEY_TOO_SMALL),
    TLS_ERROR_FIELD(X509_V_ERR_CA_MD_TOO_WEAK),
-    TLS_ERROR_FIELD(X509_V_ERR_INVALID_CALL),
-    TLS_ERROR_FIELD(X509_V_ERR_STORE_LOOKUP),
    TLS_ERROR_FIELD(X509_V_ERR_NO_VALID_SCTS),
    TLS_ERROR_FIELD(X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION),
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L
    TLS_ERROR_FIELD(X509_V_ERR_OCSP_VERIFY_NEEDED),
    TLS_ERROR_FIELD(X509_V_ERR_OCSP_VERIFY_FAILED),
    TLS_ERROR_FIELD(X509_V_ERR_OCSP_CERT_UNKNOWN),
-#endif
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10101000L */
+#endif /* !LIBRESSL_VERSION_NUMBER */
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
 };
 #undef TLS_ERROR_FIELD

@@ -183,6 +253,8 @@ void tls_initialize(void)
 #else
    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
+    /* init xmppAddr OID */
+    _tls_xaddr_nid();
 }

 void tls_shutdown(void)
@@ -193,6 +265,7 @@ void tls_shutdown(void)
     * memory rather than cause random crashes of the main program.
     */
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
+    OBJ_cleanup();
    ERR_free_strings();
    EVP_cleanup();
    CRYPTO_cleanup_all_ex_data();
@@ -212,10 +285,275 @@ int tls_error(tls_t *tls)
    return tls->lasterror;
 }

+/** Search through the SubjectAlternativeNames and return the next
+ *  id-on-xmppAddr element starting from `n`.
+ */
+char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n)
+{
+    char *ret = NULL;
+    int i, j;
+    GENERAL_NAMES *names = _tls_conn_get_names(conn);
+    if (!names) {
+        _tls_log_error(conn->ctx);
+        return NULL;
+    }
+    int num_names = sk_GENERAL_NAME_num(names);
+    for (i = j = 0; i < num_names; ++i) {
+        char *res;
+        GENERAL_NAME *name = sk_GENERAL_NAME_value(names, i);
+        if (name == NULL)
+            break;
+        if (_tls_xmppaddr_to_string(name, &res))
+            continue;
+        if (j == (int)n) {
+            strophe_debug(conn->ctx, "tls",
+                          "extracted jid %s from id-on-xmppAddr", res);
+            ret = strophe_strdup(conn->ctx, res);
+            OPENSSL_free(res);
+            break;
+        }
+        j++;
+        OPENSSL_free(res);
+    }
+    GENERAL_NAMES_free(names);
+    return ret;
+}
+
+unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn)
+{
+    unsigned int ret = 0;
+    GENERAL_NAMES *names = _tls_conn_get_names(conn);
+    if (!names) {
+        _tls_log_error(conn->ctx);
+        return 0;
+    }
+    int j, num_names = sk_GENERAL_NAME_num(names);
+    for (j = 0; j < num_names; ++j) {
+        GENERAL_NAME *name = sk_GENERAL_NAME_value(names, j);
+        if (_tls_xmppaddr_to_string(name, NULL))
+            continue;
+        ret++;
+    }
+    GENERAL_NAMES_free(names);
+    return ret;
+}
+
+static int _convert_ASN1TIME(ASN1_TIME *ansi_time, char *buf, size_t len)
+{
+    BIO *bio = BIO_new(BIO_s_mem());
+    int rc = ASN1_TIME_print(bio, ansi_time);
+    if (rc <= 0) {
+        BIO_free(bio);
+        return 0;
+    }
+    rc = BIO_gets(bio, buf, len);
+    if (rc <= 0) {
+        BIO_free(bio);
+        return 0;
+    }
+    BIO_free(bio);
+    return 1;
+}
+
+static char *_asn1_time_to_str(const xmpp_ctx_t *ctx, ASN1_TIME *t)
+{
+    char buf[128];
+    int res = _convert_ASN1TIME(t, buf, sizeof(buf));
+    if (res) {
+        return strophe_strdup(ctx, buf);
+    }
+    return NULL;
+}
+
+static char *
+_get_fingerprint(const xmpp_ctx_t *ctx, X509 *err_cert, xmpp_cert_element_t el)
+{
+    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned int len;
+    const EVP_MD *digest;
+    switch (el) {
+    case XMPP_CERT_FINGERPRINT_SHA1:
+        digest = EVP_sha1();
+        break;
+    case XMPP_CERT_FINGERPRINT_SHA256:
+        digest = EVP_sha256();
+        break;
+    default:
+        return NULL;
+    }
+    if (X509_digest(err_cert, digest, buf, &len) != 0) {
+        char fingerprint[4 * EVP_MAX_MD_SIZE];
+        hex_encode(fingerprint, buf, len);
+        return strophe_strdup(ctx, fingerprint);
+    }
+    return NULL;
+}
+
+static char *
+_get_alg(const xmpp_ctx_t *ctx, X509 *err_cert, xmpp_cert_element_t el)
+{
+    int alg_nid = NID_undef;
+
+    switch (el) {
+    case XMPP_CERT_KEYALG: {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+        alg_nid = OBJ_obj2nid(err_cert->cert_info->key->algor->algorithm);
+#else
+        X509_PUBKEY *pubkey = X509_get_X509_PUBKEY(err_cert);
+        ASN1_OBJECT *ppkalg = NULL;
+        if (X509_PUBKEY_get0_param(&ppkalg, NULL, NULL, NULL, pubkey)) {
+            alg_nid = OBJ_obj2nid(ppkalg);
+        }
+#endif
+    } break;
+    case XMPP_CERT_SIGALG: {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+        alg_nid = OBJ_obj2nid(err_cert->sig_alg->algorithm);
+#else
+        const X509_ALGOR *palg;
+        X509_get0_signature(NULL, &palg, err_cert);
+        alg_nid = OBJ_obj2nid(palg->algorithm);
+#endif
+    } break;
+    default:
+        break;
+    }
+    if (alg_nid != NID_undef) {
+        const char *alg = OBJ_nid2ln(alg_nid);
+        if (alg) {
+            return strophe_strdup(ctx, alg);
+        }
+    }
+    return NULL;
+}
+
+static xmpp_tlscert_t *_x509_to_tlscert(xmpp_ctx_t *ctx, X509 *cert)
+{
+    char *subject, *issuer, buf[32];
+    xmpp_tlscert_t *tlscert = tlscert_new(ctx);
+    if (!tlscert)
+        return NULL;
+
+    BIO *b = BIO_new(BIO_s_mem());
+    if (!b)
+        goto error_out;
+    PEM_write_bio_X509(b, cert);
+    BUF_MEM *bptr;
+    BIO_get_mem_ptr(b, &bptr);
+    tlscert->pem = strophe_alloc(ctx, bptr->length + 1);
+    if (!tlscert->pem)
+        goto error_out;
+    memcpy(tlscert->pem, bptr->data, bptr->length);
+    tlscert->pem[bptr->length] = '\0';
+    BIO_free(b);
+
+    subject = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
+    if (!subject)
+        goto error_out;
+    tlscert->elements[XMPP_CERT_SUBJECT] = strophe_strdup(ctx, subject);
+    OPENSSL_free(subject);
+    issuer = X509_NAME_oneline(X509_get_issuer_name(cert), NULL, 0);
+    if (!issuer)
+        goto error_out;
+    tlscert->elements[XMPP_CERT_ISSUER] = strophe_strdup(ctx, issuer);
+    OPENSSL_free(issuer);
+
+    tlscert->elements[XMPP_CERT_NOTBEFORE] =
+        _asn1_time_to_str(ctx, X509_get_notBefore(cert));
+    tlscert->elements[XMPP_CERT_NOTAFTER] =
+        _asn1_time_to_str(ctx, X509_get_notAfter(cert));
+
+    tlscert->elements[XMPP_CERT_FINGERPRINT_SHA1] =
+        _get_fingerprint(ctx, cert, XMPP_CERT_FINGERPRINT_SHA1);
+    tlscert->elements[XMPP_CERT_FINGERPRINT_SHA256] =
+        _get_fingerprint(ctx, cert, XMPP_CERT_FINGERPRINT_SHA256);
+
+    strophe_snprintf(buf, sizeof(buf), "%ld", X509_get_version(cert) + 1);
+    tlscert->elements[XMPP_CERT_VERSION] = strophe_strdup(ctx, buf);
+
+    tlscert->elements[XMPP_CERT_KEYALG] = _get_alg(ctx, cert, XMPP_CERT_KEYALG);
+    tlscert->elements[XMPP_CERT_SIGALG] = _get_alg(ctx, cert, XMPP_CERT_SIGALG);
+
+    ASN1_INTEGER *serial = X509_get_serialNumber(cert);
+    BIGNUM *bn = ASN1_INTEGER_to_BN(serial, NULL);
+    if (bn) {
+        char *serialnumber = BN_bn2hex(bn);
+        if (serialnumber) {
+            tlscert->elements[XMPP_CERT_SERIALNUMBER] =
+                strophe_strdup(ctx, serialnumber);
+            OPENSSL_free(serialnumber);
+        }
+        BN_free(bn);
+    }
+
+    GENERAL_NAMES *names = _tls_cert_get_names(cert);
+    if (names) {
+        int j, num_names = sk_GENERAL_NAME_num(names);
+        size_t n = 0;
+        for (j = 0; j < num_names; ++j) {
+            char *res;
+            GENERAL_NAME *name = sk_GENERAL_NAME_value(names, j);
+            if (_tls_dnsname_to_string(name, &res))
+                continue;
+            if (tlscert_add_dnsname(tlscert, res))
+                strophe_debug(ctx, "tls", "Can't store dnsName(%zu): %s", n,
+                              res);
+            n++;
+            OPENSSL_free(res);
+        }
+        GENERAL_NAMES_free(names);
+    }
+
+    return tlscert;
+error_out:
+    xmpp_tlscert_free(tlscert);
+    return NULL;
+}
+
+static int _tls_verify(int preverify_ok, X509_STORE_CTX *x509_ctx)
+{
+    if (preverify_ok == 1)
+        return 1;
+
+    SSL *ssl = X509_STORE_CTX_get_ex_data(x509_ctx,
+                                          SSL_get_ex_data_X509_STORE_CTX_idx());
+    xmpp_conn_t *conn = SSL_get_app_data(ssl);
+
+    if (!conn->certfail_handler) {
+        strophe_error(conn->ctx, "tls",
+                      "No certfail handler set, canceling connection attempt");
+        return 0;
+    }
+
+    X509 *err_cert = X509_STORE_CTX_get_current_cert(x509_ctx);
+
+    xmpp_tlscert_t *tlscert = _x509_to_tlscert(conn->ctx, err_cert);
+
+    if (!tlscert)
+        return 0;
+
+    strophe_debug(conn->ctx, "tls", "preverify_ok:%d\nSubject: %s\nIssuer: %s",
+                  preverify_ok, tlscert->elements[XMPP_CERT_SUBJECT],
+                  tlscert->elements[XMPP_CERT_ISSUER]);
+
+    int ret = conn->certfail_handler(
+        tlscert,
+        X509_verify_cert_error_string(X509_STORE_CTX_get_error(x509_ctx)));
+
+    xmpp_tlscert_free(tlscert);
+
+    return ret;
+}
+
+static int _tls_password_callback(char *buf, int size, int rwflag, void *u)
+{
+    UNUSED(rwflag);
+    return tls_caching_password_callback(buf, size, u);
+}
+
 tls_t *tls_new(xmpp_conn_t *conn)
 {
-    tls_t *tls = xmpp_alloc(conn->ctx, sizeof(*tls));
-    int mode;
+    tls_t *tls = strophe_alloc(conn->ctx, sizeof(*tls));

    if (tls) {
        int ret;
@@ -243,7 +581,61 @@ tls_t *tls_new(xmpp_conn_t *conn)
        SSL_CTX_set_options(tls->ssl_ctx, SSL_OP_NO_SSLv3); /* POODLE */
        SSL_CTX_set_options(tls->ssl_ctx, SSL_OP_NO_TLSv1); /* BEAST */

-        SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL);
+        if (conn->password_callback) {
+            SSL_CTX_set_default_passwd_cb(tls->ssl_ctx, _tls_password_callback);
+            SSL_CTX_set_default_passwd_cb_userdata(tls->ssl_ctx, conn);
+        }
+
+        if (conn->tls_client_cert && conn->tls_client_key) {
+            unsigned int retries = 0;
+            tls->client_cert = _tls_cert_read(conn);
+            if (!tls->client_cert) {
+                strophe_error(tls->ctx, "tls",
+                              "could not read client certificate");
+                goto err_free_ctx;
+            }
+
+            SSL_CTX_use_certificate_file(tls->ssl_ctx, conn->tls_client_cert,
+                                         SSL_FILETYPE_PEM);
+            while (retries++ < conn->password_retries) {
+                if (SSL_CTX_use_PrivateKey_file(
+                        tls->ssl_ctx, conn->tls_client_key, SSL_FILETYPE_PEM)) {
+                    break;
+                }
+                tls_clear_password_cache(conn);
+                unsigned long err = ERR_peek_error();
+                if ((ERR_GET_LIB(err) == ERR_LIB_EVP &&
+                     ERR_GET_REASON(err) == EVP_R_BAD_DECRYPT) ||
+                    (ERR_GET_LIB(err) == ERR_LIB_PEM &&
+                     ERR_GET_REASON(err) == PEM_R_BAD_DECRYPT)) {
+                    strophe_debug(tls->ctx, "tls", "wrong password?");
+                    continue;
+                }
+                strophe_error(tls->ctx, "tls",
+                              "could not use private key %d %d",
+                              ERR_GET_LIB(err), ERR_GET_REASON(err));
+                goto err_free_ctx;
+            }
+        } else if (conn->tls_client_cert) {
+            EVP_PKEY *pkey = NULL;
+            STACK_OF(X509) *ca = NULL;
+            X509 *cert = _tls_cert_read_p12(conn, &pkey, &ca);
+            if (!cert) {
+                goto err_free_ctx;
+            }
+
+            SSL_CTX_use_cert_and_key(tls->ssl_ctx, cert, pkey, ca, 1);
+
+            if (pkey)
+                EVP_PKEY_free(pkey);
+            if (ca)
+                sk_X509_pop_free(ca, X509_free);
+            tls->client_cert = cert;
+        } else {
+            /* If the server asks for a client certificate, don't send one. */
+            SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL);
+        }
+
        SSL_CTX_set_mode(tls->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);

        ret = SSL_CTX_set_default_verify_paths(tls->ssl_ctx);
@@ -253,23 +645,36 @@ tls_t *tls_new(xmpp_conn_t *conn)
             * location is still treated as a success.
             * Ignore errors when XMPP_CONN_FLAG_TRUST_TLS is set.
             */
-            xmpp_error(tls->ctx, "tls",
-                       "SSL_CTX_set_default_verify_paths() failed");
-            goto err_free_ctx;
+            strophe_error(tls->ctx, "tls",
+                          "SSL_CTX_set_default_verify_paths() failed");
+            goto err_free_cert;
+        }
+
+        if (conn->tls_cafile || conn->tls_capath) {
+            if (SSL_CTX_load_verify_locations(tls->ssl_ctx, conn->tls_cafile,
+                                              conn->tls_capath) == 0) {
+                strophe_error(tls->ctx, "tls",
+                              "SSL_CTX_load_verify_locations() failed");
+                goto err_free_cert;
+            }
        }

        tls->ssl = SSL_new(tls->ssl_ctx);
        if (tls->ssl == NULL)
-            goto err_free_ctx;
+            goto err_free_cert;

 #if OPENSSL_VERSION_NUMBER >= 0x0908060L && !defined(OPENSSL_NO_TLSEXT)
        /* Enable SNI. */
        SSL_set_tlsext_host_name(tls->ssl, conn->domain);
 #endif

-        /* Trust server's certificate when user sets the flag explicitly. */
-        mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
-        SSL_set_verify(tls->ssl, mode, NULL);
+        /* Trust server's certificate when user sets the flag explicitly.
+         * Otherwise call the verification callback */
+        if (conn->tls_trust)
+            SSL_set_verify(tls->ssl, SSL_VERIFY_NONE, NULL);
+        else
+            SSL_set_verify(tls->ssl, SSL_VERIFY_PEER, _tls_verify);
+        SSL_set_app_data(tls->ssl, conn);
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
        /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
        param = SSL_get0_param(tls->ssl);
@@ -295,10 +700,12 @@ tls_t *tls_new(xmpp_conn_t *conn)

 err_free_ssl:
    SSL_free(tls->ssl);
+err_free_cert:
+    X509_free(tls->client_cert);
 err_free_ctx:
    SSL_CTX_free(tls->ssl_ctx);
 err:
-    xmpp_free(conn->ctx, tls);
+    strophe_free(conn->ctx, tls);
    _tls_log_error(conn->ctx);
    return NULL;
 }
@@ -306,8 +713,22 @@ err:
 void tls_free(tls_t *tls)
 {
    SSL_free(tls->ssl);
+    X509_free(tls->client_cert);
    SSL_CTX_free(tls->ssl_ctx);
-    xmpp_free(tls->ctx, tls);
+    strophe_free(tls->ctx, tls);
+}
+
+xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn)
+{
+    if (conn && conn->tls && conn->tls->ssl) {
+        X509 *cert = SSL_get_peer_certificate(conn->tls->ssl);
+        if (cert) {
+            xmpp_tlscert_t *tlscert = _x509_to_tlscert(conn->ctx, cert);
+            X509_free(cert);
+            return tlscert;
+        }
+    }
+    return NULL;
 }

 int tls_set_credentials(tls_t *tls, const char *cafilename)
@@ -341,11 +762,13 @@ int tls_start(tls_t *tls)

    x509_res = SSL_get_verify_result(tls->ssl);
    if (x509_res == X509_V_OK) {
-        xmpp_debug(tls->ctx, "tls", "Certificate verification passed");
+        strophe_debug(tls->ctx, "tls", "Certificate verification passed");
    } else {
-        xmpp_debug(tls->ctx, "tls",
-                   "Certificate verification FAILED, result=%s(%ld)",
-                   TLS_ERROR_STR((int)x509_res, cert_errors), x509_res);
+        strophe_debug(tls->ctx, "tls",
+                      "Certificate verification FAILED, result=%s(%ld)",
+                      TLS_ERROR_STR((int)x509_res, cert_errors), x509_res);
+        if (ret > 0)
+            strophe_debug(tls->ctx, "tls", "User decided to connect anyways");
    }
    _tls_dump_cert_info(tls);

@@ -399,7 +822,7 @@ int tls_pending(tls_t *tls)
    return SSL_pending(tls->ssl);
 }

-int tls_read(tls_t *tls, void *const buff, const size_t len)
+int tls_read(tls_t *tls, void *buff, size_t len)
 {
    int ret;

@@ -409,7 +832,7 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
    return ret;
 }

-int tls_write(tls_t *tls, const void *const buff, const size_t len)
+int tls_write(tls_t *tls, const void *buff, size_t len)
 {
    int ret;

@@ -460,9 +883,13 @@ static const char *_tls_error_str(int error, const char **tbl, size_t tbl_size)
 static void _tls_set_error(tls_t *tls, int error)
 {
    if (error != 0 && !tls_is_recoverable(error)) {
-        xmpp_debug(tls->ctx, "tls", "error=%s(%d) errno=%d",
-                   TLS_ERROR_STR(error, tls_errors), error, errno);
+        strophe_debug(tls->ctx, "tls", "error=%s(%d) errno=%d lasterror=%d",
+                      TLS_ERROR_STR(error, tls_errors), error, errno,
+                      tls->lasterror);
        _tls_log_error(tls->ctx);
+    } else if (tls->lasterror && tls->lasterror != error) {
+        strophe_debug_verbose(1, tls->ctx, "tls", "overwrite lasterror=%d",
+                              tls->lasterror);
    }
    tls->lasterror = error;
 }
@@ -470,13 +897,13 @@ static void _tls_set_error(tls_t *tls, int error)
 static void _tls_log_error(xmpp_ctx_t *ctx)
 {
    unsigned long e;
-    char buf[256];

    do {
        e = ERR_get_error();
        if (e != 0) {
-            ERR_error_string_n(e, buf, sizeof(buf));
-            xmpp_debug(ctx, "tls", "%s", buf);
+            strophe_debug(
+                ctx, "tls", "error:%08X:%s:%s:%s", e, ERR_lib_error_string(e),
+                STROPHE_ERR_func_error_string(e), ERR_reason_error_string(e));
        }
    } while (e != 0);
 }
@@ -488,18 +915,214 @@ static void _tls_dump_cert_info(tls_t *tls)

    cert = SSL_get_peer_certificate(tls->ssl);
    if (cert == NULL)
-        xmpp_debug(tls->ctx, "tls", "Certificate was not presented by peer");
+        strophe_debug(tls->ctx, "tls", "Certificate was not presented by peer");
    else {
        name = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
        if (name != NULL) {
-            xmpp_debug(tls->ctx, "tls", "Subject=%s", name);
+            strophe_debug(tls->ctx, "tls", "Subject=%s", name);
            OPENSSL_free(name);
        }
        name = X509_NAME_oneline(X509_get_issuer_name(cert), NULL, 0);
        if (name != NULL) {
-            xmpp_debug(tls->ctx, "tls", "Issuer=%s", name);
+            strophe_debug(tls->ctx, "tls", "Issuer=%s", name);
            OPENSSL_free(name);
        }
        X509_free(cert);
    }
 }
+
+static X509 *_tls_cert_read_x509(xmpp_conn_t *conn)
+{
+    if (conn->tls && conn->tls->client_cert)
+        return conn->tls->client_cert;
+    BIO *f = BIO_new_file(conn->tls_client_cert, "r");
+    if (!f) {
+        strophe_debug(conn->ctx, "tls", "f == NULL");
+        return NULL;
+    }
+    X509 *c = PEM_read_bio_X509(f, NULL, NULL, NULL);
+    BIO_free(f);
+    if (!c) {
+        _tls_log_error(conn->ctx);
+    }
+    return c;
+}
+
+static int _tls_parse_p12(PKCS12 *p12,
+                          const char *pass,
+                          EVP_PKEY **pkey,
+                          X509 **cert,
+                          STACK_OF(X509) * *ca)
+{
+    /* For some reason `PKCS12_parse()` fails without a `EVP_PKEY`
+     * so if the user doesn't want it, use a local one and free it
+     * again directly after parsing.
+     */
+    EVP_PKEY *pkey_;
+    if (!pkey)
+        pkey = &pkey_;
+    int parse_ok = PKCS12_parse(p12, pass, pkey, cert, ca);
+    if (pkey == &pkey_ && pkey_)
+        EVP_PKEY_free(pkey_);
+    return parse_ok;
+}
+
+static X509 *
+_tls_cert_read_p12(xmpp_conn_t *conn, EVP_PKEY **pkey, STACK_OF(X509) * *ca)
+{
+    if (conn->tls && conn->tls->client_cert && !pkey && !ca)
+        return conn->tls->client_cert;
+    X509 *cert = NULL;
+    PKCS12 *p12 = NULL;
+    BIO *f = BIO_new_file(conn->tls_client_cert, "rb");
+    if (!f) {
+        strophe_debug(conn->ctx, "tls", "f == NULL");
+        goto error_out;
+    }
+    p12 = d2i_PKCS12_bio(f, NULL);
+    BIO_free(f);
+    if (!p12) {
+        strophe_debug(conn->ctx, "tls", "Could not read p12 file");
+        goto error_out;
+    }
+
+    /* First try to open file w/o a pass */
+    if (_tls_parse_p12(p12, NULL, pkey, &cert, ca)) {
+        goto success;
+    }
+    cert = NULL;
+
+    unsigned int retries = 0;
+
+    pem_password_cb *cb = PEM_def_callback;
+    void *userdata = NULL;
+    if (conn->password_callback) {
+        cb = _tls_password_callback;
+        userdata = conn;
+    }
+
+    while (retries++ < conn->password_retries) {
+        char pass[PEM_BUFSIZE + 1];
+        int passlen = cb(pass, PEM_BUFSIZE, 0, userdata);
+        if (passlen < 0 || passlen > PEM_BUFSIZE)
+            goto error_out;
+        int parse_ok = _tls_parse_p12(p12, pass, pkey, &cert, ca);
+        if (parse_ok) {
+            goto success;
+        }
+        cert = NULL;
+        tls_clear_password_cache(conn);
+        int err = ERR_peek_last_error();
+        if (ERR_GET_LIB(err) == ERR_LIB_PKCS12 &&
+            ERR_GET_REASON(err) == PKCS12_R_MAC_VERIFY_FAILURE) {
+            strophe_debug(conn->ctx, "tls",
+                          "Entered password is most likely wrong!");
+            continue;
+        }
+        strophe_debug(conn->ctx, "tls", "Could not parse PKCS#12");
+        goto error_out;
+    }
+error_out:
+    _tls_log_error(conn->ctx);
+success:
+    if (p12)
+        PKCS12_free(p12);
+    return cert;
+}
+
+static X509 *_tls_cert_read(xmpp_conn_t *conn)
+{
+    if (conn->tls && conn->tls->client_cert)
+        return conn->tls->client_cert;
+    if (conn->tls_client_cert && !conn->tls_client_key) {
+        return _tls_cert_read_p12(conn, NULL, NULL);
+    }
+    return _tls_cert_read_x509(conn);
+}
+
+static int _tls_xaddr_nid(void)
+{
+    static int xaddr_nid = NID_undef;
+    if (xaddr_nid == NID_undef) {
+        xaddr_nid = OBJ_sn2nid("id-on-xmppAddr");
+    }
+    if (xaddr_nid == NID_undef) {
+        xaddr_nid = OBJ_create("1.3.6.1.5.5.7.8.5", "id-on-xmppAddr",
+                               "XmppAddr Identifier");
+    }
+    return xaddr_nid;
+}
+
+static GENERAL_NAMES *_tls_conn_get_names(xmpp_conn_t *conn)
+{
+    X509 *client_cert;
+    GENERAL_NAMES *names = NULL;
+    client_cert = _tls_cert_read(conn);
+    if (!client_cert)
+        return NULL;
+    names = _tls_cert_get_names(client_cert);
+    if (!conn->tls || !conn->tls->client_cert)
+        X509_free(client_cert);
+    return names;
+}
+
+static GENERAL_NAMES *_tls_cert_get_names(X509 *client_cert)
+{
+    int san = X509_get_ext_by_NID(client_cert, NID_subject_alt_name, 0);
+    X509_EXTENSION *san_ext = X509_get_ext(client_cert, san);
+    if (!san_ext)
+        return NULL;
+    ASN1_OCTET_STRING *data = X509_EXTENSION_get_data(san_ext);
+    if (!data)
+        return NULL;
+    const unsigned char *d = ASN1_STRING_get0_data(data);
+    if (!d)
+        return NULL;
+    return d2i_GENERAL_NAMES(NULL, &d, ASN1_STRING_length(data));
+}
+
+/** Convert GENERAL_NAME* to a string
+ *
+ *  This checks whether the GENERAL_NAME* that is given has the
+ *  correct id-on-xmppAddr set and then optionally converts this
+ *  form ASN.1 to a string/char*.
+ *
+ *  When `res` pointer is set to NULL this method doesn't allocate
+ *  the result but only checks whether it is in the correct format.
+ *
+ *  @param name Pointer to the GENERAL_NAME that shall be converted
+ *  @param res Result-pointer (optional, can be NULL)
+ *
+ *  @return classic Unix style - 0=success, 1=error
+ */
+static int _tls_xmppaddr_to_string(GENERAL_NAME *name, char **res)
+{
+    ASN1_OBJECT *oid;
+    ASN1_TYPE *val;
+    if (!name || name->type != GEN_OTHERNAME)
+        return 1;
+    if (GENERAL_NAME_get0_otherName(name, &oid, &val) == 0)
+        return 1;
+    if (OBJ_obj2nid(oid) != _tls_xaddr_nid() || !val)
+        return 1;
+    if (!res)
+        return 0;
+    if (ASN1_STRING_to_UTF8((unsigned char **)res, val->value.asn1_string) < 0)
+        return 1;
+    return 0;
+}
+
+static int _tls_dnsname_to_string(GENERAL_NAME *name, char **res)
+{
+    ASN1_STRING *str;
+    if (!name || name->type != GEN_DNS)
+        return 1;
+    str = GENERAL_NAME_get0_value(name, NULL);
+    if (str == NULL)
+        return 1;
+    if (!res)
+        return 0;
+    if (ASN1_STRING_to_UTF8((unsigned char **)res, str) < 0)
+        return 1;
+    return 0;
+}
--- a/src/tls_schannel.c
+++ b/src/tls_schannel.c
@@ -61,6 +61,21 @@ void tls_shutdown(void)
    return;
 }

+char *tls_id_on_xmppaddr(xmpp_conn_t *conn, unsigned int n)
+{
+    UNUSED(n);
+    /* always fail */
+    strophe_error(conn->ctx, "tls", "Client-Authentication not implemented");
+    return NULL;
+}
+
+unsigned int tls_id_on_xmppaddr_num(xmpp_conn_t *conn)
+{
+    /* always fail */
+    strophe_error(conn->ctx, "tls", "Client-Authentication not implemented");
+    return 0;
+}
+
 tls_t *tls_new(xmpp_conn_t *conn)
 {
    xmpp_ctx_t *ctx = conn->ctx;
@@ -87,7 +102,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
        return NULL;
    }

-    tls = xmpp_alloc(ctx, sizeof(*tls));
+    tls = strophe_alloc(ctx, sizeof(*tls));

    if (!tls) {
        return NULL;
@@ -123,7 +138,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
        return NULL;
    }

-    xmpp_debug(ctx, "TLSS", "QuerySecurityPackageInfo() success");
+    strophe_debug(ctx, "TLSS", "QuerySecurityPackageInfo() success");

    memset(&scred, 0, sizeof(scred));
    scred.dwVersion = SCHANNEL_CRED_VERSION;
@@ -148,7 +163,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
        return NULL;
    }

-    xmpp_debug(ctx, "TLSS", "AcquireCredentialsHandle() success");
+    strophe_debug(ctx, "TLSS", "AcquireCredentialsHandle() success");

    tls->init = 1;

@@ -181,15 +196,15 @@ tls_t *tls_new(xmpp_conn_t *conn)
 void tls_free(tls_t *tls)
 {
    if (tls->recvbuffer) {
-        xmpp_free(tls->ctx, tls->recvbuffer);
+        strophe_free(tls->ctx, tls->recvbuffer);
    }

    if (tls->readybuffer) {
-        xmpp_free(tls->ctx, tls->readybuffer);
+        strophe_free(tls->ctx, tls->readybuffer);
    }

    if (tls->sendbuffer) {
-        xmpp_free(tls->ctx, tls->sendbuffer);
+        strophe_free(tls->ctx, tls->sendbuffer);
    }

    if (tls->init) {
@@ -203,10 +218,17 @@ void tls_free(tls_t *tls)
        tls->hsec32 = NULL;
    }

-    xmpp_free(tls->ctx, tls);
+    strophe_free(tls->ctx, tls);
    return;
 }

+xmpp_tlscert_t *tls_peer_cert(xmpp_conn_t *conn)
+{
+    /* always fail */
+    strophe_error(conn->ctx, "tls", "tls_peer_cert() not implemented");
+    return NULL;
+}
+
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
    UNUSED(tls);
@@ -241,7 +263,7 @@ int tls_start(tls_t *tls)

    memset(&(sbin[0]), 0, sizeof(sbin[0]));
    sbin[0].BufferType = SECBUFFER_TOKEN;
-    sbin[0].pvBuffer = xmpp_alloc(tls->ctx, tls->spi->cbMaxToken);
+    sbin[0].pvBuffer = strophe_alloc(tls->ctx, tls->spi->cbMaxToken);
    sbin[0].cbBuffer = tls->spi->cbMaxToken;

    memset(&(sbin[1]), 0, sizeof(sbin[1]));
@@ -347,12 +369,12 @@ int tls_start(tls_t *tls)
        }
    }

-    xmpp_free(tls->ctx, sbin[0].pvBuffer);
+    strophe_free(tls->ctx, sbin[0].pvBuffer);

    if (ret != SEC_E_OK) {
        tls->lasterror = ret;
-        xmpp_error(tls->ctx, "TLSS", "Schannel error 0x%lx",
-                   (unsigned long)ret);
+        strophe_error(tls->ctx, "TLSS", "Schannel error 0x%lx",
+                      (unsigned long)ret);
        return 0;
    }

@@ -361,16 +383,16 @@ int tls_start(tls_t *tls)

    tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
                            tls->spcss.cbTrailer;
-    tls->recvbuffer = xmpp_alloc(tls->ctx, tls->recvbuffermaxlen);
+    tls->recvbuffer = strophe_alloc(tls->ctx, tls->recvbuffermaxlen);
    tls->recvbufferpos = 0;

    tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
                            tls->spcss.cbTrailer;
-    tls->sendbuffer = xmpp_alloc(tls->ctx, tls->sendbuffermaxlen);
+    tls->sendbuffer = strophe_alloc(tls->ctx, tls->sendbuffermaxlen);
    tls->sendbufferpos = 0;
    tls->sendbufferlen = 0;

-    tls->readybuffer = xmpp_alloc(tls->ctx, tls->spcss.cbMaximumMessage);
+    tls->readybuffer = strophe_alloc(tls->ctx, tls->spcss.cbMaximumMessage);
    tls->readybufferpos = 0;
    tls->readybufferlen = 0;

@@ -412,7 +434,7 @@ int tls_pending(tls_t *tls)
    return 0;
 }

-int tls_read(tls_t *tls, void *const buff, const size_t len)
+int tls_read(tls_t *tls, void *buff, size_t len)
 {
    int bytes;

@@ -557,7 +579,7 @@ int tls_clear_pending_write(tls_t *tls)
    return 1;
 }

-int tls_write(tls_t *tls, const void *const buff, const size_t len)
+int tls_write(tls_t *tls, const void *buff, size_t len)
 {
    SecBufferDesc sbdenc;
    SecBuffer sbenc[4];
--- a/src/util.c
+++ b/src/util.c
@@ -15,6 +15,7 @@

 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>

 #ifdef _WIN32
 #include <winsock2.h>
@@ -36,21 +37,41 @@
 *  @param ctx a Strophe context object
 *  @param s a string
 *
- *  @return a new allocates string with the same data as s or NULL on error
+ *  @return a newly allocated string with the same data as s or NULL on error
 */
-char *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s)
+char *strophe_strdup(const xmpp_ctx_t *ctx, const char *s)
 {
-    size_t len;
-    char *copy;
+    return strophe_strndup(ctx, s, SIZE_MAX);
+}

-    len = strlen(s);
-    copy = xmpp_alloc(ctx, len + 1);
+/** Duplicate a string with a maximum length.
+ *  This function replaces the standard strndup library call with a version
+ *  that uses the Strophe context object's allocator.
+ *
+ *  @param ctx a Strophe context object
+ *  @param s a string
+ *  @param len the maximum length of the string to copy
+ *
+ *  @return a newly allocated string that contains at most `len` symbols
+ *             of the original string or NULL on error
+ */
+char *strophe_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len)
+{
+    char *copy;
+    size_t l;
+
+    l = strlen(s);
+    if (l > len)
+        l = len;
+
+    copy = strophe_alloc(ctx, l + 1);
    if (!copy) {
-        xmpp_error(ctx, "xmpp", "failed to allocate required memory");
+        strophe_error(ctx, "xmpp", "failed to allocate required memory");
        return NULL;
    }

-    memcpy(copy, s, len + 1);
+    memcpy(copy, s, l);
+    copy[l] = '\0';

    return copy;
 }
@@ -60,7 +81,7 @@ char *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s)
 *  For example, visual studio older than 2005 doesn't provide strtok_r()
 *  nor strtok_s().
 */
-char *xmpp_strtok_r(char *s, const char *delim, char **saveptr)
+char *strophe_strtok_r(char *s, const char *delim, char **saveptr)
 {
    size_t len;

@@ -135,8 +156,24 @@ uint64_t time_elapsed(uint64_t t1, uint64_t t2)
 *
 *  @param conn a Strophe connection object
 */
-void disconnect_mem_error(xmpp_conn_t *const conn)
+void disconnect_mem_error(xmpp_conn_t *conn)
 {
-    xmpp_error(conn->ctx, "xmpp", "Memory allocation error");
+    strophe_error(conn->ctx, "xmpp", "Memory allocation error");
    xmpp_disconnect(conn);
 }
+
+int string_to_ul(const char *s, unsigned long *ul)
+{
+    char *endptr;
+    *ul = strtoul(s, &endptr, 10);
+    return *endptr != '\0';
+}
+
+void hex_encode(char *writebuf, void *readbuf, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len; i++) {
+        sprintf(writebuf, "%02x", ((unsigned char *)readbuf)[i]);
+        writebuf += 2;
+    }
+}
--- a/src/util.h
+++ b/src/util.h
@@ -26,10 +26,14 @@
 #define xmpp_min(x, y) ((x) < (y) ? (x) : (y))

 /* string functions */
-char *xmpp_strtok_r(char *s, const char *delim, char **saveptr);
+char *strophe_strtok_r(char *s, const char *delim, char **saveptr);

 /* timing functions */
 uint64_t time_stamp(void);
 uint64_t time_elapsed(uint64_t t1, uint64_t t2);

+/* misc functions */
+int string_to_ul(const char *s, unsigned long *ul);
+void hex_encode(char *writebuf, void *readbuf, size_t len);
+
 #endif /* __LIBSTROPHE_UTIL_H__ */
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -15,7 +15,6 @@

 #include "strophe.h"
 #include "common.h"
-#include "rand.h"

 /** @def XMPP_UUID_LEN
 *  UUID length in string representation excluding '\0'.
@@ -65,7 +64,7 @@ char *xmpp_uuid_gen(xmpp_ctx_t *ctx)
 {
    char *uuid;

-    uuid = xmpp_alloc(ctx, XMPP_UUID_LEN + 1);
+    uuid = strophe_alloc(ctx, XMPP_UUID_LEN + 1);
    if (uuid != NULL) {
        crypto_uuid_gen(ctx, uuid);
    }
--- a/strophe.h
+++ b/strophe.h
@@ -79,6 +79,10 @@ extern "C" {
 *  Namespace definition for 'jabber:iq:register'.
 */
 #define XMPP_NS_REGISTER "jabber:iq:register"
+/** @def XMPP_NS_SM
+ *  Namespace definition for Stream Management.
+ */
+#define XMPP_NS_SM "urn:xmpp:sm:3"

 /* error defines */
 /** @def XMPP_EOK
@@ -122,18 +126,22 @@ typedef struct _xmpp_log_t xmpp_log_t;
 /* opaque run time context containing the above hooks */
 typedef struct _xmpp_ctx_t xmpp_ctx_t;

-xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
-                         const xmpp_log_t *const log);
-void xmpp_ctx_free(xmpp_ctx_t *const ctx);
+typedef struct _xmpp_tlscert_t xmpp_tlscert_t;
+
+xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *mem, const xmpp_log_t *log);
+void xmpp_ctx_free(xmpp_ctx_t *ctx);
+
+/* set the verbosity level of the ctx */
+void xmpp_ctx_set_verbosity(xmpp_ctx_t *ctx, int level);

 /* free some blocks returned by other APIs, for example the
   buffer you get from xmpp_stanza_to_text */
-void xmpp_free(const xmpp_ctx_t *const ctx, void *p);
+void xmpp_free(const xmpp_ctx_t *ctx, void *p);

 struct _xmpp_mem_t {
-    void *(*alloc)(const size_t size, void *const userdata);
-    void (*free)(void *p, void *const userdata);
-    void *(*realloc)(void *p, const size_t size, void *const userdata);
+    void *(*alloc)(size_t size, void *userdata);
+    void (*free)(void *p, void *userdata);
+    void *(*realloc)(void *p, size_t size, void *userdata);
    void *userdata;
 };

@@ -146,10 +154,10 @@ typedef enum {

 typedef enum { XMPP_UNKNOWN, XMPP_CLIENT, XMPP_COMPONENT } xmpp_conn_type_t;

-typedef void (*xmpp_log_handler)(void *const userdata,
-                                 const xmpp_log_level_t level,
-                                 const char *const area,
-                                 const char *const msg);
+typedef void (*xmpp_log_handler)(void *userdata,
+                                 xmpp_log_level_t level,
+                                 const char *area,
+                                 const char *msg);

 struct _xmpp_log_t {
    xmpp_log_handler handler;
@@ -164,6 +172,7 @@ xmpp_log_t *xmpp_get_default_logger(xmpp_log_level_t level);
 /* opaque connection object */
 typedef struct _xmpp_conn_t xmpp_conn_t;
 typedef struct _xmpp_stanza_t xmpp_stanza_t;
+typedef struct _xmpp_sm_t xmpp_sm_state_t;

 /* connection flags */
 #define XMPP_CONN_FLAG_DISABLE_TLS (1UL << 0)
@@ -177,6 +186,10 @@ typedef struct _xmpp_stanza_t xmpp_stanza_t;
 *  Enable legacy authentication support.
 */
 #define XMPP_CONN_FLAG_LEGACY_AUTH (1UL << 4)
+/** @def XMPP_CONN_FLAG_DISABLE_SM
+ *  Disable Stream-Management XEP-0198.
+ */
+#define XMPP_CONN_FLAG_DISABLE_SM (1UL << 5)

 /* connect callback */
 typedef enum {
@@ -213,118 +226,253 @@ typedef enum {
    XMPP_SE_XML_NOT_WELL_FORMED
 } xmpp_error_type_t;

+/** Certificate Elements
+ *
+ *  @ingroup TLS
+ */
+typedef enum {
+    XMPP_CERT_VERSION,            /**< X.509 Version */
+    XMPP_CERT_SERIALNUMBER,       /**< SerialNumber */
+    XMPP_CERT_SUBJECT,            /**< Subject */
+    XMPP_CERT_ISSUER,             /**< Issuer */
+    XMPP_CERT_NOTBEFORE,          /**< Issued on */
+    XMPP_CERT_NOTAFTER,           /**< Expires on */
+    XMPP_CERT_KEYALG,             /**< Public Key Algorithm */
+    XMPP_CERT_SIGALG,             /**< Certificate Signature Algorithm */
+    XMPP_CERT_FINGERPRINT_SHA1,   /**< Fingerprint SHA-1 */
+    XMPP_CERT_FINGERPRINT_SHA256, /**< Fingerprint SHA-256 */
+    XMPP_CERT_ELEMENT_MAX         /**< Last element of the enum */
+} xmpp_cert_element_t;
+
 typedef struct {
    xmpp_error_type_t type;
    char *text;
    xmpp_stanza_t *stanza;
 } xmpp_stream_error_t;

-typedef void (*xmpp_conn_handler)(xmpp_conn_t *const conn,
-                                  const xmpp_conn_event_t event,
-                                  const int error,
-                                  xmpp_stream_error_t *const stream_error,
-                                  void *const userdata);
+typedef void (*xmpp_conn_handler)(xmpp_conn_t *conn,
+                                  xmpp_conn_event_t event,
+                                  int error,
+                                  xmpp_stream_error_t *stream_error,
+                                  void *userdata);

-void xmpp_send_error(xmpp_conn_t *const conn,
-                     xmpp_error_type_t const type,
-                     char *const text);
-xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx);
-xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *const conn);
-int xmpp_conn_release(xmpp_conn_t *const conn);
+/** The Handler function which will be called when the TLS stack can't
+ *  verify the authenticity of a Certificate that gets presented by
+ *  the server we're trying to connect to.
+ *
+ *  When this function is called and details of the `cert` have to be
+ *  kept, please copy them yourself. The `cert` object will be free'd
+ *  automatically when this function returns.
+ *
+ *  NB: `errormsg` is specific per certificate on OpenSSL and the same
+ *      for all certificates on GnuTLS.
+ *
+ *  @param cert a Strophe certificate object
+ *  @param errormsg The error that caused this.
+ *
+ *  @return 0 if the connection attempt should be terminated,
+ *          1 if the connection should be established.
+ *
+ *  @ingroup TLS
+ */
+typedef int (*xmpp_certfail_handler)(const xmpp_tlscert_t *cert,
+                                     const char *const errormsg);

-long xmpp_conn_get_flags(const xmpp_conn_t *const conn);
-int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags);
-const char *xmpp_conn_get_jid(const xmpp_conn_t *const conn);
-const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *const conn);
-void xmpp_conn_set_jid(xmpp_conn_t *const conn, const char *const jid);
-const char *xmpp_conn_get_pass(const xmpp_conn_t *const conn);
-void xmpp_conn_set_pass(xmpp_conn_t *const conn, const char *const pass);
-xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *const conn);
-void xmpp_conn_disable_tls(xmpp_conn_t *const conn);
-int xmpp_conn_is_secured(xmpp_conn_t *const conn);
-void xmpp_conn_set_keepalive(xmpp_conn_t *const conn,
-                             int timeout,
-                             int interval);
-int xmpp_conn_is_connecting(xmpp_conn_t *const conn);
-int xmpp_conn_is_connected(xmpp_conn_t *const conn);
-int xmpp_conn_is_disconnected(xmpp_conn_t *const conn);
+/** The Handler function which will be called when the TLS stack can't
+ *  decrypt a password protected key file.
+ *
+ *  When this callback is called it shall write a NULL-terminated
+ *  string of maximum length `pw_max - 1` to `pw`.
+ *
+ *  This is currently only supported for GnuTLS and OpenSSL.
+ *
+ *  On 2022-02-02 the following maximum lengths are valid:
+ *  ```
+ *  include/gnutls/pkcs11.h: #define GNUTLS_PKCS11_MAX_PIN_LEN 256
+ *  include/openssl/pem.h: #define PEM_BUFSIZE 1024
+ *  ```
+ *
+ *  We expect the buffer to be NULL-terminated, therefore the usable lengths
+ *  are:
+ *
+ *  * 255 for GnuTLS
+ *  * 1023 for OpenSSL
+ *
+ *  Useful API's inside this callback are e.g.
+ *
+ *  \ref xmpp_conn_get_keyfile
+ *
+ *
+ *  @param pw       The buffer where the password shall be stored.
+ *  @param pw_max   The maximum length of the password.
+ *  @param conn     The Strophe connection object this callback originates from.
+ *  @param userdata The userdata pointer as supplied when setting this callback.
+ *
+ *  @return -1 on error, else the number of bytes written to `pw` w/o
+ *           terminating NUL byte
+ *
+ *  @ingroup TLS
+ */
+typedef int (*xmpp_password_callback)(char *pw,
+                                      size_t pw_max,
+                                      xmpp_conn_t *conn,
+                                      void *userdata);

-int xmpp_connect_client(xmpp_conn_t *const conn,
-                        const char *const altdomain,
+/** The function which will be called when Strophe creates a new socket.
+ *
+ *  The `sock` argument is a pointer that is dependent on the architecture
+ *  Strophe is compiled for.
+ *
+ *  For POSIX compatible systems usage shall be:
+ *  ```
+ *  int soc = *((int*)sock);
+ *  ```
+ *
+ *  On Windows usage shall be:
+ *  ```
+ *  SOCKET soc = *((SOCKET*)sock);
+ *  ```
+ *
+ *  This function will be called for each socket that is created.
+ *
+ *  `examples/bot.c` uses a libstrophe supplied callback function that sets
+ *  basic keepalive parameters (`xmpp_sockopt_cb_keepalive()`).
+ *
+ *  `examples/complex.c` implements a custom function that could be useful
+ *  for an application.
+ *
+ *  @param conn     The Strophe connection object this callback originates from.
+ *  @param sock     A pointer to the underlying file descriptor.
+ *
+ *  @return 0 on success, -1 on error
+ *
+ *  @ingroup Connections
+ */
+typedef int (*xmpp_sockopt_callback)(xmpp_conn_t *conn, void *sock);
+
+/* an example callback that sets basic keepalive parameters */
+int xmpp_sockopt_cb_keepalive(xmpp_conn_t *conn, void *sock);
+
+void xmpp_send_error(xmpp_conn_t *conn, xmpp_error_type_t type, char *text);
+xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *ctx);
+xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *conn);
+int xmpp_conn_release(xmpp_conn_t *conn);
+
+long xmpp_conn_get_flags(const xmpp_conn_t *conn);
+int xmpp_conn_set_flags(xmpp_conn_t *conn, long flags);
+const char *xmpp_conn_get_jid(const xmpp_conn_t *conn);
+const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *conn);
+void xmpp_conn_set_jid(xmpp_conn_t *conn, const char *jid);
+void xmpp_conn_set_cafile(xmpp_conn_t *const conn, const char *path);
+void xmpp_conn_set_capath(xmpp_conn_t *const conn, const char *path);
+void xmpp_conn_set_certfail_handler(xmpp_conn_t *const conn,
+                                    xmpp_certfail_handler hndl);
+xmpp_tlscert_t *xmpp_conn_get_peer_cert(xmpp_conn_t *const conn);
+void xmpp_conn_set_password_callback(xmpp_conn_t *conn,
+                                     xmpp_password_callback cb,
+                                     void *userdata);
+void xmpp_conn_set_password_retries(xmpp_conn_t *conn, unsigned int retries);
+const char *xmpp_conn_get_keyfile(const xmpp_conn_t *conn);
+void xmpp_conn_set_client_cert(xmpp_conn_t *conn,
+                               const char *cert,
+                               const char *key);
+unsigned int xmpp_conn_cert_xmppaddr_num(xmpp_conn_t *conn);
+char *xmpp_conn_cert_xmppaddr(xmpp_conn_t *conn, unsigned int n);
+const char *xmpp_conn_get_pass(const xmpp_conn_t *conn);
+void xmpp_conn_set_pass(xmpp_conn_t *conn, const char *pass);
+xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *conn);
+void xmpp_conn_disable_tls(xmpp_conn_t *conn);
+int xmpp_conn_is_secured(xmpp_conn_t *conn);
+void xmpp_conn_set_sockopt_callback(xmpp_conn_t *conn,
+                                    xmpp_sockopt_callback callback);
+int xmpp_conn_is_connecting(xmpp_conn_t *conn);
+int xmpp_conn_is_connected(xmpp_conn_t *conn);
+int xmpp_conn_is_disconnected(xmpp_conn_t *conn);
+int xmpp_conn_send_queue_len(const xmpp_conn_t *conn);
+
+typedef enum {
+    XMPP_QUEUE_OLDEST = -1,
+    XMPP_QUEUE_YOUNGEST = -2,
+} xmpp_queue_element_t;
+char *xmpp_conn_send_queue_drop_element(xmpp_conn_t *conn,
+                                        xmpp_queue_element_t which);
+
+xmpp_sm_state_t *xmpp_conn_get_sm_state(xmpp_conn_t *conn);
+int xmpp_conn_set_sm_state(xmpp_conn_t *conn, xmpp_sm_state_t *sm_state);
+
+void xmpp_free_sm_state(xmpp_sm_state_t *sm_state);
+
+int xmpp_connect_client(xmpp_conn_t *conn,
+                        const char *altdomain,
                        unsigned short altport,
                        xmpp_conn_handler callback,
-                        void *const userdata);
+                        void *userdata);

-int xmpp_connect_component(xmpp_conn_t *const conn,
-                           const char *const server,
+int xmpp_connect_component(xmpp_conn_t *conn,
+                           const char *server,
                           unsigned short port,
                           xmpp_conn_handler callback,
-                           void *const userdata);
+                           void *userdata);

-int xmpp_connect_raw(xmpp_conn_t *const conn,
-                     const char *const altdomain,
+int xmpp_connect_raw(xmpp_conn_t *conn,
+                     const char *altdomain,
                     unsigned short altport,
                     xmpp_conn_handler callback,
-                     void *const userdata);
-int xmpp_conn_open_stream_default(xmpp_conn_t *const conn);
-int xmpp_conn_open_stream(xmpp_conn_t *const conn,
+                     void *userdata);
+int xmpp_conn_open_stream_default(xmpp_conn_t *conn);
+int xmpp_conn_open_stream(xmpp_conn_t *conn,
                          char **attributes,
                          size_t attributes_len);
-int xmpp_conn_tls_start(xmpp_conn_t *const conn);
+int xmpp_conn_tls_start(xmpp_conn_t *conn);

-void xmpp_disconnect(xmpp_conn_t *const conn);
+void xmpp_disconnect(xmpp_conn_t *conn);

-void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza);
+void xmpp_send(xmpp_conn_t *conn, xmpp_stanza_t *stanza);

-void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...);
-void xmpp_send_raw(xmpp_conn_t *const conn,
-                   const char *const data,
-                   const size_t len);
+void xmpp_send_raw_string(xmpp_conn_t *conn, const char *fmt, ...);
+void xmpp_send_raw(xmpp_conn_t *conn, const char *data, size_t len);

 /* handlers */

 /* if the handler returns false it is removed */
-typedef int (*xmpp_timed_handler)(xmpp_conn_t *const conn,
-                                  void *const userdata);
+typedef int (*xmpp_timed_handler)(xmpp_conn_t *conn, void *userdata);

-void xmpp_timed_handler_add(xmpp_conn_t *const conn,
+void xmpp_timed_handler_add(xmpp_conn_t *conn,
                            xmpp_timed_handler handler,
-                            const unsigned long period,
-                            void *const userdata);
-void xmpp_timed_handler_delete(xmpp_conn_t *const conn,
-                               xmpp_timed_handler handler);
+                            unsigned long period,
+                            void *userdata);
+void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler);

 /* if the handler returns false it is removed */
-typedef int (*xmpp_global_timed_handler)(xmpp_ctx_t *const ctx,
-                                         void *const userdata);
+typedef int (*xmpp_global_timed_handler)(xmpp_ctx_t *ctx, void *userdata);

-void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
+void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,
                                   xmpp_global_timed_handler handler,
-                                   const unsigned long period,
-                                   void *const userdata);
-void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx,
+                                   unsigned long period,
+                                   void *userdata);
+void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,
                                      xmpp_global_timed_handler handler);

 /* if the handler returns false it is removed */
-typedef int (*xmpp_handler)(xmpp_conn_t *const conn,
-                            xmpp_stanza_t *const stanza,
-                            void *const userdata);
+typedef int (*xmpp_handler)(xmpp_conn_t *conn,
+                            xmpp_stanza_t *stanza,
+                            void *userdata);

-void xmpp_handler_add(xmpp_conn_t *const conn,
+void xmpp_handler_add(xmpp_conn_t *conn,
                      xmpp_handler handler,
-                      const char *const ns,
-                      const char *const name,
-                      const char *const type,
-                      void *const userdata);
-void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler);
+                      const char *ns,
+                      const char *name,
+                      const char *type,
+                      void *userdata);
+void xmpp_handler_delete(xmpp_conn_t *conn, xmpp_handler handler);

-void xmpp_id_handler_add(xmpp_conn_t *const conn,
+void xmpp_id_handler_add(xmpp_conn_t *conn,
                         xmpp_handler handler,
-                         const char *const id,
-                         void *const userdata);
-void xmpp_id_handler_delete(xmpp_conn_t *const conn,
+                         const char *id,
+                         void *userdata);
+void xmpp_id_handler_delete(xmpp_conn_t *conn,
                            xmpp_handler handler,
-                            const char *const id);
+                            const char *id);

 /*
 void xmpp_register_stanza_handler(conn, stanza, xmlns, type, handler)
@@ -337,94 +485,91 @@ xmpp_stanza_t *xmpp_stanza_new(xmpp_ctx_t *ctx);
 xmpp_stanza_t *xmpp_stanza_new_from_string(xmpp_ctx_t *ctx, const char *str);

 /* clone a stanza */
-xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *const stanza);
+xmpp_stanza_t *xmpp_stanza_clone(xmpp_stanza_t *stanza);

 /* copies a stanza and all children */
-xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza);
+xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *stanza);

 /* free a stanza object and it's contents */
-int xmpp_stanza_release(xmpp_stanza_t *const stanza);
+int xmpp_stanza_release(xmpp_stanza_t *stanza);

-xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza);
+xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *stanza);

-int xmpp_stanza_is_text(xmpp_stanza_t *const stanza);
-int xmpp_stanza_is_tag(xmpp_stanza_t *const stanza);
+int xmpp_stanza_is_text(xmpp_stanza_t *stanza);
+int xmpp_stanza_is_tag(xmpp_stanza_t *stanza);

 /* marshall a stanza into text for transmission or display */
-int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
-                        char **const buf,
-                        size_t *const buflen);
+int xmpp_stanza_to_text(xmpp_stanza_t *stanza, char **buf, size_t *buflen);

-xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *const stanza);
-xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *const stanza,
-                                             const char *const name);
-xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza,
-                                           const char *const ns);
-xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza,
-                                                    const char *const name,
-                                                    const char *const ns);
-xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *const stanza);
+xmpp_stanza_t *xmpp_stanza_get_children(xmpp_stanza_t *stanza);
+xmpp_stanza_t *xmpp_stanza_get_child_by_name(xmpp_stanza_t *stanza,
+                                             const char *name);
+xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *stanza,
+                                           const char *ns);
+xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *stanza,
+                                                    const char *name,
+                                                    const char *ns);
+/* helper macro for names with a namespace */
+#define XMPP_STANZA_NAME_IN_NS(name, ns) name "[@ns='" ns "']"
+xmpp_stanza_t *xmpp_stanza_get_child_by_path(xmpp_stanza_t *stanza, ...);
+xmpp_stanza_t *xmpp_stanza_get_next(xmpp_stanza_t *stanza);
 int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child);
 int xmpp_stanza_add_child_ex(xmpp_stanza_t *stanza,
                             xmpp_stanza_t *child,
                             int do_clone);

-const char *xmpp_stanza_get_attribute(xmpp_stanza_t *const stanza,
-                                      const char *const name);
-int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza);
-int xmpp_stanza_get_attributes(xmpp_stanza_t *const stanza,
+const char *xmpp_stanza_get_attribute(xmpp_stanza_t *stanza, const char *name);
+int xmpp_stanza_get_attribute_count(xmpp_stanza_t *stanza);
+int xmpp_stanza_get_attributes(xmpp_stanza_t *stanza,
                               const char **attr,
                               int attrlen);
 /* concatenate all child text nodes.  this function
 * returns a string that must be freed by the caller */
-char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza);
+char *xmpp_stanza_get_text(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_name(xmpp_stanza_t *stanza);
 /* set_attribute adds/replaces attributes */
-int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
-                              const char *const key,
-                              const char *const value);
-int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name);
-int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text);
+int xmpp_stanza_set_attribute(xmpp_stanza_t *stanza,
+                              const char *key,
+                              const char *value);
+int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *name);
+int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *text);
 int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
-                                   const char *const text,
-                                   const size_t size);
-int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
-                              const char *const name);
+                                   const char *text,
+                                   size_t size);
+int xmpp_stanza_del_attribute(xmpp_stanza_t *stanza, const char *name);

 /* common stanza helpers */
-const char *xmpp_stanza_get_ns(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_type(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_id(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_to(xmpp_stanza_t *const stanza);
-const char *xmpp_stanza_get_from(xmpp_stanza_t *const stanza);
-int xmpp_stanza_set_ns(xmpp_stanza_t *const stanza, const char *const ns);
-int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id);
-int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type);
-int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to);
-int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from);
+const char *xmpp_stanza_get_ns(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_type(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_id(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_to(xmpp_stanza_t *stanza);
+const char *xmpp_stanza_get_from(xmpp_stanza_t *stanza);
+int xmpp_stanza_set_ns(xmpp_stanza_t *stanza, const char *ns);
+int xmpp_stanza_set_id(xmpp_stanza_t *stanza, const char *id);
+int xmpp_stanza_set_type(xmpp_stanza_t *stanza, const char *type);
+int xmpp_stanza_set_to(xmpp_stanza_t *stanza, const char *to);
+int xmpp_stanza_set_from(xmpp_stanza_t *stanza, const char *from);

 /* allocate and initialize a stanza in reply to another */
-xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza);
-xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza,
-                                       const char *const error_type,
-                                       const char *const condition,
-                                       const char *const text);
+xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *stanza);
+xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *stanza,
+                                       const char *error_type,
+                                       const char *condition,
+                                       const char *text);

 /* stanza subclasses */
 xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
-                                const char *const type,
-                                const char *const to,
-                                const char *const id);
+                                const char *type,
+                                const char *to,
+                                const char *id);
 char *xmpp_message_get_body(xmpp_stanza_t *msg);
-int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text);
+int xmpp_message_set_body(xmpp_stanza_t *msg, const char *text);

-xmpp_stanza_t *
-xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id);
+xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char *type, const char *id);
 xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx);
-xmpp_stanza_t *xmpp_error_new(xmpp_ctx_t *ctx,
-                              xmpp_error_type_t const type,
-                              const char *const text);
+xmpp_stanza_t *
+xmpp_error_new(xmpp_ctx_t *ctx, xmpp_error_type_t type, const char *text);

 /* jid */

@@ -440,10 +585,21 @@ char *xmpp_jid_resource(xmpp_ctx_t *ctx, const char *jid);

 /* event loop */

-void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout);
+void xmpp_run_once(xmpp_ctx_t *ctx, unsigned long timeout);
 void xmpp_run(xmpp_ctx_t *ctx);
 void xmpp_stop(xmpp_ctx_t *ctx);
-void xmpp_ctx_set_timeout(xmpp_ctx_t *const ctx, const unsigned long timeout);
+void xmpp_ctx_set_timeout(xmpp_ctx_t *ctx, unsigned long timeout);
+
+/* TLS certificates */
+
+xmpp_ctx_t *xmpp_tlscert_get_ctx(const xmpp_tlscert_t *cert);
+xmpp_conn_t *xmpp_tlscert_get_conn(const xmpp_tlscert_t *cert);
+const char *xmpp_tlscert_get_pem(const xmpp_tlscert_t *cert);
+const char *xmpp_tlscert_get_dnsname(const xmpp_tlscert_t *cert, size_t n);
+const char *xmpp_tlscert_get_string(const xmpp_tlscert_t *cert,
+                                    xmpp_cert_element_t elmnt);
+const char *xmpp_tlscert_get_description(xmpp_cert_element_t elmnt);
+void xmpp_tlscert_free(xmpp_tlscert_t *cert);

 /* UUID */

@@ -482,6 +638,111 @@ void xmpp_base64_decode_bin(xmpp_ctx_t *ctx,
                            unsigned char **out,
                            size_t *outlen);

+/* RNG */
+
+typedef struct _xmpp_rand_t xmpp_rand_t;
+
+/** Create new xmpp_rand_t object.
+ *
+ *  @param ctx A Strophe context object
+ *
+ *  @ingroup Random
+ */
+xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx);
+
+/** Destroy an xmpp_rand_t object.
+ *
+ *  @param ctx A Strophe context object
+ *  @param rand A xmpp_rand_t object
+ *
+ *  @ingroup Random
+ */
+void xmpp_rand_free(xmpp_ctx_t *ctx, xmpp_rand_t *rand);
+
+/** Generate random integer.
+ *  Analogue of rand(3).
+ *
+ *  @ingroup Random
+ */
+int xmpp_rand(xmpp_rand_t *rand);
+
+/** Generate random bytes.
+ *  Generates len bytes and stores them to the output buffer.
+ *
+ *  @param rand A xmpp_rand_t object
+ *  @param output A buffer where a len random bytes will be placed.
+ *  @param len Number of bytes reserved for the output..
+ *
+ *  @ingroup Random
+ */
+void xmpp_rand_bytes(xmpp_rand_t *rand, unsigned char *output, size_t len);
+
+/** Generate a nonce that is printable randomized string.
+ *  This function doesn't allocate memory and doesn't fail.
+ *
+ *  @param rand A xmpp_rand_t object
+ *  @param output A buffer where a NULL-terminated string will be placed.
+ *                The string will contain len-1 printable symbols.
+ *  @param len Number of bytes reserved for the output string, including
+ *             end of line '\0'.
+ *
+ *  @ingroup Random
+ */
+void xmpp_rand_nonce(xmpp_rand_t *rand, char *output, size_t len);
+
+/**
+ * Formerly "private but exported" functions made public for now to announce
+ * deprecation */
+#include <stdarg.h>
+
+#if defined(__GNUC__)
+#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 405)
+#define XMPP_DEPRECATED(x) __attribute__((deprecated("replaced by " #x)))
+#elif (__GNUC__ * 100 + __GNUC_MINOR__ >= 300)
+#define XMPP_DEPRECATED(x) __attribute__((deprecated))
+#endif
+#elif defined(_MSC_VER) && _MSC_VER >= 1500
+#define XMPP_DEPRECATED(x) __declspec(deprecated("replaced by " #x))
+#else
+#define XMPP_DEPRECATED(x)
+#endif
+
+XMPP_DEPRECATED(internal) void *xmpp_alloc(const xmpp_ctx_t *ctx, size_t size);
+XMPP_DEPRECATED(internal)
+void *xmpp_realloc(const xmpp_ctx_t *ctx, void *p, size_t size);
+XMPP_DEPRECATED(internal)
+char *xmpp_strdup(const xmpp_ctx_t *ctx, const char *s);
+XMPP_DEPRECATED(internal)
+char *xmpp_strndup(const xmpp_ctx_t *ctx, const char *s, size_t len);
+
+XMPP_DEPRECATED(internal)
+char *xmpp_strtok_r(char *s, const char *delim, char **saveptr);
+XMPP_DEPRECATED(internal)
+int xmpp_snprintf(char *str, size_t count, const char *fmt, ...);
+XMPP_DEPRECATED(internal)
+int xmpp_vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
+
+XMPP_DEPRECATED(internal)
+void xmpp_log(const xmpp_ctx_t *ctx,
+              xmpp_log_level_t level,
+              const char *area,
+              const char *fmt,
+              va_list ap);
+XMPP_DEPRECATED(internal)
+void xmpp_error(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+XMPP_DEPRECATED(internal)
+void xmpp_warn(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+XMPP_DEPRECATED(internal)
+void xmpp_info(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+XMPP_DEPRECATED(internal)
+void xmpp_debug(const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+XMPP_DEPRECATED(internal)
+void xmpp_debug_verbose(
+    int level, const xmpp_ctx_t *ctx, const char *area, const char *fmt, ...);
+
+XMPP_DEPRECATED(xmpp_conn_set_sockopt_callback)
+void xmpp_conn_set_keepalive(xmpp_conn_t *conn, int timeout, int interval);
+
 #ifdef __cplusplus
 }
 #endif
--- a/testbuild.sh
+++ b/testbuild.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logfile="../../testbuild.log"
+
+err_out() {
+  tail $logfile
+  exit 1
+}
+
+./bootstrap.sh
+./configure >> $logfile || err_out
+make -j$(( `nproc` * 2 + 1 )) >> $logfile || err_out
+make check >> $logfile || err_out
--- a/tests/cert.emptypass.pfx
+++ b/tests/cert.emptypass.pfx
--- a/tests/cert.nopass.pfx
+++ b/tests/cert.nopass.pfx
--- a/tests/cert.pem
+++ b/tests/cert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICfjCCAjSgAwIBAgIIW5u5Vwn2Mv0wCgYIKoZIzj0EAwIwSzFJMEcGA1UEAwxA
+dmVyeS5sb25nLnVzZXJuYW1lQHNvLnRoZS5hc24xLmxlbmd0aC5pcy5hLnZhbGlk
+LmFzY2lpLmNoYXJhY3RlcjAgFw0yMTAzMDExOTExMDBaGA8yMTIxMDMwMTE5MTEw
+MFowSzFJMEcGA1UEAwxAdmVyeS5sb25nLnVzZXJuYW1lQHNvLnRoZS5hc24xLmxl
+bmd0aC5pcy5hLnZhbGlkLmFzY2lpLmNoYXJhY3RlcjBJMBMGByqGSM49AgEGCCqG
+SM49AwEBAzIABI/tSR5cZ9iHCVw0JwmKLvV3TbxPg3kDdouB0R2WKEdEWwXMIHkE
+85RReISg+9/JDaOCAQ4wggEKMAkGA1UdEwQCMAAwHQYDVR0OBBYEFPjLGyHxqlOV
+nXJQ9YBrnureO8LiMB8GA1UdIwQYMBaAFPjLGyHxqlOVnXJQ9YBrnureO8LiMAsG
+A1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjCBmgYDVR0RBIGSMIGPoE4G
+CCsGAQUFBwgFoEIMQHZlcnkubG9uZy51c2VybmFtZUBzby50aGUuYXNuMS5sZW5n
+dGguaXMuYS52YWxpZC5hc2NpaS5jaGFyYWN0ZXKBDnlldEBub3RoZXIuc2Fugg53
+d3cuc3Ryb3BoZS5pbaAdBggrBgEFBQcIBaARDA9zZWNvbmRAeG1wcC5qaWQwCgYI
+KoZIzj0EAwIDOAAwNQIZAJmfqBhBMdaKCiWEuXu84K4+lznfzlRfmwIYCGRD1xk0
+9cRa3V6PVwYWz6HcdRdMUBUj
+-----END CERTIFICATE-----
--- a/tests/cert.pfx
+++ b/tests/cert.pfx
--- a/tests/key.pem
+++ b/tests/key.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MF8CAQEEGF7SsbTSOjzb97nFc7Qbt4sic+1nZk+ETqAKBggqhkjOPQMBAaE0AzIA
+BI/tSR5cZ9iHCVw0JwmKLvV3TbxPg3kDdouB0R2WKEdEWwXMIHkE85RReISg+9/J
+DQ==
+-----END EC PRIVATE KEY-----
--- a/tests/key_encrypted.pem
+++ b/tests/key_encrypted.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,30B7F2152A39184AEEF290ED2B1DBC0E
+
+IojJAF1hGHL9qnu5MCzl5l1PzsnxLj38JjLBLPXaNekiAbag5H9Tzr7y5nfyviPM
+hi6syrkXgLOBF+mZWJouOxCNx7+t6eWVfsDZcnzsw6HrTN/2xwkYP/3lYfzlnt6q
+/AKYQIUUPc/31J6xg3kGRQ==
+-----END EC PRIVATE KEY-----
--- a/tests/test.c
+++ b/tests/test.c
@@ -16,9 +16,9 @@

 static uint8_t char_to_bin(char c)
 {
-    return c <= '9'
-               ? (uint8_t)(c - '0')
-               : c <= 'Z' ? (uint8_t)(c - 'A' + 10) : (uint8_t)(c - 'a' + 10);
+    return c <= '9'   ? (uint8_t)(c - '0')
+           : c <= 'Z' ? (uint8_t)(c - 'A' + 10)
+                      : (uint8_t)(c - 'a' + 10);
 }

 void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len)
--- a/tests/test.h
+++ b/tests/test.h
@@ -14,6 +14,7 @@

 #include <stddef.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include "ostypes.h"

@@ -33,17 +34,17 @@
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 #endif

-#define COMPARE(v1, v2)                \
-    do {                               \
-        const char *__v1 = v1;         \
-        const char *__v2 = v2;         \
-        if (strcmp(__v1, __v2) != 0) { \
-            printf("%s differs!\n"     \
-                   "expected: %s\n"    \
-                   "got:      %s\n",   \
-                   #v1, __v1, __v2);   \
-            exit(1);                   \
-        }                              \
+#define COMPARE(v1, v2)                                  \
+    do {                                                 \
+        const char *__v1 = v1;                           \
+        const char *__v2 = v2;                           \
+        if (!__v1 || !__v2 || strcmp(__v1, __v2) != 0) { \
+            printf("Error:    %s\n"                      \
+                   "Expected: %s\n"                      \
+                   "Got:      %s\n",                     \
+                   #v1 " != " #v2, __v1, __v2);          \
+            exit(1);                                     \
+        }                                                \
    } while (0)

 #define COMPARE_BUF(v1, len1, v2, len2)                                \
@@ -53,13 +54,26 @@
        size_t __len1 = len1;                                          \
        size_t __len2 = len2;                                          \
        if (__len1 != __len2 || memcmp(__v1, __v2, __len1) != 0) {     \
-            printf("%s differs!\n", #v1);                              \
-            printf("expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \
-            printf("got:      0x%s\n", test_bin_to_hex(__v2, __len2)); \
+            printf("Error:    %s\n", #v1 " != " #v2);                  \
+            printf("Expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \
+            printf("Got:      0x%s\n", test_bin_to_hex(__v2, __len2)); \
            exit(1);                                                   \
        }                                                              \
    } while (0)

+#define ENSURE_EQ(v1, v2)                       \
+    do {                                        \
+        int __v1 = v1;                          \
+        int __v2 = v2;                          \
+        if (__v1 != __v2) {                     \
+            printf("Error:    %s\n"             \
+                   "Expected: %d\n"             \
+                   "Got:      %d\n",            \
+                   #v1 " != " #v2, __v2, __v1); \
+            exit(1);                            \
+        }                                       \
+    } while (0)
+
 void test_hex_to_bin(const char *hex, uint8_t *bin, size_t *bin_len);
 const char *test_bin_to_hex(const uint8_t *bin, size_t len);

--- a/tests/test_ctx.c
+++ b/tests/test_ctx.c
@@ -22,7 +22,7 @@ static int mem_alloc_called = 0;
 static int mem_free_called = 0;
 static int mem_realloc_called = 0;

-void *my_alloc(const size_t size, void *const userdata)
+void *my_alloc(size_t size, void *userdata)
 {
    (void)userdata;

@@ -30,7 +30,7 @@ void *my_alloc(const size_t size, void *const userdata)
    return malloc(size);
 }

-void my_free(void *p, void *const userdata)
+void my_free(void *p, void *userdata)
 {
    (void)userdata;

@@ -38,7 +38,7 @@ void my_free(void *p, void *const userdata)
    return free(p);
 }

-void *my_realloc(void *p, const size_t size, void *const userdata)
+void *my_realloc(void *p, size_t size, void *userdata)
 {
    (void)userdata;

@@ -46,10 +46,10 @@ void *my_realloc(void *p, const size_t size, void *const userdata)
    return realloc(p, size);
 }

-void my_logger(void *const userdata,
-               const xmpp_log_level_t level,
-               const char *const area,
-               const char *const msg)
+void my_logger(void *userdata,
+               xmpp_log_level_t level,
+               const char *area,
+               const char *msg)
 {
    if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG &&
        strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)
@@ -81,22 +81,22 @@ int main()
    mylog.userdata = my_str;

    ctx = xmpp_ctx_new(&mymem, &mylog);
-    xmpp_debug(ctx, "test", "hello");
+    strophe_debug(ctx, "test", "hello");

-    testptr1 = xmpp_alloc(ctx, 1024);
+    testptr1 = strophe_alloc(ctx, 1024);
    if (testptr1 == NULL) {
        xmpp_ctx_free(ctx);
        return 1;
    }

-    testptr2 = xmpp_realloc(ctx, testptr1, 2048);
+    testptr2 = strophe_realloc(ctx, testptr1, 2048);
    if (testptr2 == NULL) {
-        xmpp_free(ctx, testptr1);
+        strophe_free(ctx, testptr1);
        xmpp_ctx_free(ctx);
        return 1;
    }

-    xmpp_free(ctx, testptr2);
+    strophe_free(ctx, testptr2);

    xmpp_ctx_free(ctx);

--- a/tests/test_fuzz_parser.c
+++ b/tests/test_fuzz_parser.c
@@ -0,0 +1,49 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "strophe.h"
+#include "parser.h"
+
+void xmpp_initialize(void);
+
+void cbtest_handle_start(char *name, char **attrs, void *userdata)
+{
+    (void)name;
+    (void)attrs;
+    (void)userdata;
+}
+
+void cbtest_handle_end(char *name, void *userdata)
+{
+    (void)name;
+    (void)userdata;
+}
+
+void cbtest_handle_stanza(xmpp_stanza_t *stanza, void *userdata)
+{
+    (void)stanza;
+    (void)userdata;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
+{
+    xmpp_ctx_t *ctx;
+    parser_t *parser;
+
+    char *dup = malloc(Size);
+    memcpy(dup, Data, Size);
+
+    ctx = xmpp_ctx_new(NULL, NULL);
+    parser = parser_new(ctx, cbtest_handle_start, cbtest_handle_end,
+                        cbtest_handle_stanza, NULL);
+
+    parser_feed(parser, dup, Size);
+
+    free(dup);
+    parser_free(parser);
+    xmpp_ctx_free(ctx);
+
+    return 0;
+}
--- a/tests/test_fuzz_resolver.c
+++ b/tests/test_fuzz_resolver.c
@@ -0,0 +1,63 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "strophe.h"
+#include "resolver.h"
+
+void xmpp_initialize(void);
+
+void cbtest_handle_start(char *name, char **attrs, void *userdata)
+{
+    (void)name;
+    (void)attrs;
+    (void)userdata;
+}
+
+void cbtest_handle_end(char *name, void *userdata)
+{
+    (void)name;
+    (void)userdata;
+}
+
+void cbtest_handle_stanza(xmpp_stanza_t *stanza, void *userdata)
+{
+    (void)stanza;
+    (void)userdata;
+}
+
+/* res_query("_xmpp-client._tcp.jabber.org", C_IN, T_SRV, ...) */
+static const unsigned char data2[] = {
+    0xf2, 0x98, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
+    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65,
+    0x72, 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c,
+    0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x1a, 0x00, 0x1e,
+    0x00, 0x1e, 0x14, 0x66, 0x07, 0x68, 0x65, 0x72, 0x6d, 0x65, 0x73, 0x32,
+    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72, 0x67, 0x00,
+    0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x1c,
+    0x00, 0x1f, 0x00, 0x1e, 0x14, 0x66, 0x09, 0x68, 0x65, 0x72, 0x6d, 0x65,
+    0x73, 0x32, 0x76, 0x36, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03,
+    0x6f, 0x72, 0x67, 0x00,
+};
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
+{
+    xmpp_ctx_t *ctx;
+    resolver_srv_rr_t *srv_rr_list;
+
+    unsigned char *dup = malloc(Size + 64);
+    memcpy(dup, data2, 64);
+    memcpy(&dup[64], Data, Size);
+
+    ctx = xmpp_ctx_new(NULL, NULL);
+    resolver_srv_lookup_buf(ctx, dup, 64 + Size, &srv_rr_list);
+    if (srv_rr_list != NULL)
+        resolver_srv_free(ctx, srv_rr_list);
+
+    free(dup);
+    xmpp_ctx_free(ctx);
+
+    return 0;
+}
--- a/tests/test_hash.c
+++ b/tests/test_hash.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
    }

    /* allocate a hash table */
-    table = hash_new(ctx, TABLESIZE, xmpp_free);
+    table = hash_new(ctx, TABLESIZE, strophe_free);
    if (table == NULL) {
        /* table allocation failed! */
        return 1;
@@ -63,7 +63,7 @@ int main(int argc, char **argv)

    /* test insertion */
    for (i = 0; i < nkeys; i++) {
-        err = hash_add(table, keys[i], xmpp_strdup(ctx, values[i]));
+        err = hash_add(table, keys[i], strophe_strdup(ctx, values[i]));
        if (err)
            return err;
    }
@@ -76,7 +76,7 @@ int main(int argc, char **argv)

    /* test replacing old values */
    for (i = 0; i < nkeys; i++) {
-        err = hash_add(table, keys[0], xmpp_strdup(ctx, values[i]));
+        err = hash_add(table, keys[0], strophe_strdup(ctx, values[i]));
        if (err)
            return err;
        if (hash_num_keys(table) != nkeys)
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
            return 1;
    }
    /* restore value for the 1st key */
-    hash_add(table, keys[0], xmpp_strdup(ctx, values[0]));
+    hash_add(table, keys[0], strophe_strdup(ctx, values[0]));

    /* test cloning */
    clone = hash_clone(table);
--- a/tests/test_jid.c
+++ b/tests/test_jid.c
@@ -47,13 +47,13 @@ int test_jid(xmpp_ctx_t *ctx)
    if (resource != NULL)
        return 1;
    if (bare)
-        xmpp_free(ctx, bare);
+        strophe_free(ctx, bare);
    if (node)
-        xmpp_free(ctx, node);
+        strophe_free(ctx, node);
    if (domain)
-        xmpp_free(ctx, domain);
+        strophe_free(ctx, domain);
    if (resource)
-        xmpp_free(ctx, resource);
+        strophe_free(ctx, resource);

    bare = xmpp_jid_bare(ctx, jid2);
    node = xmpp_jid_node(ctx, jid2);
@@ -70,13 +70,13 @@ int test_jid(xmpp_ctx_t *ctx)
    if (resource == NULL || strcmp(resource, "hullo"))
        return 1;
    if (bare)
-        xmpp_free(ctx, bare);
+        strophe_free(ctx, bare);
    if (node)
-        xmpp_free(ctx, node);
+        strophe_free(ctx, node);
    if (domain)
-        xmpp_free(ctx, domain);
+        strophe_free(ctx, domain);
    if (resource)
-        xmpp_free(ctx, resource);
+        strophe_free(ctx, resource);

    bare = xmpp_jid_bare(ctx, jid3);
    node = xmpp_jid_node(ctx, jid3);
@@ -93,13 +93,13 @@ int test_jid(xmpp_ctx_t *ctx)
    if (resource == NULL || strcmp(resource, "frob"))
        return 1;
    if (bare)
-        xmpp_free(ctx, bare);
+        strophe_free(ctx, bare);
    if (node)
-        xmpp_free(ctx, node);
+        strophe_free(ctx, node);
    if (domain)
-        xmpp_free(ctx, domain);
+        strophe_free(ctx, domain);
    if (resource)
-        xmpp_free(ctx, resource);
+        strophe_free(ctx, resource);

    bare = xmpp_jid_bare(ctx, jid4);
    node = xmpp_jid_node(ctx, jid4);
@@ -116,13 +116,13 @@ int test_jid(xmpp_ctx_t *ctx)
    if (resource != NULL)
        return 1;
    if (bare)
-        xmpp_free(ctx, bare);
+        strophe_free(ctx, bare);
    if (node)
-        xmpp_free(ctx, node);
+        strophe_free(ctx, node);
    if (domain)
-        xmpp_free(ctx, domain);
+        strophe_free(ctx, domain);
    if (resource)
-        xmpp_free(ctx, resource);
+        strophe_free(ctx, resource);

    return 0;
 }
@@ -135,13 +135,13 @@ int test_jid_new(xmpp_ctx_t *ctx)
    printf("new jid: '%s'\n", jid);
    if (strcmp(jid, "node@domain/resource"))
        return 1;
-    xmpp_free(ctx, jid);
+    strophe_free(ctx, jid);

    jid = xmpp_jid_new(ctx, "foo", "bar.com", NULL);
    printf("new jid: '%s'\n", jid);
    if (strcmp(jid, "foo@bar.com"))
        return 1;
-    xmpp_free(ctx, jid);
+    strophe_free(ctx, jid);

    return 0;
 }
--- a/tests/test_rand.c
+++ b/tests/test_rand.c
@@ -21,32 +21,36 @@
 #include "rand.c"

 /* stubs to build test without whole libstrophe */
-void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
+void *strophe_alloc(const xmpp_ctx_t *ctx, size_t size)
 {
    (void)ctx;
    (void)size;
    return NULL;
 }

-void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
+void strophe_free(const xmpp_ctx_t *ctx, void *p)
 {
    (void)ctx;
    (void)p;
 }

-int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
+#ifndef HAVE_SNPRINTF
+int strophe_snprintf(char *str, size_t count, const char *fmt, ...)
 {
    (void)str;
    (void)count;
    (void)fmt;
    return 0;
 }
+#endif /* HAVE_SNPRINTF */

 uint64_t time_stamp(void)
 {
    return 0;
 }

+#ifndef USE_GETRANDOM
+
 static struct {
    const char *entropy_input;
    const char *nonce;
@@ -158,3 +162,19 @@ int main()

    return 0;
 }
+
+#else
+
+int main()
+{
+    uint8_t output[1024];
+    xmpp_rand_t *rand = xmpp_rand_new(NULL);
+
+    assert(rand != NULL);
+    /* this would assert if it failed */
+    xmpp_rand_bytes(rand, output, sizeof(output));
+
+    return 0;
+}
+
+#endif
--- a/tests/test_resolver.c
+++ b/tests/test_resolver.c
@@ -13,7 +13,6 @@
 #include <stdio.h>

 #include "strophe.h"
-#include "rand.h"
 #include "resolver.h"
 #include "test.h"

@@ -175,10 +174,10 @@ int main()
    xmpp_ctx_t *ctx;
    xmpp_rand_t *rand;
    resolver_srv_rr_t *srv_rr_list;
-    char *domain;
+    char *domain, *rnd_b64;
    unsigned char *buf;
    unsigned short port;
-    size_t i;
+    size_t i, slen;
    int ret;

    ctx = xmpp_ctx_new(NULL, NULL);
@@ -217,17 +216,25 @@ int main()
    rand = xmpp_rand_new(ctx);
    assert(rand != NULL);
    assert(sizeof(data2) > 64);
-    buf = xmpp_alloc(ctx, sizeof(data2));
+    buf = strophe_alloc(ctx, sizeof(data2));
    assert(buf != NULL);
    memcpy(buf, data2, 64);
    xmpp_rand_bytes(rand, &buf[64], sizeof(data2) - 64);
    ret = resolver_srv_lookup_buf(ctx, buf, sizeof(data2), &srv_rr_list);
    if (ret == XMPP_DOMAIN_FOUND && srv_rr_list != NULL)
        resolver_srv_free(ctx, srv_rr_list);
-    xmpp_free(ctx, buf);
    xmpp_rand_free(ctx, rand);
    printf("ok\n");

+    printf("Broken message was:\n");
+    rnd_b64 = xmpp_base64_encode(ctx, buf, sizeof(data2));
+    slen = strlen(rnd_b64);
+    for (i = 0; i < slen; i += 64) {
+        printf("%.64s\n", &rnd_b64[i]);
+    }
+
+    strophe_free(ctx, buf);
+    strophe_free(ctx, rnd_b64);
    xmpp_ctx_free(ctx);

    return 0;
--- a/tests/test_sasl.c
+++ b/tests/test_sasl.c
@@ -29,23 +29,6 @@ static const char response_md5[] =
    "MDAwMSxxb3A9YXV0aCxkaWdlc3QtdXJpPSJ4bXBwL3NvbWVyZWFsbSIscmVz"
    "cG9uc2U9NGVhNmU4N2JjMDkzMzUwNzQzZGIyOGQ3MDIwOGNhZmIsY2hhcnNl"
    "dD11dGYtOA==";
-static const char response_md5_rfc[] =
-    "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
-    "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLG5jPTAw"
-    "MDAwMDAxLHFvcD1hdXRoLGRpZ2VzdC11cmk9InhtcHAvZXhhbXBsZS5jb20i"
-    "LHJlc3BvbnNlPWQzODhkYWQ5MGQ0YmJkNzYwYTE1MjMyMWYyMTQzYWY3LGNo"
-    "YXJzZXQ9dXRmLTgK";
-
-static const char challenge_md5_2[] =
-    "cmVhbG09ImVsd29vZC5pbm5vc29mdC5jb20iLG5vbmNlPSJPQTZNRzl0"
-    "RVFHbTJoaCIscW9wPSJhdXRoIixhbGdvcml0aG09bWQ1LXNlc3MsY2hh"
-    "cnNldD11dGYtOA==";
-static const char response_md5_2[] =
-    "Y2hhcnNldD11dGYtOCx1c2VybmFtZT0iY2hyaXMiLHJlYWxtPSJlbHdvb2"
-    "QuaW5ub3NvZnQuY29tIixub25jZT0iT0E2TUc5dEVRR20yaGgiLG5jPTAw"
-    "MDAwMDAxLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLGRpZ2VzdC11cmk9Im"
-    "ltYXAvZWx3b29kLmlubm9zb2Z0LmNvbSIscmVzcG9uc2U9ZDM4OGRhZDkw"
-    "ZDRiYmQ3NjBhMTUyMzIxZjIxNDNhZjcscW9wPWF1dGg=";

 int test_plain(xmpp_ctx_t *ctx)
 {
@@ -60,7 +43,7 @@ int test_plain(xmpp_ctx_t *ctx)
        /* SASL PLAIN returned incorrect string! */
        return 2;
    }
-    xmpp_free(ctx, result);
+    strophe_free(ctx, result);

    return 0;
 }
--- a/tests/test_send_queue.c
+++ b/tests/test_send_queue.c
@@ -0,0 +1,92 @@
+/* test_send_queue.c
+** libstrophe XMPP client library -- test routines for the send queue
+**
+** Copyright (C) 2021 Steffen Jaeckel
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "strophe.h"
+#include "common.h"
+
+#include "test.h"
+
+int main()
+{
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    xmpp_log_t *log;
+    xmpp_conn_state_t state;
+    xmpp_sm_state_t *sm_state;
+    char *ret;
+
+    unsigned int n;
+
+    xmpp_initialize();
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    ctx = xmpp_ctx_new(NULL, log);
+    conn = xmpp_conn_new(ctx);
+    sm_state = strophe_alloc(ctx, sizeof(*sm_state));
+    memset(sm_state, 0, sizeof(*sm_state));
+    sm_state->ctx = ctx;
+
+    xmpp_conn_set_sm_state(conn, sm_state);
+
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 0);
+
+    state = conn->state;
+    conn->state = XMPP_STATE_CONNECTED;
+
+    xmpp_send_raw(conn, "foo", 3);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 1);
+
+    xmpp_send_raw(conn, "bar", 3);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 2);
+
+    xmpp_send_raw(conn, "baz", 3);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 3);
+
+    xmpp_send_raw(conn, "baan", 4);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 4);
+
+    conn->send_queue_head->wip = 1;
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 3);
+
+    ret = xmpp_conn_send_queue_drop_element(conn, XMPP_QUEUE_OLDEST);
+    COMPARE("bar", ret);
+    xmpp_free(ctx, ret);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 2);
+
+    conn->send_queue_head->wip = 0;
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 3);
+
+    ret = xmpp_conn_send_queue_drop_element(conn, XMPP_QUEUE_OLDEST);
+    COMPARE("foo", ret);
+    xmpp_free(ctx, ret);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 2);
+
+    ret = xmpp_conn_send_queue_drop_element(conn, XMPP_QUEUE_YOUNGEST);
+    COMPARE("baan", ret);
+    xmpp_free(ctx, ret);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 1);
+
+    ret = xmpp_conn_send_queue_drop_element(conn, XMPP_QUEUE_YOUNGEST);
+    COMPARE("baz", ret);
+    xmpp_free(ctx, ret);
+    ENSURE_EQ(xmpp_conn_send_queue_len(conn), 0);
+
+    conn->state = state;
+
+    xmpp_conn_release(conn);
+    xmpp_ctx_free(ctx);
+    xmpp_shutdown();
+
+    return 0;
+}
--- a/tests/test_snprintf.c
+++ b/tests/test_snprintf.c
@@ -37,7 +37,7 @@ int main(void)

    for (x = 0; fp_fmt[x] != NULL; x++)
        for (y = 0; fp_nums[y] != 0; y++) {
-            xmpp_snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]);
+            strophe_snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]);
            sprintf(buf2, fp_fmt[x], fp_nums[y]);
            if (strcmp(buf1, buf2)) {
                printf("xmpp_snprintf doesn't match Format: "
@@ -50,7 +50,7 @@ int main(void)

    for (x = 0; int_fmt[x] != NULL; x++)
        for (y = 0; int_nums[y] != 0; y++) {
-            xmpp_snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]);
+            strophe_snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]);
            sprintf(buf2, int_fmt[x], int_nums[y]);
            if (strcmp(buf1, buf2)) {
                printf("xmpp_snprintf doesn't match Format: "
--- a/tests/test_stanza.c
+++ b/tests/test_stanza.c
@@ -17,6 +17,8 @@
 #include <stdlib.h>
 #include <string.h>

+#include "test.h"
+
 #define MAGICPTR ((void *)0xfeedbeef)
 static unsigned long used_blocks = 0;

@@ -97,7 +99,7 @@ static void test_stanza_from_string(xmpp_ctx_t *ctx)
    size_t buflen;
    int ret;

-    static const char *str =
+    const char *str =
        "<signcrypt xmlns=\"urn:xmpp:openpgp:0\"><to "
        "jid=\"user@domain.com\"/><time "
        "stamp=\"2020-06-03T21:26:24+0200\"/><rpad/><payload><body "
@@ -107,9 +109,137 @@ static void test_stanza_from_string(xmpp_ctx_t *ctx)
    assert(stanza != NULL);
    ret = xmpp_stanza_to_text(stanza, &buf, &buflen);
    assert(ret == XMPP_EOK);
-    assert(strcmp(buf, str) == 0);
+    COMPARE(str, buf);
    xmpp_free(ctx, buf);
    xmpp_stanza_release(stanza);
+
+    /* create a string with two stanzas to make sure we don't
+     * leak any memory when we convert them to a xmpp_stanza_t
+     */
+    buf = malloc(strlen(str) * 2 + 1);
+    assert(buf != NULL);
+    memcpy(buf, str, strlen(str) + 1);
+    memcpy(&buf[strlen(str)], str, strlen(str) + 1);
+    stanza = xmpp_stanza_new_from_string(ctx, buf);
+    assert(stanza != NULL);
+    free(buf);
+    ret = xmpp_stanza_to_text(stanza, &buf, &buflen);
+    assert(ret == XMPP_EOK);
+    COMPARE(str, buf);
+    xmpp_free(ctx, buf);
+    xmpp_stanza_release(stanza);
+
+    /* Error path. */
+    stanza = xmpp_stanza_new_from_string(ctx, "<uu><uu>tt");
+    assert(stanza == NULL);
+}
+
+static void test_stanza_error(xmpp_ctx_t *ctx)
+{
+    xmpp_stanza_t *stanza;
+    xmpp_stanza_t *error;
+    xmpp_stanza_t *item;
+    xmpp_stanza_t *mood;
+    char *buf;
+    size_t buflen;
+    const char *attr[10];
+    int attrlen = ARRAY_SIZE(attr);
+    int ret;
+
+    static const char *str =
+        "<iq from='romeo@montague.lit/home' to='juliet@capulet.lit/chamber' "
+        "type='get' id='e2e1'><ping xmlns='urn:xmpp:ping'/></iq>";
+    static const char *str_error =
+        "<error type=\"cancel\"><service-unavailable "
+        "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/></error>";
+    // clang-format off
+    static const char *str_mood =
+        "<iq from='juliet@capulet.lit/balcony' id='publish1' type='set'>"
+          "<pubsub xmlns='http://jabber.org/protocol/pubsub'>"
+            "<publish node='http://jabber.org/protocol/mood'>"
+              "<item>"
+                "<mood xmlns='http://jabber.org/protocol/mood'>"
+                  "<annoyed/>"
+                  "<text>curse my nurse!</text>"
+                "</mood>"
+              "</item>"
+            "</publish>"
+          "</pubsub>"
+        "</iq>";
+    // clang-format on
+
+    stanza = xmpp_stanza_new_from_string(ctx, str);
+    assert(stanza != NULL);
+    error =
+        xmpp_stanza_reply_error(stanza, "cancel", "service-unavailable", NULL);
+    assert(error != NULL);
+    mood = xmpp_stanza_new_from_string(ctx, str_mood);
+    assert(stanza != NULL);
+
+    assert(xmpp_stanza_get_to(error) != NULL);
+    COMPARE("romeo@montague.lit/home", xmpp_stanza_get_to(error));
+    assert(xmpp_stanza_get_from(error) != NULL);
+    COMPARE("juliet@capulet.lit/chamber", xmpp_stanza_get_from(error));
+    assert(xmpp_stanza_get_id(error) != NULL);
+    COMPARE("e2e1", xmpp_stanza_get_id(error));
+    assert(xmpp_stanza_get_type(error) != NULL);
+    COMPARE("error", xmpp_stanza_get_type(error));
+
+    /* FAIL - no list given */
+    item = xmpp_stanza_get_child_by_path(mood, NULL);
+    assert(item == NULL);
+
+    /* FAIL - first entry doesn't match */
+    item = xmpp_stanza_get_child_by_path(mood, "foo", NULL);
+    assert(item == NULL);
+
+    /* FAIL - 'iq' has no namespace */
+    item = xmpp_stanza_get_child_by_path(
+        mood, XMPP_STANZA_NAME_IN_NS("iq", "foobar"),
+        XMPP_STANZA_NAME_IN_NS("pubsub", "http://jabber.org/protocol/pubsub"),
+        "publish", "item", "mood", NULL);
+    assert(item == NULL);
+
+    /* FAIL - 'pubsub' is in another namespace */
+    item = xmpp_stanza_get_child_by_path(
+        mood, "iq",
+        XMPP_STANZA_NAME_IN_NS("pubsub", "http://jabber.org/protocol/foobar"),
+        "publish", "item", "mood", NULL);
+    assert(item == NULL);
+
+    item = xmpp_stanza_get_child_by_path(mood, "iq", "pubsub", "publish",
+                                         "item", "mood", NULL);
+    assert(item != NULL);
+    assert(xmpp_stanza_get_children(item) != NULL);
+    assert(xmpp_stanza_get_name(xmpp_stanza_get_children(item)) != NULL);
+    COMPARE("annoyed", xmpp_stanza_get_name(xmpp_stanza_get_children(item)));
+
+    item = xmpp_stanza_get_child_by_path(
+        mood, "iq",
+        XMPP_STANZA_NAME_IN_NS("pubsub", "http://jabber.org/protocol/pubsub"),
+        "publish", "item",
+        XMPP_STANZA_NAME_IN_NS("mood", "http://jabber.org/protocol/mood"),
+        NULL);
+    assert(item != NULL);
+    assert(xmpp_stanza_get_children(item) != NULL);
+    assert(xmpp_stanza_get_name(xmpp_stanza_get_children(item)) != NULL);
+    COMPARE("annoyed", xmpp_stanza_get_name(xmpp_stanza_get_children(item)));
+
+    ret = xmpp_stanza_get_attributes(error, attr, attrlen);
+    /* attr contains both attribute name and value. */
+    assert(ret == 8);
+
+    item = xmpp_stanza_get_child_by_name(error, "error");
+    assert(item != NULL);
+
+    ret = xmpp_stanza_to_text(item, &buf, &buflen);
+    assert(ret == XMPP_EOK);
+    COMPARE(str_error, buf);
+
+    xmpp_free(ctx, buf);
+    xmpp_stanza_release(mood);
+    xmpp_stanza_release(stanza);
+    xmpp_stanza_release(error);
 }

 int main()
@@ -122,6 +252,7 @@ int main()

    test_stanza_add_child(ctx);
    test_stanza_from_string(ctx);
+    test_stanza_error(ctx);

    xmpp_ctx_free(ctx);
    xmpp_shutdown();
--- a/tests/test_string.c
+++ b/tests/test_string.c
@@ -41,19 +41,19 @@ static int test_strtok_r(void)
    assert(strcmp(s1, s2) == 0);

    sub1 = strtok_r(s1, "-", &sp1);
-    sub2 = xmpp_strtok_r(s2, "-", &sp2);
+    sub2 = strophe_strtok_r(s2, "-", &sp2);
    if (strcmp(sub1, sub2) != 0) {
        printf("1st token is '%s', must be '%s'\n", sub2, sub1);
        return -1;
    }
    sub1 = strtok_r(NULL, "-=", &sp1);
-    sub2 = xmpp_strtok_r(NULL, "-=", &sp2);
+    sub2 = strophe_strtok_r(NULL, "-=", &sp2);
    if (strcmp(sub1, sub2) != 0) {
        printf("2nd token is '%s', must be '%s'\n", sub2, sub1);
        return -1;
    }
    sub1 = strtok_r(NULL, "-", &sp1);
-    sub2 = xmpp_strtok_r(NULL, "-", &sp2);
+    sub2 = strophe_strtok_r(NULL, "-", &sp2);
    if (sub1 != sub2) {
        printf("3rd call returns %p instead of NULL\n", sub2);
        return -1;
@@ -71,7 +71,7 @@ static int test_strdup_one(xmpp_ctx_t *ctx, const char *s)
    int rc = 0;

    s1 = strdup(s);
-    s2 = xmpp_strdup(ctx, s);
+    s2 = strophe_strdup(ctx, s);

    if (!s1 || !s2 || strcmp(s1, s2) != 0) {
        rc = -1;
@@ -81,7 +81,7 @@ static int test_strdup_one(xmpp_ctx_t *ctx, const char *s)

    free(s1);
    if (s2)
-        xmpp_free(ctx, s2);
+        strophe_free(ctx, s2);

    return rc;
 }
--- a/tests/test_xmppaddr.c
+++ b/tests/test_xmppaddr.c
@@ -0,0 +1,120 @@
+/* test_xmppaddr.c
+** libstrophe XMPP client library -- test routines for the xmppaddr
+** certificate API's
+**
+** Copyright (C) 2021 Steffen Jaeckel
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This program is dual licensed under the MIT and GPLv3 licenses.
+*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+
+#include "strophe.h"
+
+#include "test.h"
+
+static int
+password_callback(char *pw, size_t pw_max, xmpp_conn_t *conn, void *userdata)
+{
+    (void)pw_max;
+    (void)userdata;
+    (void)conn;
+    memcpy(pw, "abc123", 7);
+    return 6;
+}
+
+int main()
+{
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    xmpp_log_t *log;
+    struct {
+        int needs_callback;
+        char *pem, *key;
+    } client_cert[] = {
+        {0, "tests/cert.pem", "tests/key.pem"},
+        {1, "tests/cert.pem", "tests/key_encrypted.pem"},
+        {0, NULL, "tests/cert.emptypass.pfx"},
+        {0, NULL, "tests/cert.nopass.pfx"},
+        {1, NULL, "tests/cert.pfx"},
+        {0, "tests/cert.emptypass.pfx", NULL},
+        {0, "tests/cert.nopass.pfx", NULL},
+        {1, "tests/cert.pfx", NULL},
+    };
+
+    const char *srcdir;
+    char *certbuf, *keybuf;
+    char xmppaddr_num[] = "0";
+    unsigned int m, n;
+
+    xmpp_initialize();
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    ctx = xmpp_ctx_new(NULL, log);
+
+    srcdir = getenv("srcdir");
+
+    certbuf = malloc(MAXPATHLEN);
+    keybuf = malloc(MAXPATHLEN);
+
+    for (m = 0; m < sizeof(client_cert) / sizeof(client_cert[0]); ++m) {
+        char *certfile = certbuf, *keyfile = keybuf;
+        conn = xmpp_conn_new(ctx);
+
+        if (client_cert[m].pem)
+            snprintf(certfile, MAXPATHLEN, "%s/%s", srcdir, client_cert[m].pem);
+        else
+            certfile = NULL;
+
+        if (client_cert[m].key)
+            snprintf(keyfile, MAXPATHLEN, "%s/%s", srcdir, client_cert[m].key);
+        else
+            keyfile = NULL;
+
+        if (client_cert[m].needs_callback)
+            xmpp_conn_set_password_callback(conn, password_callback, NULL);
+
+        xmpp_conn_set_client_cert(conn, certfile, keyfile);
+
+        xmppaddr_num[0] = '0' + xmpp_conn_cert_xmppaddr_num(conn);
+
+        COMPARE("2", xmppaddr_num);
+
+        for (n = 0; n < 3; ++n) {
+            char *r = xmpp_conn_cert_xmppaddr(conn, n);
+            switch (n) {
+            case 0:
+                COMPARE(
+                    "very.long.username@so.the.asn1.length.is.a.valid.ascii."
+                    "character",
+                    r);
+                break;
+            case 1:
+                COMPARE("second@xmpp.jid", r);
+                break;
+            default:
+                if (r != NULL) {
+                    printf("\nThere shall only be two id-on-xmppAddr SANs!\n"
+                           "Found another one: %s\n",
+                           r);
+                    exit(1);
+                }
+                break;
+            }
+            free(r);
+        }
+        xmpp_conn_release(conn);
+    }
+    free(certbuf);
+    free(keybuf);
+
+    xmpp_ctx_free(ctx);
+    xmpp_shutdown();
+
+    return 0;
+}
--- a/travis/before_script.sh
+++ b/travis/before_script.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+[ "x$XSSL_COMMITISH" != "x" ]
+
+if [ "x$LIBRESSL" = "xtrue" ]; then
+    REPO_URL="https://github.com/libressl-portable/portable.git"
+    AUTOGEN_CMD="./autogen.sh"
+    CONFIG_CMD="./configure --prefix=$HOME/xssl --disable-asm"
+    MAKE_TARGET="install"
+else
+    REPO_URL="https://github.com/openssl/openssl.git"
+    AUTOGEN_CMD="true"
+    CONFIG_CMD="./Configure --prefix=$HOME/xssl --libdir=lib"
+    MAKE_TARGET="install_sw"
+fi
+
+cd "$HOME"
+git clone --no-checkout "$REPO_URL" xssl-git
+cd xssl-git
+git checkout "$XSSL_COMMITISH"
+$AUTOGEN_CMD
+$CONFIG_CMD
+make -j"$(nproc)"
+make $MAKE_TARGET