WIP Unify error codes returned to the connection handler

Error argument in the connection handler is not always set and in some
cases provides meaningless values. For example, every TLS module returns
its specific error codes.

Current solution unifies error codes and allows to distinguish between
different types of disconnection.

Fixes #123.

.gitignore

@@ -1,4 +1,5 @@
 *.swp
+*.orig
 Makefile
 test-driver
 .libs
@@ -34,6 +35,7 @@ examples/active
 examples/basic
 examples/bot
 examples/component
+examples/register
 examples/roster
 examples/uuid
 examples/vcard
@@ -53,11 +55,17 @@ tests/test_resolver
 tests/test_sasl
 tests/test_scram
 tests/test_sha1
+tests/test_sha256
+tests/test_sha512
 tests/test_snprintf
-tests/test_string
 tests/test_sock
+tests/test_stanza
+tests/test_string
 m4/
 libstrophe.project
 libs/
 obj/
 expat/
+.settings/
+.project
+.cproject

.travis.yml

@@ -1,15 +1,24 @@
 language: c
 install:
-    - sudo apt-get update
-    - sudo apt-get -y install libtool pkg-config libexpat1-dev libxml2-dev libssl-dev libc-ares-dev
+  - 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
-script:
-    - ./configure ${CONFIGURE_OPT} CFLAGS="-Werror" && make && make check
+  - ./bootstrap.sh
 env:
-    - CONFIGURE_OPT="--without-libxml2"
-    - CONFIGURE_OPT="--with-libxml2"
-    - CONFIGURE_OPT="--disable-tls"
-    - CONFIGURE_OPT="--enable-cares"
+  - 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

ChangeLog

@@ -1,3 +1,26 @@
+0.10.0
+	- Coding style has been unified
+	- SCRAM-SHA-256 and SCRAM-SHA-512 support
+	- c-ares support
+	- LibreSSL support
+	- Introduced global timed handlers that fire periodically regardless of
+	  connections status, such a handler can be used to implement deferred
+	  re-connection
+	- examples/register implements XEP-0077
+	- Fixed issue with IPv6 on Windows (#153)
+	- Improved portability across systems such as Haiku, Windows
+	- New API:
+		- xmpp_stanza_get_child_by_name_and_ns()
+		- xmpp_conn_is_connecting()
+		- xmpp_conn_is_connected()
+		- xmpp_conn_is_disconnected()
+		- xmpp_stanza_new_from_string()
+		- xmpp_stanza_add_child_ex()
+		- xmpp_stanza_get_context()
+		- xmpp_stanza_reply_error()
+		- xmpp_global_timed_handler_add()
+		- xmpp_global_timed_handler_delete()
+
 0.9.3
 	- PLAIN mechanism is used only when no other mechanisms are supported
 	- Legacy authentication is disabled by default, can be enabled with

Makefile.am

@@ -11,7 +11,8 @@ SSL_LIBS = @openssl_LIBS@
 RESOLV_CFLAGS = @RESOLV_CFLAGS@
 RESOLV_LIBS = @RESOLV_LIBS@
 
-STROPHE_FLAGS = -I$(top_srcdir) -Wall -Wextra -Wno-unused-parameter
+WARNING_FLAGS = @WARNING_FLAGS@
+STROPHE_FLAGS = -I$(top_srcdir) $(WARNING_FLAGS)
 STROPHE_LIBS = libstrophe.la
 
 ## Main build targets
@@ -37,6 +38,8 @@ libstrophe_la_SOURCES = \
 	src/sasl.c \
 	src/scram.c \
 	src/sha1.c \
+	src/sha256.c \
+	src/sha512.c \
 	src/snprintf.c \
 	src/sock.c \
 	src/stanza.c \
@@ -52,7 +55,10 @@ libstrophe_la_SOURCES += \
 	src/resolver.h \
 	src/sasl.h \
 	src/scram.h \
+	src/sha.h \
 	src/sha1.h \
+	src/sha256.h \
+	src/sha512.h \
 	src/snprintf.h \
 	src/sock.h \
 	src/tls.h \
@@ -71,11 +77,11 @@ libstrophe_la_SOURCES += src/parser_libxml2.c
 endif
 
 include_HEADERS = strophe.h
-noinst_HEADERS = strophepp.h
 
 pkgconfig_DATA = libstrophe.pc
 
 EXTRA_DIST = \
+	_clang-format \
 	Doxyfile \
 	GPL-LICENSE.txt \
 	LICENSE.txt \
@@ -86,8 +92,6 @@ EXTRA_DIST = \
 	examples/README.md \
 	jni/Android.mk \
 	jni/Application.mk \
-	rpm/README \
-	rpm/libstrophe.spec \
 	src/tls_gnutls.c \
 	src/tls_schannel.c \
 	tests/res_query_dump.c
@@ -100,7 +104,8 @@ noinst_PROGRAMS = \
 	examples/component \
 	examples/roster \
 	examples/uuid \
-	examples/vcard
+	examples/vcard \
+	examples/register
 
 examples_active_SOURCES = examples/active.c
 examples_active_CFLAGS = $(STROPHE_FLAGS)
@@ -123,12 +128,17 @@ 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)
 
 
 ## Tests
 TESTS = \
 	tests/check_parser \
 	tests/test_sha1 \
+	tests/test_sha256 \
+	tests/test_sha512 \
 	tests/test_md5 \
 	tests/test_rand \
 	tests/test_scram \
@@ -138,6 +148,7 @@ TESTS = \
 	tests/test_jid \
 	tests/test_snprintf \
 	tests/test_string \
+	tests/test_stanza \
 	tests/test_resolver
 
 check_PROGRAMS = $(TESTS)
@@ -176,12 +187,19 @@ tests_test_resolver_LDFLAGS = -static
 tests_test_rand_SOURCES = tests/test_rand.c tests/test.c src/sha1.c
 tests_test_rand_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
 
-tests_test_scram_SOURCES = tests/test_scram.c tests/test.c src/sha1.c
+tests_test_scram_SOURCES = tests/test_scram.c tests/test.c src/sha1.c \
+	src/sha256.c src/sha512.c
 tests_test_scram_CFLAGS = $(STROPHE_FLAGS) -I$(top_srcdir)/src
 
 tests_test_sha1_SOURCES = tests/test_sha1.c src/sha1.c
 tests_test_sha1_CFLAGS = -I$(top_srcdir)/src
 
+tests_test_sha256_SOURCES = tests/test_sha256.c tests/test.c src/sha256.c
+tests_test_sha256_CFLAGS = -I$(top_srcdir)/src
+
+tests_test_sha512_SOURCES = tests/test_sha512.c tests/test.c src/sha512.c
+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
 
@@ -192,3 +210,13 @@ tests_test_string_SOURCES = tests/test_string.c tests/test.h
 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_LDADD = $(STROPHE_LIBS)
+tests_test_stanza_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

README.markdown

@@ -5,11 +5,7 @@ libstrophe is a lightweight XMPP client library written in C. It has
 minimal dependencies and is configurable for various environments. It
 runs well on Linux, Unix and Windows based platforms.
 
-Its goals are:
-
-- usable quickly
-- well documented
-- reliable
+libstrophe is dual licensed under MIT and GPLv3.
 
 Build Instructions
 ------------------

_clang-format

@@ -0,0 +1,17 @@
+---
+AlignConsecutiveAssignments: 'false'
+AlignEscapedNewlines: Left
+AllowShortBlocksOnASingleLine: 'true'
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: 'false'
+BinPackParameters: 'false'
+BreakBeforeBraces: Linux
+ColumnLimit: '80'
+DerivePointerAlignment: 'false'
+IndentWidth: '4'
+PointerAlignment: Right
+SortIncludes: 'false'
+TabWidth: '4'
+UseTab: Never
+
+...

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libstrophe], [0.9.3], [jack@metajack.im])
+AC_INIT([libstrophe], [0.10.0], [jack@metajack.im])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])
@@ -15,8 +15,15 @@ AS_CASE([$host_os],
     [*nto*|*qnx*], [PLATFORM="qnx"],
     [*solaris*],   [PLATFORM="solaris"],
     [*android*],   [PLATFORM="android"],
+    [*haiku*],     [PLATFORM="haiku"],
                    [PLATFORM="nix"])
 
+WARNING_FLAGS="-Wall"
+
+AS_CASE([$PLATFORM],
+    [haiku],   [],
+               [WARNING_FLAGS="$WARNING_FLAGS -Wextra"])
+
 AC_ARG_WITH([libxml2],
     [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing, expat is the default])])
 AC_ARG_ENABLE([tls],
@@ -24,6 +31,10 @@ AC_ARG_ENABLE([tls],
 AC_ARG_ENABLE([cares],
     [AS_HELP_STRING([--enable-cares], [use c-ares for DNS resolution])])
 
+AC_SEARCH_LIBS([socket], [network socket])
+AC_CHECK_FUNCS([snprintf vsnprintf])
+AC_CHECK_DECLS([va_copy], [], [], [#include <stdarg.h>])
+
 if test "x$enable_tls" != xno; then
     PKG_CHECK_MODULES([openssl], [openssl],
         [PC_REQUIRES="openssl ${PC_REQUIRES}"],
@@ -64,7 +75,7 @@ if test "x$with_libxml2" != xno -a "x$with_parser" = x; then
                 [
                     with_parser="libxml2"
                     libxml2_CFLAGS="-I${includedir}/libxml2"
-                    libxml2_LIBS="-lxml2"
+                    libxml2_LIBS="-lxml2 -lm"
                     PC_LIBS="${libxml2_LIBS} ${PC_LIBS}"
                     PC_CFLAGS="${libxml2_CFLAGS} ${PC_CFLAGS}"
                 ])
@@ -84,8 +95,6 @@ fi
 
 AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
 
-AC_SEARCH_LIBS([socket], [socket])
-
 if test "x$enable_cares" = xyes; then
     PKG_CHECK_MODULES([libcares], [libcares >= 1.7.0],
         [
@@ -103,6 +112,7 @@ AS_CASE([$PLATFORM],
     [qnx],     [RESOLV_LIBS="-lsocket"],
     [solaris], [RESOLV_LIBS="-lresolv -lsocket -lnsl"],
     [android], [RESOLV_LIBS=""],
+    [haiku],   [RESOLV_LIBS="-lnetwork"],
                [RESOLV_LIBS="-lresolv"])
 
 LIBS_TMP="${LIBS}"
@@ -144,5 +154,6 @@ AC_SUBST(PARSER_CFLAGS)
 AC_SUBST(PARSER_LIBS)
 AC_SUBST(RESOLV_CFLAGS)
 AC_SUBST(RESOLV_LIBS)
+AC_SUBST(WARNING_FLAGS)
 AC_CONFIG_FILES([Makefile libstrophe.pc])
 AC_OUTPUT

examples/active.c

@@ -1,7 +1,7 @@
 /* active.c
 ** libstrophe XMPP client library -- basic usage example
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -19,23 +19,25 @@
 
 #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 *const conn,
+                 xmpp_stanza_t *const stanza,
+                 void *const userdata)
 {
     xmpp_stanza_t *query, *item;
     const char *type;
 
+    (void)userdata;
+
     type = xmpp_stanza_get_type(stanza);
     if (strcmp(type, "error") == 0)
-	fprintf(stderr, "ERROR: query failed\n");
+        fprintf(stderr, "ERROR: query failed\n");
     else {
-	query = xmpp_stanza_get_child_by_name(stanza, "query");
-	printf("Active Sessions:\n");
-	for (item = xmpp_stanza_get_children(query); item; 
-	     item = xmpp_stanza_get_next(item))
-	    printf("\t %s\n", xmpp_stanza_get_attribute(item, "jid"));
-	printf("END OF LIST\n");
+        query = xmpp_stanza_get_child_by_name(stanza, "query");
+        printf("Active Sessions:\n");
+        for (item = xmpp_stanza_get_children(query); item;
+             item = xmpp_stanza_get_next(item))
+            printf("\t %s\n", xmpp_stanza_get_attribute(item, "jid"));
+        printf("END OF LIST\n");
     }
 
     /* disconnect */
@@ -44,41 +46,46 @@ 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 *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     xmpp_stanza_t *iq, *query;
 
+    (void)error;
+    (void)stream_error;
+
     if (status == XMPP_CONN_CONNECT) {
-	fprintf(stderr, "DEBUG: connected\n");
-	
-	/* create iq stanza for request */
-	iq = xmpp_iq_new(ctx, "get", "active1");
-	xmpp_stanza_set_to(iq, "xxxxxxxxx.com");
+        fprintf(stderr, "DEBUG: connected\n");
 
-	query = xmpp_stanza_new(ctx);
-	xmpp_stanza_set_name(query, "query");
-	xmpp_stanza_set_ns(query, XMPP_NS_DISCO_ITEMS);
-	xmpp_stanza_set_attribute(query, "node", "sessions");
+        /* create iq stanza for request */
+        iq = xmpp_iq_new(ctx, "get", "active1");
+        xmpp_stanza_set_to(iq, "xxxxxxxxx.com");
 
-	xmpp_stanza_add_child(iq, query);
+        query = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(query, "query");
+        xmpp_stanza_set_ns(query, XMPP_NS_DISCO_ITEMS);
+        xmpp_stanza_set_attribute(query, "node", "sessions");
 
-	/* we can release the stanza since it belongs to iq now */
-	xmpp_stanza_release(query);
+        xmpp_stanza_add_child(iq, query);
 
-	/* set up reply handler */
-	xmpp_id_handler_add(conn, handle_reply, "active1", ctx);
+        /* we can release the stanza since it belongs to iq now */
+        xmpp_stanza_release(query);
 
-	/* send out the stanza */
-	xmpp_send(conn, iq);
+        /* set up reply handler */
+        xmpp_id_handler_add(conn, handle_reply, "active1", ctx);
 
-	/* release the stanza */
-	xmpp_stanza_release(iq);
+        /* send out the stanza */
+        xmpp_send(conn, iq);
+
+        /* release the stanza */
+        xmpp_stanza_release(iq);
     } else {
-	fprintf(stderr, "DEBUG: disconnected\n");
-	xmpp_stop(ctx);
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(ctx);
     }
 }
 
@@ -88,8 +95,8 @@ int main(int argc, char **argv)
     xmpp_conn_t *conn;
 
     if (argc != 3) {
-	fprintf(stderr, "Usage: active <jid> <pass>\n\n");
-	return 1;
+        fprintf(stderr, "Usage: active <jid> <pass>\n\n");
+        return 1;
     }
 
     /* initialize lib */

examples/basic.c

@@ -19,22 +19,44 @@
 #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)
+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)
 {
     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");
+    } else {
+        switch (error) {
+        case XMPP_EOK:
+            fprintf(stderr, "DEBUG: disconnected successfully.\n");
+            break;
+        case XMPP_EINVOP:
+            /*
+             * This may happen when the requested functionality is not
+             * supported or some data is not provided when it is required (e.g.
+             * resource part).
+             */
+            fprintf(stderr, "DEBUG: disconnected, invalid operation.\n");
+            break;
+        case XMPP_ECERT:
+            /*
+             * In this case, application can reconnect with
+             * XMPP_CONN_FLAG_TRUST_TLS if user permits.
+             */
+            fprintf(stderr, "DEBUG: disconnected, invalid TLS certificate.\n");
+        }
         xmpp_stop(ctx);
     }
 }
@@ -55,8 +77,12 @@ int main(int argc, char **argv)
             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], "--tcp-keepalive") == 0)
             tcp_keepalive = 1;
         else
@@ -67,10 +93,12 @@ int main(int argc, char **argv)
                         "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");
+                        "--legacy-ssl\n");
         return 1;
     }
 
@@ -87,8 +115,9 @@ int main(int argc, char **argv)
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */
@@ -97,7 +126,8 @@ 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);
+    if (tcp_keepalive)
+        xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);
 
     /* setup authentication information */
     xmpp_conn_set_jid(conn, jid);

examples/bot.c

@@ -1,7 +1,7 @@
 /* bot.c
 ** libstrophe XMPP client library -- basic usage example
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -10,7 +10,7 @@
 */
 
 /* simple bot example
-**  
+**
 ** This example was provided by Matthew Wild <mwild1@gmail.com>.
 **
 ** This bot responds to basic messages and iq version requests.
@@ -22,12 +22,13 @@
 
 #include <strophe.h>
 
-
-int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+int version_handler(xmpp_conn_t *const conn,
+                    xmpp_stanza_t *const stanza,
+                    void *const userdata)
 {
     xmpp_stanza_t *reply, *query, *name, *version, *text;
     const char *ns;
-    xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
     printf("Received version request from %s\n", xmpp_stanza_get_from(stanza));
 
@@ -69,10 +70,11 @@ int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
     return 1;
 }
 
-
-int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+int message_handler(xmpp_conn_t *const conn,
+                    xmpp_stanza_t *const stanza,
+                    void *const userdata)
 {
-    xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     xmpp_stanza_t *body, *reply;
     const char *type;
     char *intext, *replytext;
@@ -87,7 +89,8 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
 
     intext = xmpp_stanza_get_text(body);
 
-    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza), intext);
+    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza),
+           intext);
 
     reply = xmpp_stanza_reply(stanza);
     if (xmpp_stanza_get_type(reply) == NULL)
@@ -97,7 +100,7 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
         replytext = strdup("bye!");
         quit = 1;
     } else {
-        replytext = (char *) malloc(strlen(" to you too!") + strlen(intext) + 1);
+        replytext = (char *)malloc(strlen(" to you too!") + strlen(intext) + 1);
         strcpy(replytext, intext);
         strcat(replytext, " to you too!");
     }
@@ -115,24 +118,29 @@ int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void
 }
 
 /* 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 *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
+    (void)error;
+    (void)stream_error;
+
     if (status == XMPP_CONN_CONNECT) {
-        xmpp_stanza_t* pres;
+        xmpp_stanza_t *pres;
         fprintf(stderr, "DEBUG: connected\n");
-        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL, ctx);
+        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL,
+                         ctx);
         xmpp_handler_add(conn, message_handler, NULL, "message", NULL, ctx);
 
         /* Send initial <presence/> so that we appear online to contacts */
         pres = xmpp_presence_new(ctx);
         xmpp_send(conn, pres);
         xmpp_stanza_release(pres);
-    }
-    else {
+    } else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -157,8 +165,9 @@ int main(int argc, char **argv)
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */
@@ -178,7 +187,7 @@ int main(int argc, char **argv)
     /* initiate connection */
     xmpp_connect_client(conn, NULL, 0, conn_handler, ctx);
 
-    /* enter the event loop - 
+    /* enter the event loop -
        our connect handler will trigger an exit */
     xmpp_run(ctx);
 

examples/component.c

@@ -19,19 +19,22 @@
 
 #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 *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
 
+    (void)error;
+    (void)stream_error;
+
     if (status == XMPP_CONN_CONNECT) {
         fprintf(stderr, "DEBUG: connected\n");
         xmpp_disconnect(conn);
-    }
-    else {
+    } else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -56,19 +59,20 @@ int main(int argc, char **argv)
     host = argv[3];
 
     if (argc == 5) {
-        short tmp_port = (short) strtol(argv[4], &port_err, 10);
+        short tmp_port = (short)strtol(argv[4], &port_err, 10);
         if (tmp_port < 0 || *port_err != '\0') {
             fprintf(stderr, "Invalid value of <port> [%s].\n", argv[4]);
             return 1;
         }
-        port = (unsigned short) tmp_port;
+        port = (unsigned short)tmp_port;
     }
 
     /* init library */
     xmpp_initialize();
 
+    /* pass NULL instead to silence output */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
     /* create a context */
-    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
     ctx = xmpp_ctx_new(NULL, log);
 
     /* create a connection */
@@ -94,4 +98,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-

examples/register.c

@@ -0,0 +1,370 @@
+/* register.c
+ * strophe XMPP client library -- In-band registration (XEP-0077)
+ *
+ * Copyright (C) 2020 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.
+ */
+
+/*
+ * This example uses a "raw" connection to establish connection to a server
+ * without account. Then it queries server to register new account according
+ * to XEP-0077.
+ *
+ * How to use it. After the application connects and receives instructions
+ * from the server, user will be prompted to type information such as
+ * username, password, etc. Press enter without typing if you want to skip
+ * a field and not to send it to the server.
+ *
+ * Notice, the example doesn't implement forms. Therefore, it won't work
+ * in complicated scenarios.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <strophe.h>
+
+typedef struct {
+    xmpp_ctx_t *ctx;
+    const char *jid;
+} xmpp_reg_t;
+
+#define FEATURES_TIMEOUT 5000 /* 5 seconds */
+
+static void
+iq_reg_send_form(xmpp_reg_t *reg, xmpp_conn_t *conn, xmpp_stanza_t *stanza)
+{
+    xmpp_ctx_t *ctx = reg->ctx;
+    xmpp_stanza_t *query;
+    xmpp_stanza_t *next;
+    xmpp_stanza_t *elem;
+    xmpp_stanza_t *text;
+    xmpp_stanza_t *iq;
+    const char *name;
+    size_t len;
+    char buf[256];
+    char *s;
+
+    query = xmpp_stanza_get_child_by_name(stanza, "query");
+    if (!query) {
+        xmpp_disconnect(conn);
+        return;
+    }
+
+    next = xmpp_stanza_get_children(query);
+    query = xmpp_stanza_new(ctx);
+    xmpp_stanza_set_name(query, "query");
+    xmpp_stanza_set_ns(query, XMPP_NS_REGISTER);
+    while (next) {
+        name = xmpp_stanza_get_name(next);
+        if (name && strcmp(name, "instructions") == 0) {
+            s = xmpp_stanza_get_text(next);
+            printf("instructions: %s\n", s);
+            xmpp_free(ctx, s);
+        } else {
+            printf("%s: ", name);
+            s = fgets(buf, sizeof(buf), stdin);
+            if (s != NULL) {
+                len = strlen(s);
+                if (len > 0 && s[len - 1] == '\n') {
+                    s[len - 1] = '\0';
+                    --len;
+                }
+                if (len > 0) {
+                    elem = xmpp_stanza_new(ctx);
+                    text = xmpp_stanza_new(ctx);
+                    xmpp_stanza_set_text(text, s);
+                    xmpp_stanza_set_name(elem, name);
+                    xmpp_stanza_add_child(elem, text);
+                    xmpp_stanza_add_child(query, elem);
+                    xmpp_stanza_release(text);
+                    xmpp_stanza_release(elem);
+                }
+            }
+        }
+        next = xmpp_stanza_get_next(next);
+    }
+
+    if (xmpp_stanza_get_children(query) == NULL) {
+        fprintf(stderr, "DEBUG: nothing to send\n");
+        xmpp_disconnect(conn);
+    } else {
+        iq = xmpp_iq_new(ctx, "set", "reg2");
+        xmpp_stanza_add_child(iq, query);
+        xmpp_stanza_release(query);
+        xmpp_send(conn, iq);
+        xmpp_stanza_release(iq);
+    }
+}
+
+static int iq_reg2_cb(xmpp_conn_t *const conn,
+                      xmpp_stanza_t *const stanza,
+                      void *const userdata)
+{
+    const char *type;
+
+    (void)userdata;
+
+    type = xmpp_stanza_get_type(stanza);
+    if (!type || strcmp(type, "error") == 0) {
+        fprintf(stderr, "DEBUG: error during registration\n");
+        goto quit;
+    }
+
+    if (strcmp(type, "result") != 0) {
+        fprintf(stderr, "DEBUG: expected type 'result', but got %s\n", type);
+        goto quit;
+    }
+
+    fprintf(stderr, "DEBUG: successful registration\n");
+
+quit:
+    xmpp_disconnect(conn);
+
+    return 0;
+}
+
+static int iq_reg_cb(xmpp_conn_t *const conn,
+                     xmpp_stanza_t *const stanza,
+                     void *const userdata)
+{
+    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
+    xmpp_stanza_t *registered = NULL;
+    xmpp_stanza_t *query;
+    const char *type;
+
+    type = xmpp_stanza_get_type(stanza);
+    if (!type || strcmp(type, "error") == 0) {
+        fprintf(stderr, "DEBUG: error during registration\n");
+        xmpp_disconnect(conn);
+        goto quit;
+    }
+
+    if (strcmp(type, "result") != 0) {
+        fprintf(stderr, "DEBUG: expected type 'result', but got %s\n", type);
+        xmpp_disconnect(conn);
+        goto quit;
+    }
+
+    query = xmpp_stanza_get_child_by_name(stanza, "query");
+    if (query)
+        registered = xmpp_stanza_get_child_by_name(query, "registered");
+    if (registered != NULL) {
+        fprintf(stderr, "DEBUG: already registered\n");
+        xmpp_disconnect(conn);
+        goto quit;
+    }
+    xmpp_id_handler_add(conn, iq_reg2_cb, "reg2", reg);
+    iq_reg_send_form(reg, conn, stanza);
+
+quit:
+    return 0;
+}
+
+static int _handle_error(xmpp_conn_t *const conn,
+                         xmpp_stanza_t *const stanza,
+                         void *const userdata)
+{
+    (void)stanza;
+    (void)userdata;
+
+    fprintf(stderr, "DEBUG: received stream error\n");
+    xmpp_disconnect(conn);
+
+    return 0;
+}
+
+static int _handle_proceedtls_default(xmpp_conn_t *const conn,
+                                      xmpp_stanza_t *const stanza,
+                                      void *const userdata)
+{
+    const char *name = xmpp_stanza_get_name(stanza);
+
+    (void)userdata;
+
+    if (strcmp(name, "proceed") == 0) {
+        fprintf(stderr, "DEBUG: proceeding with TLS\n");
+        if (xmpp_conn_tls_start(conn) == 0) {
+            xmpp_handler_delete(conn, _handle_error);
+            xmpp_conn_open_stream_default(conn);
+        } else {
+            fprintf(stderr, "DEBUG: TLS failed\n");
+            /* failed tls spoils the connection, so disconnect */
+            xmpp_disconnect(conn);
+        }
+    }
+    return 0;
+}
+
+static int _handle_missing_features(xmpp_conn_t *const conn,
+                                    void *const userdata)
+{
+    (void)userdata;
+
+    fprintf(stderr, "DEBUG: timeout\n");
+    xmpp_disconnect(conn);
+
+    return 0;
+}
+
+static int _handle_features(xmpp_conn_t *const conn,
+                            xmpp_stanza_t *const stanza,
+                            void *const userdata)
+{
+    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
+    xmpp_ctx_t *ctx = reg->ctx;
+    xmpp_stanza_t *child;
+    xmpp_stanza_t *iq;
+    char *domain;
+
+    xmpp_timed_handler_delete(conn, _handle_missing_features);
+
+    /* secure connection if possible */
+    child = xmpp_stanza_get_child_by_name(stanza, "starttls");
+    if (child && (strcmp(xmpp_stanza_get_ns(child), XMPP_NS_TLS) == 0)) {
+        fprintf(stderr, "DEBUG: server supports TLS, try to establish\n");
+        child = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(child, "starttls");
+        xmpp_stanza_set_ns(child, XMPP_NS_TLS);
+        xmpp_handler_add(conn, _handle_proceedtls_default, XMPP_NS_TLS, NULL,
+                         NULL, NULL);
+        xmpp_send(conn, child);
+        xmpp_stanza_release(child);
+        return 0;
+    }
+
+    /* check whether server supports in-band registration */
+    child = xmpp_stanza_get_child_by_name(stanza, "register");
+    if (child && strcmp(xmpp_stanza_get_ns(child), XMPP_NS_REGISTER) == 0) {
+        fprintf(stderr, "DEBUG: server doesn't support in-band registration\n");
+        xmpp_disconnect(conn);
+        return 0;
+    }
+
+    fprintf(stderr, "DEBUG: server supports in-band registration\n");
+    domain = xmpp_jid_domain(ctx, reg->jid);
+    iq = xmpp_iq_new(ctx, "get", "reg1");
+    xmpp_stanza_set_to(iq, domain);
+    child = xmpp_stanza_new(ctx);
+    xmpp_stanza_set_name(child, "query");
+    xmpp_stanza_set_ns(child, XMPP_NS_REGISTER);
+    xmpp_stanza_add_child(iq, child);
+
+    xmpp_handler_add(conn, iq_reg_cb, XMPP_NS_REGISTER, "iq", NULL, reg);
+    xmpp_send(conn, iq);
+
+    xmpp_free(ctx, domain);
+    xmpp_stanza_release(child);
+    xmpp_stanza_release(iq);
+
+    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)
+{
+    xmpp_reg_t *reg = (xmpp_reg_t *)userdata;
+    int secured;
+
+    (void)error;
+    (void)stream_error;
+
+    if (status == XMPP_CONN_RAW_CONNECT) {
+        fprintf(stderr, "DEBUG: raw connection established\n");
+        xmpp_conn_open_stream_default(conn);
+    } else if (status == XMPP_CONN_CONNECT) {
+        fprintf(stderr, "DEBUG: stream opened\n");
+        secured = xmpp_conn_is_secured(conn);
+        fprintf(stderr, "DEBUG: connection is %s.\n",
+                secured ? "secured" : "NOT secured");
+
+        /* setup handler for stream:error */
+        xmpp_handler_add(conn, _handle_error, XMPP_NS_STREAMS, "error", NULL,
+                         NULL);
+
+        /* setup handlers for incoming <stream:features> */
+        xmpp_handler_add(conn, _handle_features, XMPP_NS_STREAMS, "features",
+                         NULL, reg);
+        xmpp_timed_handler_add(conn, _handle_missing_features, FEATURES_TIMEOUT,
+                               NULL);
+    } else {
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(reg->ctx);
+    }
+}
+
+xmpp_reg_t *xmpp_reg_new(void)
+{
+    xmpp_reg_t *reg;
+
+    reg = malloc(sizeof(*reg));
+    if (reg != NULL) {
+        memset(reg, 0, sizeof(*reg));
+    }
+    return reg;
+}
+
+void xmpp_reg_release(xmpp_reg_t *reg)
+{
+    free(reg);
+}
+
+int main(int argc, char **argv)
+{
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    xmpp_log_t *log;
+    xmpp_reg_t *reg;
+    const char *jid;
+    const char *host = NULL;
+    char *domain;
+
+    if (argc < 2 || argc > 3) {
+        fprintf(stderr, "Usage: %s <jid> [<host>]\n", argv[0]);
+        return 1;
+    }
+
+    jid = argv[1];
+    if (argc > 2)
+        host = argv[2];
+
+    /*
+     * Note, this example doesn't handle errors. Applications should check
+     * return values of non-void functions.
+     */
+
+    xmpp_initialize();
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    ctx = xmpp_ctx_new(NULL, log);
+    conn = xmpp_conn_new(ctx);
+
+    /* jid can be a jid or domain for "raw" connection */
+    domain = xmpp_jid_domain(ctx, jid);
+    xmpp_conn_set_jid(conn, domain);
+    xmpp_free(ctx, domain);
+
+    /* private data */
+    reg = xmpp_reg_new();
+    reg->ctx = ctx;
+    reg->jid = jid;
+
+    xmpp_connect_raw(conn, host, 0, conn_handler, reg);
+    xmpp_run(ctx);
+
+    /* release private data */
+    xmpp_reg_release(reg);
+
+    xmpp_conn_release(conn);
+    xmpp_ctx_free(ctx);
+    xmpp_shutdown();
+
+    return 0;
+}

examples/roster.c

@@ -1,7 +1,7 @@
 /* roster.c
 ** libstrophe XMPP client library -- handler example
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -18,31 +18,31 @@
 
 #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 *const conn,
+                 xmpp_stanza_t *const stanza,
+                 void *const userdata)
 {
     xmpp_stanza_t *query, *item;
     const char *type, *name;
 
+    (void)userdata;
+
     type = xmpp_stanza_get_type(stanza);
     if (strcmp(type, "error") == 0)
-	fprintf(stderr, "ERROR: query failed\n");
+        fprintf(stderr, "ERROR: query failed\n");
     else {
-	query = xmpp_stanza_get_child_by_name(stanza, "query");
-	printf("Roster:\n");
-	for (item = xmpp_stanza_get_children(query); item; 
-	     item = xmpp_stanza_get_next(item))
-	    if ((name = xmpp_stanza_get_attribute(item, "name")))
-		printf("\t %s (%s) sub=%s\n", 
-		       name,
-		       xmpp_stanza_get_attribute(item, "jid"),
-		       xmpp_stanza_get_attribute(item, "subscription"));
-	    else
-		printf("\t %s sub=%s\n",
-		       xmpp_stanza_get_attribute(item, "jid"),
-		       xmpp_stanza_get_attribute(item, "subscription"));
-	printf("END OF LIST\n");
+        query = xmpp_stanza_get_child_by_name(stanza, "query");
+        printf("Roster:\n");
+        for (item = xmpp_stanza_get_children(query); item;
+             item = xmpp_stanza_get_next(item))
+            if ((name = xmpp_stanza_get_attribute(item, "name")))
+                printf("\t %s (%s) sub=%s\n", name,
+                       xmpp_stanza_get_attribute(item, "jid"),
+                       xmpp_stanza_get_attribute(item, "subscription"));
+            else
+                printf("\t %s sub=%s\n", xmpp_stanza_get_attribute(item, "jid"),
+                       xmpp_stanza_get_attribute(item, "subscription"));
+        printf("END OF LIST\n");
     }
 
     /* disconnect */
@@ -51,39 +51,44 @@ 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 *const conn,
+                  const xmpp_conn_event_t status,
+                  const int error,
+                  xmpp_stream_error_t *const stream_error,
+                  void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
     xmpp_stanza_t *iq, *query;
 
+    (void)error;
+    (void)stream_error;
+
     if (status == XMPP_CONN_CONNECT) {
-	fprintf(stderr, "DEBUG: connected\n");
-	
-	/* create iq stanza for request */
-	iq = xmpp_iq_new(ctx, "get", "roster1");
+        fprintf(stderr, "DEBUG: connected\n");
 
-	query = xmpp_stanza_new(ctx);
-	xmpp_stanza_set_name(query, "query");
-	xmpp_stanza_set_ns(query, XMPP_NS_ROSTER);
+        /* create iq stanza for request */
+        iq = xmpp_iq_new(ctx, "get", "roster1");
 
-	xmpp_stanza_add_child(iq, query);
+        query = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(query, "query");
+        xmpp_stanza_set_ns(query, XMPP_NS_ROSTER);
 
-	/* we can release the stanza since it belongs to iq now */
-	xmpp_stanza_release(query);
+        xmpp_stanza_add_child(iq, query);
 
-	/* set up reply handler */
-	xmpp_id_handler_add(conn, handle_reply, "roster1", ctx);
+        /* we can release the stanza since it belongs to iq now */
+        xmpp_stanza_release(query);
 
-	/* send out the stanza */
-	xmpp_send(conn, iq);
+        /* set up reply handler */
+        xmpp_id_handler_add(conn, handle_reply, "roster1", ctx);
 
-	/* release the stanza */
-	xmpp_stanza_release(iq);
+        /* send out the stanza */
+        xmpp_send(conn, iq);
+
+        /* release the stanza */
+        xmpp_stanza_release(iq);
     } else {
-	fprintf(stderr, "DEBUG: disconnected\n");
-	xmpp_stop(ctx);
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(ctx);
     }
 }
 
@@ -93,8 +98,8 @@ int main(int argc, char **argv)
     xmpp_conn_t *conn;
 
     if (argc != 3) {
-	fprintf(stderr, "Usage: roster <jid> <pass>\n\n");
-	return 1;
+        fprintf(stderr, "Usage: roster <jid> <pass>\n\n");
+        return 1;
     }
 
     /* initialize lib */

examples/uuid.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <strophe.h>
 
-int main(int argc, char **argv)
+int main()
 {
     xmpp_ctx_t *ctx;
     char *uuid;

examples/vcard.c

@@ -76,8 +76,8 @@ static void vcard_photo(vcard_t *vc, xmpp_stanza_t *stanza)
     xmpp_free(vc->ctx, img);
 }
 
-static void vcard_print_string(vcard_t *vc, xmpp_stanza_t *stanza,
-                               const char *info)
+static void
+vcard_print_string(vcard_t *vc, xmpp_stanza_t *stanza, const char *info)
 {
     char *s = xmpp_stanza_get_text(stanza);
 
@@ -140,14 +140,9 @@ static vcard_cb_t vcard_cb_get(xmpp_stanza_t *stanza)
         const char *tag;
         vcard_cb_t cb;
     } vcard_tbl[] = {
-        { "PHOTO", vcard_photo },
-        { "BDAY", vcard_bday },
-        { "DESC", vcard_desc },
-        { "EMAIL", vcard_email },
-        { "FN", vcard_fn },
-        { "N", vcard_name },
-        { "NICKNAME", vcard_nick },
-        { "URL", vcard_url },
+        {"PHOTO", vcard_photo},   {"BDAY", vcard_bday}, {"DESC", vcard_desc},
+        {"EMAIL", vcard_email},   {"FN", vcard_fn},     {"N", vcard_name},
+        {"NICKNAME", vcard_nick}, {"URL", vcard_url},
     };
 
     tag = xmpp_stanza_get_name(stanza);
@@ -165,16 +160,19 @@ exit:
     return cb;
 }
 
-static int timedout(xmpp_conn_t * const conn, void * const userdata)
+static int timedout(xmpp_conn_t *const conn, void *const userdata)
 {
+    (void)userdata;
+
     fprintf(stderr, "Timeout reached.\n");
     xmpp_disconnect(conn);
 
     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 *const conn,
+                      xmpp_stanza_t *const stanza,
+                      void *const userdata)
 {
     vcard_t *vc = userdata;
     vcard_cb_t cb;
@@ -213,16 +211,17 @@ exit:
 static void send_vcard_req(xmpp_conn_t *conn, const char *to, const char *id)
 {
     printf("Requesting vCard from %s.\n", to);
-    xmpp_send_raw_string(conn, "<iq from='%s' to='%s' type='get' id='%s'>"
-                               "<vCard xmlns='vcard-temp'/></iq>",
-                               xmpp_conn_get_bound_jid(conn), to, id);
+    xmpp_send_raw_string(conn,
+                         "<iq from='%s' to='%s' type='get' id='%s'>"
+                         "<vCard xmlns='vcard-temp'/></iq>",
+                         xmpp_conn_get_bound_jid(conn), to, id);
 }
 
-static void conn_handler(xmpp_conn_t * const conn,
+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)
+                         xmpp_stream_error_t *const stream_error,
+                         void *const userdata)
 {
     vcard_t *vc = userdata;
 
@@ -235,25 +234,26 @@ static void conn_handler(xmpp_conn_t * const conn,
             fprintf(stderr, "Disconnected with error=%d.\n", error);
         if (stream_error != NULL)
             fprintf(stderr, "Stream error type=%d text=%s.\n",
-                            stream_error->type, stream_error->text);
+                    stream_error->type, stream_error->text);
         xmpp_stop(vc->ctx);
     }
 }
 
 int main(int argc, char **argv)
 {
-    xmpp_log_t  *log;
-    xmpp_ctx_t  *ctx;
+    xmpp_log_t *log;
+    xmpp_ctx_t *ctx;
     xmpp_conn_t *conn;
-    const char  *jid;
-    const char  *pass;
-    char        *prog;
-    vcard_t      vcard;
+    const char *jid;
+    const char *pass;
+    char *prog;
+    vcard_t vcard;
 
     if (argc < 4 || argc > 5) {
         prog = argc > 0 ? strdup(argv[0]) : NULL;
         printf("Usage: %s <login-jid> <password> <recipient-jid> "
-               "[image-file]\n\n", prog == NULL ? "vcard" : basename(prog));
+               "[image-file]\n\n",
+               prog == NULL ? "vcard" : basename(prog));
         printf("If vCard contains a photo it will be stored to "
                "image-file. If you don't provide the image-file "
                "default filename will be generated.\n");
@@ -281,4 +281,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-

jni/Android.mk

@@ -23,7 +23,7 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libstrophe
-LOCAL_CFLAGS :=
+LOCAL_CFLAGS := -DHAVE_DECL_VA_COPY
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../src \
@@ -45,6 +45,8 @@ LOCAL_SRC_FILES := \
 	../src/sasl.c \
 	../src/scram.c \
 	../src/sha1.c \
+	../src/sha256.c \
+	../src/sha512.c \
 	../src/snprintf.c \
 	../src/sock.c \
 	../src/stanza.c \

rpm/README

@@ -1,31 +0,0 @@
-1. Setup
-
-yum install gcc make autoconf automake expat-devel openssl-devel
-
-Fedora:
-
-yum install fedora-packager
-cd ~
-rpmdev-setuptree
-
-CentOS:
-
-mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-
-Then make a tarball of sources:
-
-tar czf libstrophe_git.tar.gz libstrophe
-
-2. Build
-
-cp libstrophe.spec ~/rpmbuild/SPECS
-cp libstrophe_git.tar.gz ~/rpmbuild/SOURCES
-rpmbuild -bb ~/rpmbuild/SPECS/libstrophe.spec
-
-3. Install
-
-yum localinstall ~/rpmbuild/RPMS/<arch>/libstrophe-1.1<dist>.<arch>.rpm
-
-Or, if localinstall is not recognised:
-
-rpm -i ~/rpmbuild/RPMS/<arch>/libstrophe-1.1<dist>.<arch>.rpm

rpm/libstrophe.spec

@@ -1,59 +0,0 @@
-Name:		libstrophe
-Version:	1
-Release:	1%{?dist}_git
-Summary:	xmpp library in C
-
-Group:		Application/System
-License:	MIT/GPLv3
-URL:		http://strophe.im/libstrophe/
-Source0:	libstrophe_git.tar.gz
-
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	openssl-devel
-BuildRequires:	expat-devel
-Requires:	openssl
-Requires:	expat
-
-%description
-XMPP library in C
-
-%package        devel
-Summary:        Headers and libraries for building apps that use libstrophe
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-This package contains headers and libraries required to build applications that
-use the strophe XMPP library.
-
-%prep
-%setup -n libstrophe
-./bootstrap.sh
-
-%build
-%configure
-make %{?_smp_mflags}
-
-%install
-make install DESTDIR=%{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libstrophe.so*
-%doc
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libstrophe.a
-%{_libdir}/libstrophe.la
-%{_libdir}/pkgconfig/libstrophe.pc
-%{_includedir}/strophe.h
-%doc
-
-%changelog

src/common.h

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-
 #include "strophe.h"
 #include "ostypes.h"
 #include "sock.h"
@@ -30,78 +29,7 @@
 #include "rand.h"
 #include "snprintf.h"
 
-/** run-time context **/
-
-typedef enum {
-    XMPP_LOOP_NOTSTARTED,
-    XMPP_LOOP_RUNNING,
-    XMPP_LOOP_QUIT
-} xmpp_loop_status_t;
-
-typedef struct _xmpp_connlist_t {
-    xmpp_conn_t *conn;
-    struct _xmpp_connlist_t *next;
-} xmpp_connlist_t;
-
-struct _xmpp_ctx_t {
-    const xmpp_mem_t *mem;
-    const xmpp_log_t *log;
-
-    xmpp_rand_t *rand;
-    xmpp_loop_status_t loop_status;
-    xmpp_connlist_t *connlist;
-
-    unsigned long timeout;
-};
-
-
-/* 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);
-
-/* 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,
-                ...);
-
-/** connection **/
-
-/* opaque connection object */
-typedef enum {
-    XMPP_STATE_DISCONNECTED,
-    XMPP_STATE_CONNECTING,
-    XMPP_STATE_CONNECTED
-} xmpp_conn_state_t;
-
-typedef struct _xmpp_send_queue_t xmpp_send_queue_t;
-struct _xmpp_send_queue_t {
-    char *data;
-    size_t len;
-    size_t written;
-
-    xmpp_send_queue_t *next;
-};
+/** handlers **/
 
 typedef struct _xmpp_handlist_t xmpp_handlist_t;
 struct _xmpp_handlist_t {
@@ -130,15 +58,94 @@ struct _xmpp_handlist_t {
             char *name;
             char *type;
         };
-    };
+    } u;
 };
 
+/** run-time context **/
+
+typedef enum {
+    XMPP_LOOP_NOTSTARTED,
+    XMPP_LOOP_RUNNING,
+    XMPP_LOOP_QUIT
+} xmpp_loop_status_t;
+
+typedef struct _xmpp_connlist_t {
+    xmpp_conn_t *conn;
+    struct _xmpp_connlist_t *next;
+} xmpp_connlist_t;
+
+struct _xmpp_ctx_t {
+    const xmpp_mem_t *mem;
+    const xmpp_log_t *log;
+
+    xmpp_rand_t *rand;
+    xmpp_loop_status_t loop_status;
+    xmpp_connlist_t *connlist;
+    xmpp_handlist_t *timed_handlers;
+
+    unsigned long timeout;
+};
+
+/* 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);
+
+/* 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,
+                ...);
+
+/** connection **/
+
+/* opaque connection object */
+typedef enum {
+    XMPP_STATE_DISCONNECTED,
+    XMPP_STATE_CONNECTING,
+    XMPP_STATE_CONNECTED
+} xmpp_conn_state_t;
+
+typedef struct _xmpp_send_queue_t xmpp_send_queue_t;
+struct _xmpp_send_queue_t {
+    char *data;
+    size_t len;
+    size_t written;
+
+    xmpp_send_queue_t *next;
+};
+
+#define UNUSED(x) ((void)(x))
+
 #define MAX_DOMAIN_LEN 256
 
-#define SASL_MASK_PLAIN     (1 << 0)
+#define SASL_MASK_PLAIN (1 << 0)
 #define SASL_MASK_DIGESTMD5 (1 << 1)
 #define SASL_MASK_ANONYMOUS (1 << 2)
 #define SASL_MASK_SCRAMSHA1 (1 << 3)
+#define SASL_MASK_SCRAMSHA256 (1 << 4)
+#define SASL_MASK_SCRAMSHA512 (1 << 5)
+
+#define SASL_MASK_SCRAM \
+    (SASL_MASK_SCRAMSHA1 | SASL_MASK_SCRAMSHA256 | SASL_MASK_SCRAMSHA512)
 
 enum {
     XMPP_PORT_CLIENT = 5222,
@@ -146,7 +153,7 @@ enum {
     XMPP_PORT_COMPONENT = 5347,
 };
 
-typedef void (*xmpp_open_handler)(xmpp_conn_t * const conn);
+typedef void (*xmpp_open_handler)(xmpp_conn_t *const conn);
 
 struct _xmpp_conn_t {
     unsigned int ref;
@@ -160,8 +167,7 @@ struct _xmpp_conn_t {
     xmpp_stream_error_t *stream_error;
 
     sock_t sock;
-    xmpp_sock_t *xsock;
-    int ka_timeout; /* TCP keepalive timeout */
+    int ka_timeout;  /* TCP keepalive timeout */
     int ka_interval; /* TCP keepalive interval */
 
     tls_t *tls;
@@ -170,8 +176,8 @@ struct _xmpp_conn_t {
     int tls_mandatory;
     int tls_legacy_ssl;
     int tls_trust;
-    int tls_failed; /* set when tls fails, so we don't try again */
-    int sasl_support; /* if true, field is a bitfield of supported 
+    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 */
@@ -208,7 +214,7 @@ struct _xmpp_conn_t {
 
     /* user handlers only get called after authentication */
     int authenticated;
-    
+
     /* connection events handler */
     xmpp_conn_handler conn_handler;
     void *userdata;
@@ -219,14 +225,13 @@ struct _xmpp_conn_t {
     xmpp_handlist_t *handlers;
 };
 
-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 *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);
 
 typedef enum {
     XMPP_STANZA_UNKNOWN,
@@ -239,7 +244,7 @@ struct _xmpp_stanza_t {
     xmpp_ctx_t *ctx;
 
     xmpp_stanza_type_t type;
-    
+
     xmpp_stanza_t *prev;
     xmpp_stanza_t *next;
     xmpp_stanza_t *children;
@@ -251,33 +256,33 @@ 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 *const conn, xmpp_stanza_t *const stanza);
+uint64_t handler_fire_timed(xmpp_ctx_t *const 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 *const conn,
                        xmpp_timed_handler handler,
                        const unsigned long period,
-                       void * const userdata);
-void handler_add_id(xmpp_conn_t * const conn,
+                       void *const userdata);
+void handler_add_id(xmpp_conn_t *const conn,
                     xmpp_handler handler,
-                    const char * const id,
-                    void * const userdata);
-void handler_add(xmpp_conn_t * const conn,
+                    const char *const id,
+                    void *const userdata);
+void handler_add(xmpp_conn_t *const conn,
                  xmpp_handler handler,
-                 const char * const ns,
-                 const char * const name,
-                 const char * const type,
-                 void * const userdata);
+                 const char *const ns,
+                 const char *const name,
+                 const char *const type,
+                 void *const userdata);
 void handler_system_delete_all(xmpp_conn_t *conn);
 
 /* utility functions */
-void disconnect_mem_error(xmpp_conn_t * const conn);
+void disconnect_with_error(xmpp_conn_t *const conn, int error);
+void disconnect_mem_error(xmpp_conn_t *const 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 *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);
 
 #endif /* __LIBSTROPHE_COMMON_H__ */

src/conn.c

@@ -34,7 +34,7 @@
 #define DEFAULT_SEND_QUEUE_MAX 64
 #endif
 #ifndef DISCONNECT_TIMEOUT
-/** @def DISCONNECT_TIMEOUT 
+/** @def DISCONNECT_TIMEOUT
  *  The time to wait (in milliseconds) for graceful disconnection to
  *  complete before the connection is reset.  The default is 2 seconds.
  */
@@ -48,32 +48,35 @@
 #define CONNECT_TIMEOUT 5000 /* 5 seconds */
 #endif
 
-static int _disconnect_cleanup(xmpp_conn_t * const conn,
-                               void * const userdata);
-static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
-                                    char **attributes, size_t attributes_len);
-static void _conn_attributes_new(xmpp_conn_t *conn, char **attrs,
-                                 char ***attributes, size_t *attributes_len);
-static void _conn_attributes_destroy(xmpp_conn_t *conn, char **attributes,
+static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata);
+static char *_conn_build_stream_tag(xmpp_conn_t *const conn,
+                                    char **attributes,
+                                    size_t attributes_len);
+static void _conn_attributes_new(xmpp_conn_t *conn,
+                                 char **attrs,
+                                 char ***attributes,
+                                 size_t *attributes_len);
+static void _conn_attributes_destroy(xmpp_conn_t *conn,
+                                     char **attributes,
                                      size_t attributes_len);
-static void _handle_stream_start(char *name, char **attrs,
-                                 void * const userdata);
-static void _handle_stream_end(char *name,
-                               void * const userdata);
-static void _handle_stream_stanza(xmpp_stanza_t *stanza,
-                                  void * const userdata);
-static unsigned short _conn_default_port(xmpp_conn_t * const conn,
+static void
+_handle_stream_start(char *name, char **attrs, void *const userdata);
+static void _handle_stream_end(char *name, void *const userdata);
+static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *const userdata);
+static unsigned short _conn_default_port(xmpp_conn_t *const conn,
                                          xmpp_conn_type_t type);
-static void _conn_reset(xmpp_conn_t * const conn);
-static int _conn_connect(xmpp_conn_t * const conn,
-                         const char * const domain,
-                         const char * const host,
+static void _conn_reset(xmpp_conn_t *const conn);
+static int _conn_connect(xmpp_conn_t *const conn,
+                         const char *const domain,
+                         const char *const host,
                          unsigned short port,
                          xmpp_conn_type_t type,
                          xmpp_conn_handler callback,
-                         void * const userdata);
+                         void *const userdata);
 
-void xmpp_send_error(xmpp_conn_t * const conn, xmpp_error_type_t const type, char * const text)
+void xmpp_send_error(xmpp_conn_t *const conn,
+                     xmpp_error_type_t const type,
+                     char *const text)
 {
     xmpp_stanza_t *error = xmpp_error_new(conn->ctx, type, text);
 
@@ -90,12 +93,13 @@ void xmpp_send_error(xmpp_conn_t * const conn, xmpp_error_type_t const type, cha
  *
  *  @ingroup Connections
  */
-xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
+xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
 {
     xmpp_conn_t *conn = NULL;
     xmpp_connlist_t *tail, *item;
 
-    if (ctx == NULL) return NULL;
+    if (ctx == NULL)
+        return NULL;
 
     conn = xmpp_alloc(ctx, sizeof(xmpp_conn_t));
     if (conn != NULL) {
@@ -146,11 +150,9 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
         conn->bind_required = 0;
         conn->session_required = 0;
 
-        conn->parser = parser_new(conn->ctx,
-                                  _handle_stream_start,
-                                  _handle_stream_end,
-                                  _handle_stream_stanza,
-                                  conn);
+        conn->parser =
+            parser_new(conn->ctx, _handle_stream_start, _handle_stream_end,
+                       _handle_stream_stanza, conn);
         conn->reset_parser = 0;
 
         conn->authenticated = 0;
@@ -166,7 +168,8 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
 
         /* add connection to ctx->connlist */
         tail = conn->ctx->connlist;
-        while (tail && tail->next) tail = tail->next;
+        while (tail && tail->next)
+            tail = tail->next;
 
         item = xmpp_alloc(conn->ctx, sizeof(xmpp_connlist_t));
         if (!item) {
@@ -179,16 +182,18 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
             item->conn = conn;
             item->next = NULL;
 
-            if (tail) tail->next = item;
-            else conn->ctx->connlist = item;
+            if (tail)
+                tail->next = item;
+            else
+                conn->ctx->connlist = item;
         }
     }
-    
+
     return conn;
 }
 
 /** Clone a Strophe connection object.
- *  
+ *
  *  @param conn a Strophe connection object
  *
  *  @return the same conn object passed in with its reference count
@@ -196,7 +201,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t * const ctx)
  *
  *  @ingroup Connections
  */
-xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t * const conn)
+xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t *const conn)
 {
     conn->ref++;
     return conn;
@@ -214,7 +219,7 @@ xmpp_conn_t *xmpp_conn_clone(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-void xmpp_conn_set_keepalive(xmpp_conn_t * const conn, int timeout, int interval)
+void xmpp_conn_set_keepalive(xmpp_conn_t *const conn, int timeout, int interval)
 {
     int ret = 0;
 
@@ -240,7 +245,7 @@ void xmpp_conn_set_keepalive(xmpp_conn_t * const conn, int timeout, int interval
  *
  *  @ingroup Connections
  */
-int xmpp_conn_release(xmpp_conn_t * const conn)
+int xmpp_conn_release(xmpp_conn_t *const conn)
 {
     xmpp_ctx_t *ctx;
     xmpp_connlist_t *item, *prev;
@@ -254,6 +259,11 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
     else {
         ctx = conn->ctx;
 
+        if (conn->state == XMPP_STATE_CONNECTING ||
+            conn->state == XMPP_STATE_CONNECTED) {
+            conn_disconnect(conn);
+        }
+
         /* remove connection from context's connlist */
         if (ctx->connlist->conn == conn) {
             item = ctx->connlist;
@@ -299,7 +309,7 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
             while (hlitem) {
                 thli = hlitem;
                 hlitem = hlitem->next;
-                xmpp_free(conn->ctx, thli->id);
+                xmpp_free(conn->ctx, thli->u.id);
                 xmpp_free(conn->ctx, thli);
             }
         }
@@ -311,17 +321,23 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
             thli = hlitem;
             hlitem = hlitem->next;
 
-            if (thli->ns) xmpp_free(ctx, thli->ns);
-            if (thli->name) xmpp_free(ctx, thli->name);
-            if (thli->type) xmpp_free(ctx, thli->type);
+            if (thli->u.ns)
+                xmpp_free(ctx, thli->u.ns);
+            if (thli->u.name)
+                xmpp_free(ctx, thli->u.name);
+            if (thli->u.type)
+                xmpp_free(ctx, thli->u.type);
             xmpp_free(ctx, thli);
         }
 
         parser_free(conn->parser);
 
-        if (conn->jid) xmpp_free(ctx, conn->jid);
-        if (conn->pass) xmpp_free(ctx, conn->pass);
-        if (conn->lang) xmpp_free(ctx, conn->lang);
+        if (conn->jid)
+            xmpp_free(ctx, conn->jid);
+        if (conn->pass)
+            xmpp_free(ctx, conn->pass);
+        if (conn->lang)
+            xmpp_free(ctx, conn->lang);
         xmpp_free(ctx, conn);
         released = 1;
     }
@@ -330,14 +346,14 @@ int xmpp_conn_release(xmpp_conn_t * const conn)
 }
 
 /** Get the JID which is or will be bound to the connection.
- *  
+ *
  *  @param conn a Strophe connection object
  *
  *  @return a string containing the full JID or NULL if it has not been set
  *
  *  @ingroup Connections
  */
-const char *xmpp_conn_get_jid(const xmpp_conn_t * const conn)
+const char *xmpp_conn_get_jid(const xmpp_conn_t *const conn)
 {
     return conn->jid;
 }
@@ -355,7 +371,7 @@ const char *xmpp_conn_get_jid(const xmpp_conn_t * const conn)
  *
  * @ingroup Connections
  */
-const char *xmpp_conn_get_bound_jid(const xmpp_conn_t * const conn)
+const char *xmpp_conn_get_bound_jid(const xmpp_conn_t *const conn)
 {
     return conn->bound_jid;
 }
@@ -371,9 +387,10 @@ const char *xmpp_conn_get_bound_jid(const xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-void xmpp_conn_set_jid(xmpp_conn_t * const conn, const char * const jid)
+void xmpp_conn_set_jid(xmpp_conn_t *const conn, const char *const jid)
 {
-    if (conn->jid) xmpp_free(conn->ctx, conn->jid);
+    if (conn->jid)
+        xmpp_free(conn->ctx, conn->jid);
     conn->jid = xmpp_strdup(conn->ctx, jid);
 }
 
@@ -385,7 +402,7 @@ void xmpp_conn_set_jid(xmpp_conn_t * const conn, const char * const jid)
  *
  *  @ingroup Connections
  */
-const char *xmpp_conn_get_pass(const xmpp_conn_t * const conn)
+const char *xmpp_conn_get_pass(const xmpp_conn_t *const conn)
 {
     return conn->pass;
 }
@@ -393,28 +410,29 @@ const char *xmpp_conn_get_pass(const xmpp_conn_t * const conn)
 /** Set the password used to authenticate the connection.
  *  If any password was previously set, it will be discarded.  The function
  *  will make a copy of the password string.
- * 
+ *
  *  @param conn a Strophe connection object
  *  @param pass the password
  *
  *  @ingroup Connections
  */
-void xmpp_conn_set_pass(xmpp_conn_t * const conn, const char * const pass)
+void xmpp_conn_set_pass(xmpp_conn_t *const conn, const char *const pass)
 {
-    if (conn->pass) xmpp_free(conn->ctx, conn->pass);
+    if (conn->pass)
+        xmpp_free(conn->ctx, conn->pass);
     conn->pass = xmpp_strdup(conn->ctx, pass);
 }
 
 /** Get the strophe context that the connection is associated with.
-*  @param conn a Strophe connection object
-* 
-*  @return a Strophe context
-* 
-*  @ingroup Connections
-*/
-xmpp_ctx_t* xmpp_conn_get_context(xmpp_conn_t * const conn)
+ *  @param conn a Strophe connection object
+ *
+ *  @return a Strophe context
+ *
+ *  @ingroup Connections
+ */
+xmpp_ctx_t *xmpp_conn_get_context(xmpp_conn_t *const conn)
 {
-        return conn->ctx;
+    return conn->ctx;
 }
 
 /** Initiate a connection to the XMPP server.
@@ -422,7 +440,7 @@ xmpp_ctx_t* xmpp_conn_get_context(xmpp_conn_t * const conn)
  *  process to the XMPP server, and notifications of connection state changes
  *  will be sent to the callback function.  The domain and port to connect to
  *  are usually determined by an SRV lookup for the xmpp-client service at
- *  the domain specified in the JID.  If SRV lookup fails, altdomain and 
+ *  the domain specified in the JID.  If SRV lookup fails, altdomain and
  *  altport will be used instead if specified.
  *
  *  @param conn a Strophe connection object
@@ -438,11 +456,11 @@ xmpp_ctx_t* xmpp_conn_get_context(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_connect_client(xmpp_conn_t * const conn,
-                        const char * const altdomain,
+int xmpp_connect_client(xmpp_conn_t *const conn,
+                        const char *const altdomain,
                         unsigned short altport,
                         xmpp_conn_handler callback,
-                        void * const userdata)
+                        void *const userdata)
 {
     resolver_srv_rr_t *srv_rr_list = NULL;
     resolver_srv_rr_t *rr;
@@ -453,7 +471,8 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
     int rc;
 
     domain = xmpp_jid_domain(conn->ctx, conn->jid);
-    if (!domain) return XMPP_EMEM;
+    if (!domain)
+        return XMPP_EMEM;
 
     if (altdomain != NULL) {
         xmpp_debug(conn->ctx, "xmpp", "Connecting via altdomain.");
@@ -461,16 +480,17 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
         port = altport ? altport : _conn_default_port(conn, XMPP_CLIENT);
         found = XMPP_DOMAIN_ALTDOMAIN;
 
-    /* SSL tunneled connection on 5223 port is legacy and doesn't
-     * have an SRV record. */
+        /* SSL tunneled connection on 5223 port is legacy and doesn't
+         * have an SRV record. */
     } else if (!conn->tls_legacy_ssl) {
         found = resolver_srv_lookup(conn->ctx, "xmpp-client", "tcp", domain,
                                     &srv_rr_list);
     }
 
     if (XMPP_DOMAIN_NOT_FOUND == found) {
-        xmpp_debug(conn->ctx, "xmpp", "SRV lookup failed, "
-                                      "connecting via domain.");
+        xmpp_debug(conn->ctx, "xmpp",
+                   "SRV lookup failed, "
+                   "connecting via domain.");
         host = domain;
         port = altport ? altport : _conn_default_port(conn, XMPP_CLIENT);
         found = XMPP_DOMAIN_ALTDOMAIN;
@@ -483,8 +503,8 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
             port = rr->port;
             rr = rr->next;
         }
-        rc = _conn_connect(conn, domain, host, port, XMPP_CLIENT,
-                           callback, userdata);
+        rc = _conn_connect(conn, domain, host, port, XMPP_CLIENT, callback,
+                           userdata);
     } while (rc != 0 && rr != NULL);
 
     xmpp_free(conn->ctx, domain);
@@ -516,18 +536,22 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
  *
  *  @ingroup Connections
  */
-int xmpp_connect_component(xmpp_conn_t * const conn, const char * const server,
-                           unsigned short port, xmpp_conn_handler callback,
-                           void * const userdata)
+int xmpp_connect_component(xmpp_conn_t *const conn,
+                           const char *const server,
+                           unsigned short port,
+                           xmpp_conn_handler callback,
+                           void *const userdata)
 {
     /*  The server domain, jid and password MUST be specified. */
-    if (!(server && conn->jid && conn->pass)) return XMPP_EINVOP;
+    if (!(server && conn->jid && conn->pass))
+        return XMPP_EINVOP;
 
     /* XEP-0114 does not support TLS */
     xmpp_conn_disable_tls(conn);
     if (!conn->tls_disabled) {
-        xmpp_error(conn->ctx, "conn", "Failed to disable TLS. "
-                                      "XEP-0114 does not support TLS");
+        xmpp_error(conn->ctx, "conn",
+                   "Failed to disable TLS. "
+                   "XEP-0114 does not support TLS");
         return XMPP_EINT;
     }
 
@@ -559,18 +583,18 @@ int xmpp_connect_component(xmpp_conn_t * const conn, const char * const server,
  *
  *  @ingroup Connections
  */
-int xmpp_connect_raw(xmpp_conn_t * const conn,
-                     const char * const altdomain,
+int xmpp_connect_raw(xmpp_conn_t *const conn,
+                     const char *const altdomain,
                      unsigned short altport,
                      xmpp_conn_handler callback,
-                     void * const userdata)
+                     void *const userdata)
 {
     conn->is_raw = 1;
     return xmpp_connect_client(conn, altdomain, altport, callback, userdata);
 }
 
 /* Called when tcp connection is established. */
-void conn_established(xmpp_conn_t * const conn)
+void conn_established(xmpp_conn_t *const conn)
 {
     if (conn->tls_legacy_ssl && !conn->is_raw) {
         xmpp_debug(conn->ctx, "xmpp", "using legacy SSL connection");
@@ -585,7 +609,8 @@ void conn_established(xmpp_conn_t * const conn)
         /* we skip authentication for a "raw" connection, but the event loop
            ignores user's handlers when conn->authenticated is not set. */
         conn->authenticated = 1;
-        conn->conn_handler(conn, XMPP_CONN_RAW_CONNECT, 0, NULL, conn->userdata);
+        conn->conn_handler(conn, XMPP_CONN_RAW_CONNECT, 0, NULL,
+                           conn->userdata);
     } else {
         /* send stream init */
         conn_open_stream(conn);
@@ -603,7 +628,7 @@ void conn_established(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_conn_open_stream_default(xmpp_conn_t * const conn)
+int xmpp_conn_open_stream_default(xmpp_conn_t *const conn)
 {
     if (!conn->is_raw)
         return XMPP_EINVOP;
@@ -630,7 +655,8 @@ int xmpp_conn_open_stream_default(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_conn_open_stream(xmpp_conn_t * const conn, char **attributes,
+int xmpp_conn_open_stream(xmpp_conn_t *const conn,
+                          char **attributes,
                           size_t attributes_len)
 {
     char *tag;
@@ -655,7 +681,7 @@ int xmpp_conn_open_stream(xmpp_conn_t * const conn, char **attributes,
  *
  *  @ingroup Connections
  */
-int xmpp_conn_tls_start(xmpp_conn_t * const conn)
+int xmpp_conn_tls_start(xmpp_conn_t *const conn)
 {
     return conn_tls_start(conn);
 }
@@ -666,7 +692,7 @@ int xmpp_conn_tls_start(xmpp_conn_t * const conn)
  *
  *  @param conn a Strophe connection object
  */
-void conn_disconnect_clean(xmpp_conn_t * const conn)
+void conn_disconnect_clean(xmpp_conn_t *const conn)
 {
     /* remove the timed handler */
     xmpp_timed_handler_delete(conn, _disconnect_cleanup);
@@ -680,7 +706,7 @@ void conn_disconnect_clean(xmpp_conn_t * const conn)
  *
  *  @param conn a Strophe connection object
  */
-void conn_disconnect(xmpp_conn_t * const conn) 
+void conn_disconnect(xmpp_conn_t *const conn)
 {
     xmpp_debug(conn->ctx, "xmpp", "Closing socket.");
     conn->state = XMPP_STATE_DISCONNECTED;
@@ -689,8 +715,7 @@ void conn_disconnect(xmpp_conn_t * const conn)
         tls_free(conn->tls);
         conn->tls = NULL;
     }
-    if (conn->sock >= 0)
-        sock_close(conn->sock);
+    sock_close(conn->sock);
 
     /* fire off connection handler */
     conn->conn_handler(conn, XMPP_CONN_DISCONNECT, conn->error,
@@ -699,14 +724,14 @@ void conn_disconnect(xmpp_conn_t * const conn)
 
 /* prepares a parser reset.  this is called from handlers. we can't
  * reset the parser immediately as it is not re-entrant. */
-void conn_prepare_reset(xmpp_conn_t * const conn, xmpp_open_handler handler)
+void conn_prepare_reset(xmpp_conn_t *const conn, xmpp_open_handler handler)
 {
     conn->reset_parser = 1;
     conn->open_handler = handler;
 }
 
 /* reset the parser */
-void conn_parser_reset(xmpp_conn_t * const conn)
+void conn_parser_reset(xmpp_conn_t *const conn)
 {
     conn->reset_parser = 0;
     parser_reset(conn->parser);
@@ -721,7 +746,7 @@ void conn_parser_reset(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-void xmpp_disconnect(xmpp_conn_t * const conn)
+void xmpp_disconnect(xmpp_conn_t *const conn)
 {
     if (conn->state != XMPP_STATE_CONNECTING &&
         conn->state != XMPP_STATE_CONNECTED)
@@ -731,8 +756,7 @@ void xmpp_disconnect(xmpp_conn_t * const conn)
     xmpp_send_raw_string(conn, "</stream:stream>");
 
     /* setup timed handler in case disconnect takes too long */
-    handler_add_timed(conn, _disconnect_cleanup,
-                      DISCONNECT_TIMEOUT, NULL);
+    handler_add_timed(conn, _disconnect_cleanup, DISCONNECT_TIMEOUT, NULL);
 }
 
 /** Send a raw string to the XMPP server.
@@ -748,8 +772,7 @@ void xmpp_disconnect(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-void xmpp_send_raw_string(xmpp_conn_t * const conn,
-                          const char * const fmt, ...)
+void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...)
 {
     va_list ap;
     size_t len;
@@ -766,7 +789,8 @@ void xmpp_send_raw_string(xmpp_conn_t * const conn,
         len++; /* account for trailing \0 */
         bigbuf = xmpp_alloc(conn->ctx, len);
         if (!bigbuf) {
-            xmpp_debug(conn->ctx, "xmpp", "Could not allocate memory for send_raw_string");
+            xmpp_debug(conn->ctx, "xmpp",
+                       "Could not allocate memory for send_raw_string");
             return;
         }
         va_start(ap, fmt);
@@ -797,16 +821,19 @@ void xmpp_send_raw_string(xmpp_conn_t * const conn,
  *
  *  @ingroup Connections
  */
-void xmpp_send_raw(xmpp_conn_t * const conn,
-                   const char * const data, const size_t len)
+void xmpp_send_raw(xmpp_conn_t *const conn,
+                   const char *const data,
+                   const size_t len)
 {
     xmpp_send_queue_t *item;
 
-    if (conn->state != XMPP_STATE_CONNECTED) return;
+    if (conn->state != XMPP_STATE_CONNECTED)
+        return;
 
     /* create send queue item for queue */
     item = xmpp_alloc(conn->ctx, sizeof(xmpp_send_queue_t));
-    if (!item) return;
+    if (!item)
+        return;
 
     item->data = xmpp_alloc(conn->ctx, len);
     if (!item->data) {
@@ -840,8 +867,7 @@ void xmpp_send_raw(xmpp_conn_t * const conn,
  *
  *  @ingroup Connections
  */
-void xmpp_send(xmpp_conn_t * const conn,
-               xmpp_stanza_t * const stanza)
+void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
 {
     char *buf;
     size_t len;
@@ -861,23 +887,22 @@ void xmpp_send(xmpp_conn_t * const conn,
  *
  *  @param conn a Strophe connection object
  */
-void conn_open_stream(xmpp_conn_t * const conn)
+void conn_open_stream(xmpp_conn_t *const conn)
 {
     xmpp_send_raw_string(conn,
-                         "<?xml version=\"1.0\"?>"                     \
-                         "<stream:stream to=\"%s\" "                   \
-                         "xml:lang=\"%s\" "                            \
-                         "version=\"1.0\" "                            \
-                         "xmlns=\"%s\" "                               \
+                         "<?xml version=\"1.0\"?>"
+                         "<stream:stream to=\"%s\" "
+                         "xml:lang=\"%s\" "
+                         "version=\"1.0\" "
+                         "xmlns=\"%s\" "
                          "xmlns:stream=\"%s\">",
-                         conn->domain,
-                         conn->lang,
-                         conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT :
-                                                     XMPP_NS_COMPONENT,
+                         conn->domain, conn->lang,
+                         conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT
+                                                   : XMPP_NS_COMPONENT,
                          XMPP_NS_STREAMS);
 }
 
-int conn_tls_start(xmpp_conn_t * const conn)
+int conn_tls_start(xmpp_conn_t *const conn)
 {
     int rc;
 
@@ -893,16 +918,18 @@ int conn_tls_start(xmpp_conn_t * const conn)
         if (tls_start(conn->tls)) {
             conn->secured = 1;
         } else {
-            rc = XMPP_EINT;
-            conn->error = tls_error(conn->tls);
+            /* TODO: distinguish invalid certificates and other errors */
+            rc = XMPP_ECERT;
             tls_free(conn->tls);
             conn->tls = NULL;
             conn->tls_failed = 1;
         }
     }
     if (rc != 0) {
-        xmpp_debug(conn->ctx, "conn", "Couldn't start TLS! "
-                   "error %d tls_error %d", rc, conn->error);
+        xmpp_debug(conn->ctx, "conn",
+                   "Couldn't start TLS! error %d tls_error %d", rc,
+                   conn->tls == NULL ? 0 : tls_error(conn->tls));
+        conn->error = rc;
     }
     return rc;
 }
@@ -915,7 +942,7 @@ int conn_tls_start(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-long xmpp_conn_get_flags(const xmpp_conn_t * const conn)
+long xmpp_conn_get_flags(const xmpp_conn_t *const conn)
 {
     long flags;
 
@@ -923,7 +950,8 @@ long xmpp_conn_get_flags(const xmpp_conn_t * const conn)
             XMPP_CONN_FLAG_MANDATORY_TLS * conn->tls_mandatory |
             XMPP_CONN_FLAG_LEGACY_SSL * conn->tls_legacy_ssl |
             XMPP_CONN_FLAG_TRUST_TLS * conn->tls_trust |
-            XMPP_CONN_FLAG_LEGACY_AUTH * conn->auth_legacy_enabled;;
+            XMPP_CONN_FLAG_LEGACY_AUTH * conn->auth_legacy_enabled;
+    ;
 
     return flags;
 }
@@ -950,11 +978,12 @@ long xmpp_conn_get_flags(const xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_conn_set_flags(xmpp_conn_t * const conn, long flags)
+int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags)
 {
     if (conn->state != XMPP_STATE_DISCONNECTED) {
-        xmpp_error(conn->ctx, "conn", "Flags can be set only "
-                                      "for disconnected connection");
+        xmpp_error(conn->ctx, "conn",
+                   "Flags can be set only "
+                   "for disconnected connection");
         return XMPP_EINVOP;
     }
     if (flags & XMPP_CONN_FLAG_DISABLE_TLS &&
@@ -984,7 +1013,7 @@ int xmpp_conn_set_flags(xmpp_conn_t * const conn, long flags)
  *
  *  @ingroup Connections
  */
-void xmpp_conn_disable_tls(xmpp_conn_t * const conn)
+void xmpp_conn_disable_tls(xmpp_conn_t *const conn)
 {
     long flags = xmpp_conn_get_flags(conn);
 
@@ -998,25 +1027,57 @@ void xmpp_conn_disable_tls(xmpp_conn_t * const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_conn_is_secured(xmpp_conn_t * const conn)
+int xmpp_conn_is_secured(xmpp_conn_t *const conn)
 {
-    return conn->secured && !conn->tls_failed && conn->tls != NULL ? 1 : 0;
+    return conn->secured && !conn->tls_failed && conn->tls != NULL;
+}
+
+/**
+ *  @return TRUE if connection is in connecting state and FALSE otherwise
+ *
+ *  @ingroup Connections
+ */
+int xmpp_conn_is_connecting(xmpp_conn_t *const conn)
+{
+    return conn->state == XMPP_STATE_CONNECTING;
+}
+
+/**
+ *  @return TRUE if connection is in connected state and FALSE otherwise
+ *
+ *  @ingroup Connections
+ */
+int xmpp_conn_is_connected(xmpp_conn_t *const conn)
+{
+    return conn->state == XMPP_STATE_CONNECTED;
+}
+
+/**
+ *  @return TRUE if connection is in disconnected state and FALSE otherwise
+ *
+ *  @ingroup Connections
+ */
+int xmpp_conn_is_disconnected(xmpp_conn_t *const conn)
+{
+    return conn->state == XMPP_STATE_DISCONNECTED;
 }
 
 /* timed handler for cleanup if normal disconnect procedure takes too long */
-static int _disconnect_cleanup(xmpp_conn_t * const conn,
-                               void * const userdata)
+static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata)
 {
-    xmpp_debug(conn->ctx, "xmpp",
-               "disconnection forced by cleanup timeout");
+    UNUSED(userdata);
 
+    xmpp_debug(conn->ctx, "xmpp", "disconnection forced by cleanup timeout");
+
+    conn->error = conn->error ?: XMPP_ETIMEDOUT;
     conn_disconnect(conn);
 
     return 0;
 }
 
-static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
-                                    char **attributes, size_t attributes_len)
+static char *_conn_build_stream_tag(xmpp_conn_t *const conn,
+                                    char **attributes,
+                                    size_t attributes_len)
 {
     char *tag;
     size_t len;
@@ -1032,7 +1093,8 @@ static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
     for (i = 0; i < attributes_len; ++i)
         len += strlen(attributes[i]) + 2;
     tag = xmpp_alloc(conn->ctx, len + 1);
-    if (!tag) return NULL;
+    if (!tag)
+        return NULL;
 
     strcpy(tag, tag_head);
     for (i = 0; i < attributes_len; ++i) {
@@ -1048,8 +1110,9 @@ static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
     strcat(tag, tag_tail);
 
     if (strlen(tag) != len) {
-        xmpp_error(conn->ctx, "xmpp", "Internal error in "
-                              "_conn_build_stream_tag().");
+        xmpp_error(conn->ctx, "xmpp",
+                   "Internal error in "
+                   "_conn_build_stream_tag().");
         xmpp_free(conn->ctx, tag);
         tag = NULL;
     }
@@ -1057,20 +1120,24 @@ static char *_conn_build_stream_tag(xmpp_conn_t * const conn,
     return tag;
 }
 
-static void _conn_attributes_new(xmpp_conn_t *conn, char **attrs,
-                                 char ***attributes, size_t *attributes_len)
+static void _conn_attributes_new(xmpp_conn_t *conn,
+                                 char **attrs,
+                                 char ***attributes,
+                                 size_t *attributes_len)
 {
     char **array = NULL;
     size_t nr = 0;
     size_t i;
 
     if (attrs) {
-        for (; attrs[nr]; ++nr);
+        for (; attrs[nr]; ++nr)
+            ;
         array = xmpp_alloc(conn->ctx, sizeof(*array) * nr);
         for (i = 0; array && i < nr; ++i) {
             array[i] = (i & 1) == 0 ? parser_attr_name(conn->ctx, attrs[i])
                                     : xmpp_strdup(conn->ctx, attrs[i]);
-            if (array[i] == NULL) break;
+            if (array[i] == NULL)
+                break;
         }
         if (!array || i < nr) {
             xmpp_error(conn->ctx, "xmpp", "Memory allocation error.");
@@ -1083,7 +1150,8 @@ static void _conn_attributes_new(xmpp_conn_t *conn, char **attrs,
     *attributes_len = nr;
 }
 
-static void _conn_attributes_destroy(xmpp_conn_t *conn, char **attributes,
+static void _conn_attributes_destroy(xmpp_conn_t *conn,
+                                     char **attributes,
                                      size_t attributes_len)
 {
     size_t i;
@@ -1114,23 +1182,24 @@ static char *_get_stream_attribute(char **attrs, char *name)
 {
     int i;
 
-    if (!attrs) return NULL;
+    if (!attrs)
+        return NULL;
 
     for (i = 0; attrs[i]; i += 2)
         if (strcmp(name, attrs[i]) == 0)
-            return attrs[i+1];
+            return attrs[i + 1];
 
     return NULL;
 }
 
-static void _handle_stream_start(char *name, char **attrs,
-                                 void * const userdata)
+static void _handle_stream_start(char *name, char **attrs, void *const userdata)
 {
     xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
     char *id;
-    int failed = 0;
+    int ret = 0;
 
-    if (conn->stream_id) xmpp_free(conn->ctx, conn->stream_id);
+    if (conn->stream_id)
+        xmpp_free(conn->ctx, conn->stream_id);
     conn->stream_id = NULL;
 
     if (strcmp(name, "stream") == 0) {
@@ -1141,34 +1210,37 @@ static void _handle_stream_start(char *name, char **attrs,
 
         if (id && !conn->stream_id) {
             xmpp_error(conn->ctx, "conn", "Memory allocation failed.");
-            failed = 1;
+            ret = XMPP_EMEM;
         }
     } else {
-        xmpp_error(conn->ctx, "conn", "Server did not open valid stream."
-                                      " name = %s.", name);
-        failed = 1;
+        xmpp_error(conn->ctx, "conn",
+                   "Server did not open valid stream."
+                   " name = %s.",
+                   name);
+        ret = XMPP_EINT;
     }
 
-    if (!failed) {
+    if (ret == 0) {
         /* call stream open handler */
         conn->open_handler(conn);
     } else {
+        conn->error = ret;
         conn_disconnect(conn);
     }
 }
 
-static void _handle_stream_end(char *name,
-                               void * const userdata)
+static void _handle_stream_end(char *name, void *const userdata)
 {
     xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
 
+    UNUSED(name);
+
     /* stream is over */
     xmpp_debug(conn->ctx, "xmpp", "RECV: </stream:stream>");
     conn_disconnect_clean(conn);
 }
 
-static void _handle_stream_stanza(xmpp_stanza_t *stanza,
-                                  void * const userdata)
+static void _handle_stream_stanza(xmpp_stanza_t *stanza, void *const userdata)
 {
     xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
     char *buf;
@@ -1182,13 +1254,13 @@ static void _handle_stream_stanza(xmpp_stanza_t *stanza,
     handler_fire_stanza(conn, stanza);
 }
 
-static unsigned short _conn_default_port(xmpp_conn_t * const conn,
+static unsigned short _conn_default_port(xmpp_conn_t *const conn,
                                          xmpp_conn_type_t type)
 {
     switch (type) {
     case XMPP_CLIENT:
-        return conn->tls_legacy_ssl ? XMPP_PORT_CLIENT_LEGACY_SSL :
-                                      XMPP_PORT_CLIENT;
+        return conn->tls_legacy_ssl ? XMPP_PORT_CLIENT_LEGACY_SSL
+                                    : XMPP_PORT_CLIENT;
     case XMPP_COMPONENT:
         return XMPP_PORT_COMPONENT;
     default:
@@ -1196,7 +1268,7 @@ static unsigned short _conn_default_port(xmpp_conn_t * const conn,
     };
 }
 
-static void _conn_reset(xmpp_conn_t * const conn)
+static void _conn_reset(xmpp_conn_t *const conn)
 {
     xmpp_ctx_t *ctx = conn->ctx;
     xmpp_send_queue_t *sq, *tsq;
@@ -1226,9 +1298,12 @@ static void _conn_reset(xmpp_conn_t * const conn)
         conn->stream_error = NULL;
     }
 
-    if (conn->domain) xmpp_free(ctx, conn->domain);
-    if (conn->bound_jid) xmpp_free(ctx, conn->bound_jid);
-    if (conn->stream_id) xmpp_free(ctx, conn->stream_id);
+    if (conn->domain)
+        xmpp_free(ctx, conn->domain);
+    if (conn->bound_jid)
+        xmpp_free(ctx, conn->bound_jid);
+    if (conn->stream_id)
+        xmpp_free(ctx, conn->stream_id);
     conn->domain = NULL;
     conn->bound_jid = NULL;
     conn->stream_id = NULL;
@@ -1244,31 +1319,35 @@ static void _conn_reset(xmpp_conn_t * const conn)
     handler_system_delete_all(conn);
 }
 
-static int _conn_connect(xmpp_conn_t * const conn,
-                         const char * const domain,
-                         const char * const host,
+static int _conn_connect(xmpp_conn_t *const conn,
+                         const char *const domain,
+                         const char *const host,
                          unsigned short port,
                          xmpp_conn_type_t type,
                          xmpp_conn_handler callback,
-                         void * const userdata)
+                         void *const userdata)
 {
     xmpp_open_handler open_handler;
 
-    if (conn->state != XMPP_STATE_DISCONNECTED) return XMPP_EINVOP;
-    if (type != XMPP_CLIENT && type != XMPP_COMPONENT) return XMPP_EINVOP;
-    if (host == NULL || port == 0) return XMPP_EINT;
+    if (conn->state != XMPP_STATE_DISCONNECTED)
+        return XMPP_EINVOP;
+    if (type != XMPP_CLIENT && type != XMPP_COMPONENT)
+        return XMPP_EINVOP;
+    if (host == NULL || port == 0)
+        return XMPP_EINT;
 
     _conn_reset(conn);
 
     conn->type = type;
     conn->domain = xmpp_strdup(conn->ctx, domain);
-    if (!conn->domain) return XMPP_EMEM;
+    if (!conn->domain)
+        return XMPP_EMEM;
 
-    conn->xsock = sock_new(conn->ctx, host, port);
-    conn->sock = sock_connect(conn->xsock);
-    xmpp_debug(conn->ctx, "xmpp", "sock_connect() to %s:%u returned %d",
-               host, port, conn->sock);
-    if (conn->sock == -1) return XMPP_EINT;
+    conn->sock = sock_connect(host, port);
+    xmpp_debug(conn->ctx, "xmpp", "sock_connect() to %s:%u returned %d", host,
+               port, conn->sock);
+    if (conn->sock == -1)
+        return XMPP_EINT;
     if (conn->ka_timeout || conn->ka_interval)
         sock_set_keepalive(conn->sock, conn->ka_timeout, conn->ka_interval);
 
@@ -1276,9 +1355,10 @@ static int _conn_connect(xmpp_conn_t * const conn,
     conn->conn_handler = callback;
     conn->userdata = userdata;
 
-    open_handler = conn->is_raw ? auth_handle_open_stub :
-                   type == XMPP_CLIENT ? auth_handle_open :
-                                         auth_handle_component_open;
+    open_handler = conn->is_raw
+                       ? auth_handle_open_stub
+                       : type == XMPP_CLIENT ? auth_handle_open
+                                             : auth_handle_component_open;
     conn_prepare_reset(conn, open_handler);
 
     /* FIXME: it could happen that the connect returns immediately as

src/crypto.c

@@ -20,13 +20,13 @@
  */
 
 #include <assert.h>
-#include <string.h>     /* memset, memcpy */
+#include <string.h> /* memset, memcpy */
 
-#include "common.h"     /* xmpp_alloc */
-#include "ostypes.h"    /* uint8_t, size_t */
+#include "common.h"  /* xmpp_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 "snprintf.h" /* xmpp_snprintf */
+#include "strophe.h"  /* xmpp_ctx_t, xmpp_free */
 
 struct _xmpp_sha1_t {
     xmpp_ctx_t *xmpp_ctx;
@@ -91,7 +91,8 @@ char *xmpp_sha1(xmpp_ctx_t *ctx, const unsigned char *data, size_t len)
  *
  *  @ingroup Digests
  */
-void xmpp_sha1_digest(const unsigned char *data, size_t len,
+void xmpp_sha1_digest(const unsigned char *data,
+                      size_t len,
                       unsigned char *digest)
 {
     crypto_SHA1((const uint8_t *)data, len, digest);
@@ -214,52 +215,44 @@ void xmpp_sha1_to_digest(xmpp_sha1_t *sha1, unsigned char *digest)
     memcpy(digest, sha1->digest, SHA1_DIGEST_SIZE);
 }
 
-
 /* Base64 encoding routines. Implemented according to RFC 3548. */
 
 /* map of all byte values to the base64 values, or to
    '65' which indicates an invalid character. '=' is '64' */
 static const unsigned char _base64_invcharmap[256] = {
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,62, 65,65,65,63,
-    52,53,54,55, 56,57,58,59, 60,61,65,65, 65,64,65,65,
-    65, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-    15,16,17,18, 19,20,21,22, 23,24,25,65, 65,65,65,65,
-    65,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-    41,42,43,44, 45,46,47,48, 49,50,51,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
-    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65
-};
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 62, 65, 65, 65, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+    61, 65, 65, 65, 64, 65, 65, 65, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10,
+    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 65, 65, 65, 65,
+    65, 65, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+    43, 44, 45, 46, 47, 48, 49, 50, 51, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65, 65, 65, 65, 65, 65, 65, 65, 65};
 
 /* map of all 6-bit values to their corresponding byte
    in the base64 alphabet. Padding char is the value '64' */
 static const char _base64_charmap[65] = {
-    'A','B','C','D', 'E','F','G','H',
-    'I','J','K','L', 'M','N','O','P',
-    'Q','R','S','T', 'U','V','W','X',
-    'Y','Z','a','b', 'c','d','e','f',
-    'g','h','i','j', 'k','l','m','n',
-    'o','p','q','r', 's','t','u','v',
-    'w','x','y','z', '0','1','2','3',
-    '4','5','6','7', '8','9','+','/',
-    '='
-};
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+    '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)
 {
     /* encoded steam is 4 bytes for every three, rounded up */
-    return ((len + 2)/3) << 2;
+    return ((len + 2) / 3) << 2;
 }
 
 static char *base64_encode(xmpp_ctx_t *ctx,
-                           const unsigned char * const buffer, const size_t len)
+                           const unsigned char *const buffer,
+                           const size_t len)
 {
     size_t clen;
     char *cbuf, *c;
@@ -272,7 +265,7 @@ static char *base64_encode(xmpp_ctx_t *ctx,
         c = cbuf;
         /* loop over data, turning every 3 bytes into 4 characters */
         for (i = 0; i + 2 < len; i += 3) {
-            word = buffer[i] << 16 | buffer[i+1] << 8 | buffer[i+2];
+            word = buffer[i] << 16 | buffer[i + 1] << 8 | buffer[i + 2];
             hextet = (word & 0x00FC0000) >> 18;
             *c++ = _base64_charmap[hextet];
             hextet = (word & 0x0003F000) >> 12;
@@ -284,26 +277,26 @@ static char *base64_encode(xmpp_ctx_t *ctx,
         }
         /* zero, one or two bytes left */
         switch (len - i) {
-            case 0:
-                break;
-            case 1:
-                hextet = (buffer[len-1] & 0xFC) >> 2;
-                *c++ = _base64_charmap[hextet];
-                hextet = (buffer[len-1] & 0x03) << 4;
-                *c++ = _base64_charmap[hextet];
-                *c++ = _base64_charmap[64]; /* pad */
-                *c++ = _base64_charmap[64]; /* pad */
-                break;
-            case 2:
-                hextet = (buffer[len-2] & 0xFC) >> 2;
-                *c++ = _base64_charmap[hextet];
-                hextet = ((buffer[len-2] & 0x03) << 4) |
-                         ((buffer[len-1] & 0xF0) >> 4);
-                *c++ = _base64_charmap[hextet];
-                hextet = (buffer[len-1] & 0x0F) << 2;
-                *c++ = _base64_charmap[hextet];
-                *c++ = _base64_charmap[64]; /* pad */
-                break;
+        case 0:
+            break;
+        case 1:
+            hextet = (buffer[len - 1] & 0xFC) >> 2;
+            *c++ = _base64_charmap[hextet];
+            hextet = (buffer[len - 1] & 0x03) << 4;
+            *c++ = _base64_charmap[hextet];
+            *c++ = _base64_charmap[64]; /* pad */
+            *c++ = _base64_charmap[64]; /* pad */
+            break;
+        case 2:
+            hextet = (buffer[len - 2] & 0xFC) >> 2;
+            *c++ = _base64_charmap[hextet];
+            hextet = ((buffer[len - 2] & 0x03) << 4) |
+                     ((buffer[len - 1] & 0xF0) >> 4);
+            *c++ = _base64_charmap[hextet];
+            hextet = (buffer[len - 1] & 0x0F) << 2;
+            *c++ = _base64_charmap[hextet];
+            *c++ = _base64_charmap[64]; /* pad */
+            break;
         }
         /* add a terminal null */
         *c = '\0';
@@ -311,30 +304,37 @@ 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 *const buffer, const size_t len)
 {
     size_t nudge = 0;
     unsigned char c;
     size_t i;
 
-    if (len < 4) return 0;
+    if (len < 4)
+        return 0;
 
     /* count the padding characters for the remainder */
     for (i = len; i > 0; --i) {
-        c = _base64_invcharmap[(unsigned char)buffer[i-1]];
-        if (c < 64) break;
-        if (c == 64) ++nudge;
-        if (c > 64) return 0;
+        c = _base64_invcharmap[(unsigned char)buffer[i - 1]];
+        if (c < 64)
+            break;
+        if (c == 64)
+            ++nudge;
+        if (c > 64)
+            return 0;
     }
-    if (nudge > 2) return 0;
+    if (nudge > 2)
+        return 0;
 
     /* decoded steam is 3 bytes for every four */
     return 3 * (len >> 2) - nudge;
 }
 
 static void base64_decode(xmpp_ctx_t *ctx,
-                          const char * const buffer, const size_t len,
-                          unsigned char **out, size_t *outlen)
+                          const char *const buffer,
+                          const size_t len,
+                          unsigned char **out,
+                          size_t *outlen)
 {
     size_t dlen;
     unsigned char *dbuf, *d;
@@ -342,10 +342,12 @@ static void base64_decode(xmpp_ctx_t *ctx,
     size_t i;
 
     /* len must be a multiple of 4 */
-    if (len & 0x03) goto _base64_error;
+    if (len & 0x03)
+        goto _base64_error;
 
     dlen = base64_decoded_len(buffer, len);
-    if (dlen == 0) goto _base64_error;
+    if (dlen == 0)
+        goto _base64_error;
 
     dbuf = xmpp_alloc(ctx, dlen + 1);
     if (dbuf != NULL) {
@@ -353,57 +355,70 @@ static void base64_decode(xmpp_ctx_t *ctx,
         /* loop over each set of 4 characters, decoding 3 bytes */
         for (i = 0; i + 3 < len; i += 4) {
             hextet = _base64_invcharmap[(unsigned char)buffer[i]];
-            if (hextet & 0xC0) break;
+            if (hextet & 0xC0)
+                break;
             word = hextet << 18;
-            hextet = _base64_invcharmap[(unsigned char)buffer[i+1]];
-            if (hextet & 0xC0) break;
+            hextet = _base64_invcharmap[(unsigned char)buffer[i + 1]];
+            if (hextet & 0xC0)
+                break;
             word |= hextet << 12;
-            hextet = _base64_invcharmap[(unsigned char)buffer[i+2]];
-            if (hextet & 0xC0) break;
+            hextet = _base64_invcharmap[(unsigned char)buffer[i + 2]];
+            if (hextet & 0xC0)
+                break;
             word |= hextet << 6;
-            hextet = _base64_invcharmap[(unsigned char)buffer[i+3]];
-            if (hextet & 0xC0) break;
+            hextet = _base64_invcharmap[(unsigned char)buffer[i + 3]];
+            if (hextet & 0xC0)
+                break;
             word |= hextet;
             *d++ = (word & 0x00FF0000) >> 16;
             *d++ = (word & 0x0000FF00) >> 8;
             *d++ = (word & 0x000000FF);
         }
-        if (hextet > 64) goto _base64_decode_error;
+        if (hextet > 64)
+            goto _base64_decode_error;
         /* handle the remainder */
         switch (dlen % 3) {
-            case 0:
-                /* nothing to do */
-                break;
-            case 1:
-                /* redo the last quartet, checking for correctness */
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-4]];
-                if (hextet & 0xC0) goto _base64_decode_error;
-                word = hextet << 2;
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-3]];
-                if (hextet & 0xC0) goto _base64_decode_error;
-                word |= hextet >> 4;
-                *d++ = word & 0xFF;
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-2]];
-                if (hextet != 64) goto _base64_decode_error;
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-1]];
-                if (hextet != 64) goto _base64_decode_error;
-                break;
-            case 2:
-                /* redo the last quartet, checking for correctness */
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-4]];
-                if (hextet & 0xC0) goto _base64_decode_error;
-                word = hextet << 10;
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-3]];
-                if (hextet & 0xC0) goto _base64_decode_error;
-                word |= hextet << 4;
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-2]];
-                if (hextet & 0xC0) goto _base64_decode_error;
-                word |= hextet >> 2;
-                *d++ = (word & 0xFF00) >> 8;
-                *d++ = (word & 0x00FF);
-                hextet = _base64_invcharmap[(unsigned char)buffer[len-1]];
-                if (hextet != 64) goto _base64_decode_error;
-                break;
+        case 0:
+            /* nothing to do */
+            break;
+        case 1:
+            /* redo the last quartet, checking for correctness */
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 4]];
+            if (hextet & 0xC0)
+                goto _base64_decode_error;
+            word = hextet << 2;
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 3]];
+            if (hextet & 0xC0)
+                goto _base64_decode_error;
+            word |= hextet >> 4;
+            *d++ = word & 0xFF;
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 2]];
+            if (hextet != 64)
+                goto _base64_decode_error;
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 1]];
+            if (hextet != 64)
+                goto _base64_decode_error;
+            break;
+        case 2:
+            /* redo the last quartet, checking for correctness */
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 4]];
+            if (hextet & 0xC0)
+                goto _base64_decode_error;
+            word = hextet << 10;
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 3]];
+            if (hextet & 0xC0)
+                goto _base64_decode_error;
+            word |= hextet << 4;
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 2]];
+            if (hextet & 0xC0)
+                goto _base64_decode_error;
+            word |= hextet >> 2;
+            *d++ = (word & 0xFF00) >> 8;
+            *d++ = (word & 0x00FF);
+            hextet = _base64_invcharmap[(unsigned char)buffer[len - 1]];
+            if (hextet != 64)
+                goto _base64_decode_error;
+            break;
         }
         *d = '\0';
     }
@@ -484,8 +499,11 @@ char *xmpp_base64_decode_str(xmpp_ctx_t *ctx, const char *base64, size_t len)
  *
  *  @ingroup Encodings
  */
-void xmpp_base64_decode_bin(xmpp_ctx_t *ctx, const char *base64, size_t len,
-                            unsigned char **out, size_t *outlen)
+void xmpp_base64_decode_bin(xmpp_ctx_t *ctx,
+                            const char *base64,
+                            size_t len,
+                            unsigned char **out,
+                            size_t *outlen)
 {
     base64_decode(ctx, base64, len, out, outlen);
 }

src/ctx.c

@@ -50,9 +50,10 @@
 #include "resolver.h"
 #include "util.h"
 
-/* Workaround for visual studio without va_copy support. */
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define va_copy(d,s) ((d) = (s))
+/* 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)))
 #endif
 
 /** Initialize the Strophe library.
@@ -61,7 +62,7 @@
  *
  *  @ingroup Init
  */
- void xmpp_initialize(void)
+void xmpp_initialize(void)
 {
     sock_initialize();
     resolver_initialize();
@@ -113,44 +114,42 @@ void xmpp_shutdown(void)
  */
 int xmpp_version_check(int major, int minor)
 {
-    return (major == LIBXMPP_VERSION_MAJOR) &&
-           (minor >= LIBXMPP_VERSION_MINOR);
+    return (major == LIBXMPP_VERSION_MAJOR) && (minor >= LIBXMPP_VERSION_MINOR);
 }
 
 /* We define the global default allocator, logger, and context here. */
 
 /* Wrap stdlib routines malloc, free, and realloc for default memory
- * management. 
+ * management.
  */
-static void *_malloc(const size_t size, void * const userdata)
+static void *_malloc(const size_t size, void *const userdata)
 {
+    UNUSED(userdata);
     return malloc(size);
 }
 
-static void _free(void *p, void * const userdata)
+static void _free(void *p, void *const userdata)
 {
+    UNUSED(userdata);
     free(p);
 }
 
-static void *_realloc(void *p, const size_t size, void * const userdata)
+static void *_realloc(void *p, const size_t size, void *const userdata)
 {
+    UNUSED(userdata);
     return realloc(p, size);
 }
 
 /* default memory function map */
 static xmpp_mem_t xmpp_default_mem = {
     _malloc, /* use the thinly wrapped stdlib routines by default */
-    _free,
-    _realloc,
-    NULL
-};
+    _free, _realloc, NULL};
 
 /* log levels and names */
-static const char * const _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};
+static const char *const _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};
 
 /** Log a message.
  *  The default logger writes to stderr.
@@ -161,22 +160,25 @@ static const xmpp_log_level_t _xmpp_default_logger_levels[] = {XMPP_LEVEL_DEBUG,
  *  @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 *const userdata,
+                                const xmpp_log_level_t level,
+                                const char *const area,
+                                const char *const msg)
 {
-    xmpp_log_level_t filter_level = * (xmpp_log_level_t*)userdata;
+    xmpp_log_level_t filter_level = *(xmpp_log_level_t *)userdata;
     if (level >= filter_level)
         fprintf(stderr, "%s %s %s\n", area, _xmpp_log_level_name[level], msg);
 }
 
 static const xmpp_log_t _xmpp_default_loggers[] = {
-        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_DEBUG]},
-        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_INFO]},
-        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_WARN]},
-        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_ERROR]}
-};
+    {&xmpp_default_logger,
+     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_DEBUG]},
+    {&xmpp_default_logger,
+     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_INFO]},
+    {&xmpp_default_logger,
+     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_WARN]},
+    {&xmpp_default_logger,
+     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_ERROR]}};
 
 /** Get a default logger with filtering.
  *  The default logger provides a basic logging setup which writes log
@@ -192,12 +194,13 @@ static const xmpp_log_t _xmpp_default_loggers[] = {
 xmpp_log_t *xmpp_get_default_logger(xmpp_log_level_t level)
 {
     /* clamp to the known range */
-    if (level > XMPP_LEVEL_ERROR) level = XMPP_LEVEL_ERROR;
+    if (level > XMPP_LEVEL_ERROR)
+        level = XMPP_LEVEL_ERROR;
 
-    return (xmpp_log_t*)&_xmpp_default_loggers[level];
+    return (xmpp_log_t *)&_xmpp_default_loggers[level];
 }
 
-static xmpp_log_t xmpp_default_log = { NULL, NULL };
+static xmpp_log_t xmpp_default_log = {NULL, NULL};
 
 /* convenience functions for accessing the context */
 
@@ -209,7 +212,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 *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
 {
     return ctx->mem->alloc(size, ctx->mem->userdata);
 }
@@ -220,7 +223,7 @@ 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 xmpp_free(const xmpp_ctx_t *const ctx, void *p)
 {
     ctx->mem->free(p, ctx->mem->userdata);
 }
@@ -234,8 +237,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 *xmpp_realloc(const xmpp_ctx_t *const ctx, void *p, const size_t size)
 {
     return ctx->mem->realloc(p, size, ctx->mem->userdata);
 }
@@ -253,10 +255,10 @@ void *xmpp_realloc(const xmpp_ctx_t * const ctx, void *p,
  *  @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,
+void xmpp_log(const xmpp_ctx_t *const ctx,
               const xmpp_log_level_t level,
-              const char * const area,
-              const char * const fmt,
+              const char *const area,
+              const char *const fmt,
               va_list ap)
 {
     int oldret, ret;
@@ -304,9 +306,9 @@ 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 xmpp_error(const xmpp_ctx_t *const ctx,
+                const char *const area,
+                const char *const fmt,
                 ...)
 {
     va_list ap;
@@ -326,10 +328,10 @@ 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 xmpp_warn(const xmpp_ctx_t *const ctx,
+               const char *const area,
+               const char *const fmt,
+               ...)
 {
     va_list ap;
 
@@ -348,10 +350,10 @@ 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 xmpp_info(const xmpp_ctx_t *const ctx,
+               const char *const area,
+               const char *const fmt,
+               ...)
 {
     va_list ap;
 
@@ -370,9 +372,9 @@ 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 xmpp_debug(const xmpp_ctx_t *const ctx,
+                const char *const area,
+                const char *const fmt,
                 ...)
 {
     va_list ap;
@@ -396,8 +398,8 @@ 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 *const mem,
+                         const xmpp_log_t *const log)
 {
     xmpp_ctx_t *ctx = NULL;
 
@@ -418,6 +420,7 @@ xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t * const mem,
             ctx->log = log;
 
         ctx->connlist = NULL;
+        ctx->timed_handlers = NULL;
         ctx->loop_status = XMPP_LOOP_NOTSTARTED;
         ctx->rand = xmpp_rand_new(ctx);
         ctx->timeout = EVENT_LOOP_DEFAULT_TIMEOUT;
@@ -436,7 +439,7 @@ 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 *const ctx)
 {
     /* mem and log are owned by their suppliers */
     xmpp_rand_free(ctx, ctx->rand);
@@ -450,7 +453,7 @@ void xmpp_ctx_free(xmpp_ctx_t * const ctx)
  *
  *  @ingroup Context
  */
-void xmpp_ctx_set_timeout(xmpp_ctx_t * const ctx, const unsigned long timeout)
+void xmpp_ctx_set_timeout(xmpp_ctx_t *const ctx, const unsigned long timeout)
 {
     ctx->timeout = timeout;
 }

src/event.c

@@ -1,7 +1,7 @@
 /* event.c
 ** strophe XMPP client library -- event loop and management
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -38,30 +38,18 @@
 #include <sys/select.h>
 #include <errno.h>
 #include <unistd.h>
-#define _sleep(x) usleep((x) * 1000)
+#define _sleep(x) usleep((x)*1000)
 #else
 #include <winsock2.h>
-#define ETIMEDOUT WSAETIMEDOUT
-#define ECONNRESET WSAECONNRESET
-#define ECONNABORTED WSAECONNABORTED
 #define _sleep(x) Sleep(x)
 #endif
 
-#include <strophe.h>
+#include "strophe.h"
 #include "common.h"
 #include "parser.h"
 
-static int _connect_next(xmpp_conn_t *conn)
-{
-    sock_close(conn->sock);
-    conn->sock = sock_connect(conn->xsock);
-    if (conn->sock < 0)
-        return -1;
-
-    conn->timeout_stamp = time_stamp();
-
-    return 0;
-}
+/** Max buffer size for receiving messages. */
+#define STROPE_MESSAGE_BUFFER_SIZE 4096
 
 /** Run the event loop once.
  *  This function will run send any data that has been queued by
@@ -86,12 +74,13 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     struct timeval tv;
     xmpp_send_queue_t *sq, *tsq;
     int towrite;
-    char buf[4096];
+    char buf[STROPE_MESSAGE_BUFFER_SIZE];
     uint64_t next;
     uint64_t usec;
     int tls_read_bytes = 0;
 
-    if (ctx->loop_status == XMPP_LOOP_QUIT) return;
+    if (ctx->loop_status == XMPP_LOOP_QUIT)
+        return;
 
     /* send queued data */
     connitem = ctx->connlist;
@@ -109,25 +98,23 @@ 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.");
-                conn->error = ECONNABORTED;
-                conn_disconnect(conn);
+                conn->error = XMPP_EIO;
             }
         }
 
         /* write all data from the send queue to the socket */
         sq = conn->send_queue_head;
-        while (sq) {
+        while (!conn->error && sq) {
             towrite = sq->len - sq->written;
 
             if (conn->tls) {
                 ret = tls_write(conn->tls, &sq->data[sq->written], towrite);
                 if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls)))
-                    conn->error = tls_error(conn->tls);
+                    conn->error = XMPP_EIO;
             } else {
                 ret = sock_write(conn->sock, &sq->data[sq->written], towrite);
                 if (ret < 0 && !sock_is_recoverable(sock_error()))
-                    conn->error = sock_error();
+                    conn->error = XMPP_EIO;
             }
             if (ret > 0 && ret < towrite)
                 sq->written += ret; /* not all data could be sent now */
@@ -144,7 +131,8 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
             /* pop the top item */
             conn->send_queue_head = sq;
             /* if we've sent everything update the tail */
-            if (!sq) conn->send_queue_tail = NULL;
+            if (!sq)
+                conn->send_queue_tail = NULL;
         }
 
         /* tear down connection on error */
@@ -152,7 +140,6 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
             /* FIXME: need to tear down send queues and random other things
              * maybe this should be abstracted */
             xmpp_debug(ctx, "xmpp", "Send error occurred, disconnecting.");
-            conn->error = ECONNABORTED;
             conn_disconnect(conn);
         }
 
@@ -165,7 +152,6 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
             conn_parser_reset(connitem->conn);
     }
 
-
     /* fire any ready timed handlers, then make sure we don't wait past
        the time when timed handlers need to be called */
     next = handler_fire_timed(ctx);
@@ -192,13 +178,8 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
                 conn->connect_timeout)
                 FD_SET(conn->sock, &wfds);
             else {
-                ret = _connect_next(conn);
-                if (ret == 0) {
-                    FD_SET(conn->sock, &wfds);
-                    break;
-                }
-                conn->error = ETIMEDOUT;
                 xmpp_info(ctx, "xmpp", "Connection attempt timed out.");
+                conn->error = XMPP_ETIMEDOUT;
                 conn_disconnect(conn);
             }
             break;
@@ -225,7 +206,7 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
     /* check for events */
     if (max > 0)
-        ret = select(max + 1, &rfds,  &wfds, NULL, &tv);
+        ret = select(max + 1, &rfds, &wfds, NULL, &tv);
     else {
         if (timeout > 0)
             _sleep(timeout);
@@ -241,7 +222,8 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     }
 
     /* no events happened */
-    if (ret == 0 && tls_read_bytes == 0) return;
+    if (ret == 0 && tls_read_bytes == 0)
+        return;
 
     /* process events */
     connitem = ctx->connlist;
@@ -255,14 +237,10 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
                 /* check for error */
                 ret = sock_connect_error(conn->sock);
-                if (ret != 0) {
-                    ret = _connect_next(conn);
-                    if (ret == 0)
-                        break;
-                }
                 if (ret != 0) {
                     /* connection failed */
                     xmpp_debug(ctx, "xmpp", "connection failed, error %d", ret);
+                    conn->error = XMPP_EIO;
                     conn_disconnect(conn);
                     break;
                 }
@@ -274,30 +252,36 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
             break;
         case XMPP_STATE_CONNECTED:
-            if (FD_ISSET(conn->sock, &rfds) || (conn->tls && tls_pending(conn->tls))) {
+            if (FD_ISSET(conn->sock, &rfds) ||
+                (conn->tls && tls_pending(conn->tls))) {
                 if (conn->tls) {
-                    ret = tls_read(conn->tls, buf, 4096);
+                    ret = tls_read(conn->tls, buf, STROPE_MESSAGE_BUFFER_SIZE);
                 } else {
-                    ret = sock_read(conn->sock, buf, 4096);
+                    ret =
+                        sock_read(conn->sock, buf, STROPE_MESSAGE_BUFFER_SIZE);
                 }
 
                 if (ret > 0) {
                     ret = parser_feed(conn->parser, buf, ret);
                     if (!ret) {
                         xmpp_debug(ctx, "xmpp", "parse error [%s]", buf);
-                        xmpp_send_error(conn, XMPP_SE_INVALID_XML, "parse error");
+                        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));
-                            conn->error = tls_error(conn->tls);
+                            xmpp_debug(ctx, "xmpp",
+                                       "Unrecoverable TLS error, %d.",
+                                       tls_error(conn->tls));
+                            conn->error = XMPP_EIO;
                             conn_disconnect(conn);
                         }
                     } else {
                         /* return of 0 means socket closed by server */
-                        xmpp_debug(ctx, "xmpp", "Socket closed by remote host.");
-                        conn->error = ECONNRESET;
+                        xmpp_debug(ctx, "xmpp",
+                                   "Socket closed by remote host.");
+                        conn->error = ret == 0 ? XMPP_ERESET : XMPP_EIO;
                         conn_disconnect(conn);
                     }
                 }
@@ -327,7 +311,8 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
  */
 void xmpp_run(xmpp_ctx_t *ctx)
 {
-    if (ctx->loop_status != XMPP_LOOP_NOTSTARTED) return;
+    if (ctx->loop_status != XMPP_LOOP_NOTSTARTED)
+        return;
 
     ctx->loop_status = XMPP_LOOP_RUNNING;
     while (ctx->loop_status == XMPP_LOOP_RUNNING) {

src/handler.c

@@ -24,6 +24,8 @@
 #include "common.h"
 #include "ostypes.h"
 
+typedef int (*xmpp_void_handler)();
+
 /* Remove item from the list pointed by head, but don't free it.
  * There can be a situation when user's handler deletes another handler which
  * is the previous in the list. handler_fire_stanza() and handler_fire_timed()
@@ -33,19 +35,14 @@
  * TODO Convert handler lists to double-linked lists. Current implementation
  * works for O(n).
  */
-static void _handler_item_remove(xmpp_handlist_t **head,
-                                 xmpp_handlist_t *item)
+static void _handler_item_remove(xmpp_handlist_t **head, xmpp_handlist_t *item)
 {
-    xmpp_handlist_t *i = *head;
-
-    if (i == item)
-        *head = item->next;
-    else if (i != NULL) {
-        while (i->next != NULL && i->next != item)
-            i = i->next;
-        if (i->next == item) {
-            i->next = item->next;
+    while (*head) {
+        if (*head == item) {
+            *head = item->next;
+            break;
         }
+        head = &(*head)->next;
     }
 }
 
@@ -56,8 +53,7 @@ static void _handler_item_remove(xmpp_handlist_t **head,
  *  @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 *const conn, xmpp_stanza_t *const stanza)
 {
     xmpp_handlist_t *item, *next, *head, *head_old;
     const char *id, *ns, *name, *type;
@@ -75,7 +71,8 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
         while (item) {
             /* don't fire user handlers until authentication succeeds and
                and skip newly added handlers */
-            if ((item->user_handler && !conn->authenticated) || !item->enabled) {
+            if ((item->user_handler && !conn->authenticated) ||
+                !item->enabled) {
                 item = item->next;
                 continue;
             }
@@ -90,7 +87,7 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
                     /* replace old value */
                     hash_add(conn->id_handlers, id, head);
                 }
-                xmpp_free(conn->ctx, item->id);
+                xmpp_free(conn->ctx, item->u.id);
                 xmpp_free(conn->ctx, item);
             }
             item = next;
@@ -116,10 +113,10 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
         }
 
         next = item->next;
-        if ((!item->ns || (ns && strcmp(ns, item->ns) == 0) ||
-             xmpp_stanza_get_child_by_ns(stanza, item->ns)) &&
-            (!item->name || (name && strcmp(name, item->name) == 0)) &&
-            (!item->type || (type && strcmp(type, item->type) == 0))) {
+        if ((!item->u.ns || (ns && strcmp(ns, item->u.ns) == 0) ||
+             xmpp_stanza_get_child_by_ns(stanza, item->u.ns)) &&
+            (!item->u.name || (name && strcmp(name, item->u.name) == 0)) &&
+            (!item->u.type || (type && strcmp(type, item->u.type) == 0))) {
 
             ret = ((xmpp_handler)(item->handler))(conn, stanza, item->userdata);
             /* list may be changed during execution of a handler */
@@ -127,9 +124,12 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
             if (!ret) {
                 /* handler is one-shot, so delete it */
                 _handler_item_remove(&conn->handlers, item);
-                if (item->ns) xmpp_free(conn->ctx, item->ns);
-                if (item->name) xmpp_free(conn->ctx, item->name);
-                if (item->type) xmpp_free(conn->ctx, item->type);
+                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);
             }
         }
@@ -144,7 +144,7 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
  *
  *  @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 *const ctx)
 {
     xmpp_connlist_t *connitem;
     xmpp_handlist_t *item, *next;
@@ -171,27 +171,28 @@ uint64_t handler_fire_timed(xmpp_ctx_t * const ctx)
         while (item) {
             /* don't fire user handlers until authentication succeeds and
                skip newly added handlers */
-            if ((item->user_handler && !conn->authenticated) || !item->enabled) {
+            if ((item->user_handler && !conn->authenticated) ||
+                !item->enabled) {
                 item = item->next;
                 continue;
             }
 
             next = item->next;
             timestamp = time_stamp();
-            elapsed = time_elapsed(item->last_stamp, timestamp);
-            if (elapsed >= item->period) {
+            elapsed = time_elapsed(item->u.last_stamp, timestamp);
+            if (elapsed >= item->u.period) {
                 /* fire! */
-                item->last_stamp = timestamp;
+                item->u.last_stamp = timestamp;
                 ret = ((xmpp_timed_handler)item->handler)(conn, item->userdata);
                 /* list may be changed during execution of a handler */
                 next = item->next;
                 if (!ret) {
                     /* delete handler if it returned false */
                     _handler_item_remove(&conn->timed_handlers, item);
-                    xmpp_free(conn->ctx, item);
+                    xmpp_free(ctx, item);
                 }
-            } else if (min > (item->period - elapsed))
-                min = item->period - elapsed;
+            } else if (min > (item->u.period - elapsed))
+                min = item->u.period - elapsed;
 
             item = next;
         }
@@ -199,6 +200,34 @@ uint64_t handler_fire_timed(xmpp_ctx_t * const ctx)
         connitem = connitem->next;
     }
 
+    /*
+     * Check timed handlers in context. These handlers fire periodically
+     * regardless of connections state.
+     * TODO Reduce copy-paste.
+     */
+    item = ctx->timed_handlers;
+    while (item) {
+        next = item->next;
+        timestamp = time_stamp();
+        elapsed = time_elapsed(item->u.last_stamp, timestamp);
+        if (elapsed >= item->u.period) {
+            /* fire! */
+            item->u.last_stamp = timestamp;
+            ret =
+                ((xmpp_global_timed_handler)item->handler)(ctx, item->userdata);
+            /* list may be changed during execution of a handler */
+            next = item->next;
+            if (!ret) {
+                /* delete handler if it returned false */
+                _handler_item_remove(&ctx->timed_handlers, item);
+                xmpp_free(ctx, item);
+            }
+        } else if (min > (item->u.period - elapsed))
+            min = item->u.period - elapsed;
+
+        item = next;
+    }
+
     return min;
 }
 
@@ -215,50 +244,63 @@ void handler_reset_timed(xmpp_conn_t *conn, int user_only)
     handitem = conn->timed_handlers;
     while (handitem) {
         if ((user_only && handitem->user_handler) || !user_only)
-            handitem->last_stamp = time_stamp();
+            handitem->u.last_stamp = time_stamp();
 
         handitem = handitem->next;
     }
 }
 
-static void _timed_handler_add(xmpp_conn_t * const conn,
-                               xmpp_timed_handler handler,
+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,
+                               void *const userdata,
                                const int user_handler)
 {
-    xmpp_handlist_t *item, *tail;
+    xmpp_handlist_t *item;
 
     /* check if handler is already in the list */
-    for (item = conn->timed_handlers; item; item = item->next) {
+    for (item = *handlers_list; item; item = item->next) {
         if (item->handler == handler && item->userdata == userdata) {
-            xmpp_warn(conn->ctx, "xmpp", "Timed handler already exists.");
+            xmpp_warn(ctx, "xmpp", "Timed handler already exists.");
             break;
         }
     }
-    if (item) return;
+    if (item)
+        return;
 
     /* build new item */
-    item = xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item) return;
+    item = xmpp_alloc(ctx, sizeof(xmpp_handlist_t));
+    if (!item)
+        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
     item->userdata = userdata;
     item->enabled = 0;
-    item->next = NULL;
 
-    item->period = period;
-    item->last_stamp = time_stamp();
+    item->u.period = period;
+    item->u.last_stamp = time_stamp();
 
     /* append item to list */
-    if (!conn->timed_handlers)
-        conn->timed_handlers = item;
-    else {
-        tail = conn->timed_handlers;
-        while (tail->next)
-            tail = tail->next;
-        tail->next = item;
+    item->next = *handlers_list;
+    *handlers_list = item;
+}
+
+static void _timed_handler_delete(xmpp_ctx_t *ctx,
+                                  xmpp_handlist_t **handlers_list,
+                                  xmpp_void_handler handler)
+{
+    xmpp_handlist_t *item;
+
+    while (*handlers_list) {
+        item = *handlers_list;
+        if (item->handler == handler) {
+            *handlers_list = item->next;
+            xmpp_free(ctx, item);
+        } else {
+            handlers_list = &item->next;
+        }
     }
 }
 
@@ -269,35 +311,17 @@ static void _timed_handler_add(xmpp_conn_t * const conn,
  *
  *  @ingroup Handlers
  */
-void xmpp_timed_handler_delete(xmpp_conn_t * const conn,
+void xmpp_timed_handler_delete(xmpp_conn_t *const conn,
                                xmpp_timed_handler handler)
 {
-    xmpp_handlist_t *item, *prev;
-
-    if (!conn->timed_handlers) return;
-
-    prev = NULL;
-    item = conn->timed_handlers;
-    while (item) {
-        if (item->handler == handler) {
-            if (prev)
-                prev->next = item->next;
-            else
-                conn->timed_handlers = item->next;
-
-            xmpp_free(conn->ctx, item);
-            item = prev ? prev->next : conn->timed_handlers;
-        } else {
-            prev = item;
-            item = item->next;
-        }
-    }
+    _timed_handler_delete(conn->ctx, &conn->timed_handlers, handler);
 }
 
-static void _id_handler_add(xmpp_conn_t * const conn,
-                         xmpp_handler handler,
-                         const char * const id,
-                         void * const userdata, int user_handler)
+static void _id_handler_add(xmpp_conn_t *const conn,
+                            xmpp_handler handler,
+                            const char *const id,
+                            void *const userdata,
+                            int user_handler)
 {
     xmpp_handlist_t *item, *tail;
 
@@ -310,11 +334,13 @@ static void _id_handler_add(xmpp_conn_t * const conn,
         }
         item = item->next;
     }
-    if (item) return;
+    if (item)
+        return;
 
     /* build new item */
     item = xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item) return;
+    if (!item)
+        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
@@ -322,8 +348,8 @@ static void _id_handler_add(xmpp_conn_t * const conn,
     item->enabled = 0;
     item->next = NULL;
 
-    item->id = xmpp_strdup(conn->ctx, id);
-    if (!item->id) {
+    item->u.id = xmpp_strdup(conn->ctx, id);
+    if (!item->u.id) {
         xmpp_free(conn->ctx, item);
         return;
     }
@@ -347,15 +373,16 @@ 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 *const conn,
                             xmpp_handler handler,
-                            const char * const id)
+                            const char *const id)
 {
     xmpp_handlist_t *item, *prev, *next;
 
     prev = NULL;
     item = (xmpp_handlist_t *)hash_get(conn->id_handlers, id);
-    if (!item) return;
+    if (!item)
+        return;
 
     while (item) {
         next = item->next;
@@ -368,7 +395,7 @@ void xmpp_id_handler_delete(xmpp_conn_t * const conn,
                 hash_add(conn->id_handlers, id, next);
             }
 
-            xmpp_free(conn->ctx, item->id);
+            xmpp_free(conn->ctx, item->u.id);
             xmpp_free(conn->ctx, item);
             item = next;
         } else {
@@ -379,12 +406,13 @@ void xmpp_id_handler_delete(xmpp_conn_t * const conn,
 }
 
 /* add a stanza handler */
-static void _handler_add(xmpp_conn_t * const conn,
+static void _handler_add(xmpp_conn_t *const conn,
                          xmpp_handler handler,
-                         const char * const ns,
-                         const char * const name,
-                         const char * const type,
-                         void * const userdata, int user_handler)
+                         const char *const ns,
+                         const char *const name,
+                         const char *const type,
+                         void *const userdata,
+                         int user_handler)
 {
     xmpp_handlist_t *item, *tail;
 
@@ -397,11 +425,13 @@ static void _handler_add(xmpp_conn_t * const conn,
             break;
         }
     }
-    if (item) return;
+    if (item)
+        return;
 
     /* build new item */
     item = (xmpp_handlist_t *)xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item) return;
+    if (!item)
+        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
@@ -410,31 +440,36 @@ static void _handler_add(xmpp_conn_t * const conn,
     item->next = NULL;
 
     if (ns) {
-        item->ns = xmpp_strdup(conn->ctx, ns);
-        if (!item->ns) {
+        item->u.ns = xmpp_strdup(conn->ctx, ns);
+        if (!item->u.ns) {
             xmpp_free(conn->ctx, item);
             return;
         }
     } else
-        item->ns = NULL;
+        item->u.ns = NULL;
+
     if (name) {
-        item->name = xmpp_strdup(conn->ctx, name);
-        if (!item->name) {
-            if (item->ns) xmpp_free(conn->ctx, item->ns);
+        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->name = NULL;
+        item->u.name = NULL;
+
     if (type) {
-        item->type = xmpp_strdup(conn->ctx, type);
-        if (!item->type) {
-            if (item->ns) xmpp_free(conn->ctx, item->ns);
-            if (item->name) xmpp_free(conn->ctx, item->name);
+        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->type = NULL;
+        item->u.type = NULL;
 
     /* append to list */
     if (!conn->handlers)
@@ -454,12 +489,12 @@ 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 *const conn, xmpp_handler handler)
 {
     xmpp_handlist_t *prev, *item;
 
-    if (!conn->handlers) return;
+    if (!conn->handlers)
+        return;
 
     prev = NULL;
     item = conn->handlers;
@@ -470,9 +505,12 @@ void xmpp_handler_delete(xmpp_conn_t * const conn,
             else
                 conn->handlers = item->next;
 
-            if (item->ns) xmpp_free(conn->ctx, item->ns);
-            if (item->name) xmpp_free(conn->ctx, item->name);
-            if (item->type) xmpp_free(conn->ctx, item->type);
+            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);
             item = prev ? prev->next : conn->handlers;
         } else {
@@ -498,12 +536,13 @@ void xmpp_handler_delete(xmpp_conn_t * const conn,
  *
  *  @ingroup Handlers
  */
-void xmpp_timed_handler_add(xmpp_conn_t * const conn,
+void xmpp_timed_handler_add(xmpp_conn_t *const conn,
                             xmpp_timed_handler handler,
                             const unsigned long period,
-                            void * const userdata)
+                            void *const userdata)
 {
-    _timed_handler_add(conn, handler, period, userdata, 1);
+    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
+                       userdata, 1);
 }
 
 /** Add a timed system handler.
@@ -515,12 +554,13 @@ 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 *const conn,
                        xmpp_timed_handler handler,
                        const unsigned long period,
-                       void * const userdata)
+                       void *const userdata)
 {
-    _timed_handler_add(conn, handler, period, userdata, 0);
+    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
+                       userdata, 0);
 }
 
 /** Add an id based stanza handler.
@@ -539,10 +579,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 *const conn,
                          xmpp_handler handler,
-                         const char * const id,
-                         void * const userdata)
+                         const char *const id,
+                         void *const userdata)
 {
     _id_handler_add(conn, handler, id, userdata, 1);
 }
@@ -556,10 +596,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 *const conn,
                     xmpp_handler handler,
-                    const char * const id,
-                    void * const userdata)
+                    const char *const id,
+                    void *const userdata)
 {
     _id_handler_add(conn, handler, id, userdata, 0);
 }
@@ -586,12 +626,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 *const conn,
                       xmpp_handler handler,
-                      const char * const ns,
-                      const char * const name,
-                      const char * const type,
-                      void * const userdata)
+                      const char *const ns,
+                      const char *const name,
+                      const char *const type,
+                      void *const userdata)
 {
     _handler_add(conn, handler, ns, name, type, userdata, 1);
 }
@@ -607,12 +647,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 *const conn,
                  xmpp_handler handler,
-                 const char * const ns,
-                 const char * const name,
-                 const char * const type,
-                 void * const userdata)
+                 const char *const ns,
+                 const char *const name,
+                 const char *const type,
+                 void *const userdata)
 {
     _handler_add(conn, handler, ns, name, type, userdata, 0);
 }
@@ -636,9 +676,12 @@ void handler_system_delete_all(xmpp_conn_t *conn)
         if (!item->user_handler) {
             next = item->next;
             _handler_item_remove(&conn->handlers, item);
-            if (item->ns) xmpp_free(conn->ctx, item->ns);
-            if (item->name) xmpp_free(conn->ctx, item->name);
-            if (item->type) xmpp_free(conn->ctx, item->type);
+            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);
             item = next;
         } else
@@ -665,7 +708,7 @@ 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->id);
+                xmpp_free(conn->ctx, item->u.id);
                 xmpp_free(conn->ctx, item);
                 item = next;
             } else
@@ -686,5 +729,56 @@ void handler_system_delete_all(xmpp_conn_t *conn)
             xmpp_free(conn->ctx, key2);
         }
     }
-    if (iter) hash_iter_release(iter);
+    if (iter)
+        hash_iter_release(iter);
+}
+
+/** Add a global timed handler.
+ *  The handler will fire for the first time once the period has elapsed,
+ *  and continue firing regularly after that.  Strophe will try its best
+ *  to fire handlers as close to the period times as it can, but accuracy
+ *  will vary depending on the resolution of the event loop.
+ *
+ *  The main difference between global and ordinary handlers:
+ *  - Ordinary handler is related to a connection, fires only when the
+ *    connection is in connected state and is removed once the connection is
+ *    destroyed.
+ *  - Global handler fires regardless of connections state and is related to
+ *    a Strophe context.
+ *
+ *  The handler is executed in context of the respective event loop.
+ *
+ *  If the handler function returns true, it will be kept, and if it
+ *  returns false, it will be deleted from the list of handlers.
+ *
+ *  Notice, the same handler pointer may be added multiple times with different
+ *  userdata pointers. However, xmpp_global_timed_handler_delete() deletes
+ *  all occurrences.
+ *
+ *  @param ctx a Strophe context object
+ *  @param handler a function pointer to a timed handler
+ *  @param period the time in milliseconds between firings
+ *  @param userdata an opaque data pointer that will be passed to the handler
+ *
+ *  @ingroup Handlers
+ */
+void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
+                                   xmpp_global_timed_handler handler,
+                                   const unsigned long period,
+                                   void *const userdata)
+{
+    _timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1);
+}
+
+/** Delete a global timed handler.
+ *
+ *  @param ctx a Strophe context object
+ *  @param handler function pointer to the handler
+ *
+ *  @ingroup Handlers
+ */
+void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx,
+                                      xmpp_global_timed_handler handler)
+{
+    _timed_handler_delete(ctx, &ctx->timed_handlers, handler);
 }

src/hash.c

@@ -1,7 +1,7 @@
 /* hash.c
 ** strophe XMPP client library -- hash table implementation
-** 
-** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -44,173 +44,178 @@ struct _hash_iterator_t {
     hashentry_t *entry;
     int index;
 };
-   
+
 /** 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 *const ctx, const int size, hash_free_func free_func)
 {
     hash_t *result = NULL;
 
     result = xmpp_alloc(ctx, sizeof(hash_t));
     if (result != NULL) {
-	result->entries = xmpp_alloc(ctx, size * sizeof(hashentry_t *));
-	if (result->entries == NULL) {
-	    xmpp_free(ctx, result);
-	    return NULL;
-	}
-	memset(result->entries, 0, size * sizeof(hashentry_t *));
-	result->length = size;
+        result->entries = xmpp_alloc(ctx, size * sizeof(hashentry_t *));
+        if (result->entries == NULL) {
+            xmpp_free(ctx, result);
+            return NULL;
+        }
+        memset(result->entries, 0, size * sizeof(hashentry_t *));
+        result->length = size;
 
-	result->ctx = ctx;
-	result->free = free_func;
-	result->num_keys = 0;
-	/* give the caller a reference */
-	result->ref = 1;
+        result->ctx = ctx;
+        result->free = free_func;
+        result->num_keys = 0;
+        /* give the caller a reference */
+        result->ref = 1;
     }
-    
+
     return result;
 }
 
 /** obtain a new reference to an existing hash table */
-hash_t *hash_clone(hash_t * const table)
+hash_t *hash_clone(hash_t *const 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 *const table)
 {
     xmpp_ctx_t *ctx = table->ctx;
     hashentry_t *entry, *next;
     int i;
-    
+
     if (table->ref > 1)
-	table->ref--;
+        table->ref--;
     else {
-	for (i = 0; i < table->length; i++) {
-	    entry = table->entries[i];
-	    while (entry != NULL) {
-		next = entry->next;
-		xmpp_free(ctx, entry->key);
-		if (table->free) table->free(ctx, entry->value);
-		xmpp_free(ctx, entry);
-		entry = next;
-	    }
-	}
-	xmpp_free(ctx, table->entries);
-	xmpp_free(ctx, table);
+        for (i = 0; i < table->length; i++) {
+            entry = table->entries[i];
+            while (entry != NULL) {
+                next = entry->next;
+                xmpp_free(ctx, entry->key);
+                if (table->free)
+                    table->free(ctx, entry->value);
+                xmpp_free(ctx, entry);
+                entry = next;
+            }
+        }
+        xmpp_free(ctx, table->entries);
+        xmpp_free(ctx, table);
     }
 }
 
 /** hash a key for our table lookup */
 static int _hash_key(hash_t *table, const char *key)
 {
-   unsigned hash = 0;
-   unsigned shift = 0;
-   const unsigned char *c = (const unsigned char *)key;
+    unsigned hash = 0;
+    unsigned shift = 0;
+    const unsigned char *c = (const unsigned char *)key;
 
-   while (*c != 0) {
-	/* assume 32 bit ints */
-	hash ^= ((unsigned)*c++ << shift);
-	shift += 8;
-	if (shift > 24) shift = 0;
-   }
-   return hash % (unsigned)table->length;
+    while (*c != 0) {
+        /* assume 32 bit ints */
+        hash ^= ((unsigned)*c++ << shift);
+        shift += 8;
+        if (shift > 24)
+            shift = 0;
+    }
+    return hash % (unsigned)table->length;
 }
 
 hashentry_t *_hash_entry_find(hash_t *table, const char *key)
 {
-   hashentry_t *entry;
-   int table_index = _hash_key(table, key);
+    hashentry_t *entry;
+    int table_index = _hash_key(table, key);
 
-   /* look up the hash entry */
-   entry = table->entries[table_index];
-   while (entry != NULL) {
-	/* traverse the linked list looking for the key */
-	if (!strcmp(key, entry->key)) {
-	  /* match */
-          break;
-	}
-	entry = entry->next;
-   }
-   return entry;
+    /* look up the hash entry */
+    entry = table->entries[table_index];
+    while (entry != NULL) {
+        /* traverse the linked list looking for the key */
+        if (!strcmp(key, entry->key)) {
+            /* match */
+            break;
+        }
+        entry = entry->next;
+    }
+    return entry;
 }
 
 /** 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 *const key, void *data)
 {
-   xmpp_ctx_t *ctx = table->ctx;
-   hashentry_t *entry = NULL;
-   int table_index = _hash_key(table, key);
+    xmpp_ctx_t *ctx = table->ctx;
+    hashentry_t *entry = NULL;
+    int table_index = _hash_key(table, key);
 
-   /* find and replace existing entry, if any */
-   entry = _hash_entry_find(table, key);
+    /* find and replace existing entry, if any */
+    entry = _hash_entry_find(table, key);
 
-   if (entry == NULL) {
-      /* allocate and fill a new entry */
-      entry = xmpp_alloc(ctx, sizeof(hashentry_t));
-      if (!entry) return -1;
-      entry->key = xmpp_strdup(ctx, key);
-      if (!entry->key) {
-         xmpp_free(ctx, entry);
-         return -1;
-      }
-      /* insert ourselves in the linked list */
-      entry->next = table->entries[table_index];
-      table->entries[table_index] = entry;
-      table->num_keys++;
-   } else {
-      if (table->free) table->free(ctx, entry->value);
-   }
+    if (entry == NULL) {
+        /* allocate and fill a new entry */
+        entry = xmpp_alloc(ctx, sizeof(hashentry_t));
+        if (!entry)
+            return -1;
+        entry->key = xmpp_strdup(ctx, key);
+        if (!entry->key) {
+            xmpp_free(ctx, entry);
+            return -1;
+        }
+        /* insert ourselves in the linked list */
+        entry->next = table->entries[table_index];
+        table->entries[table_index] = entry;
+        table->num_keys++;
+    } else {
+        if (table->free)
+            table->free(ctx, entry->value);
+    }
 
-   entry->value = data;
+    entry->value = data;
 
-   return 0;
+    return 0;
 }
 
 /** look up a key in a hash table */
 void *hash_get(hash_t *table, const char *key)
 {
-   hashentry_t *entry;
+    hashentry_t *entry;
 
-   entry = _hash_entry_find(table, key);
-   return entry == NULL ? NULL : entry->value;
+    entry = _hash_entry_find(table, key);
+    return entry == NULL ? NULL : entry->value;
 }
 
 /** delete a key from a hash table */
 int hash_drop(hash_t *table, const char *key)
 {
-   xmpp_ctx_t *ctx = table->ctx;
-   hashentry_t *entry, *prev;
-   int table_index = _hash_key(table, key);
+    xmpp_ctx_t *ctx = table->ctx;
+    hashentry_t *entry, *prev;
+    int table_index = _hash_key(table, key);
 
-   /* look up the hash entry */
-   entry = table->entries[table_index];
-   prev = NULL;
-   while (entry != NULL) {
-	/* traverse the linked list looking for the key */
-	if (!strcmp(key, entry->key)) {
-	  /* match, remove the entry */
-	  xmpp_free(ctx, entry->key);
-	  if (table->free) table->free(ctx, entry->value);
-	  if (prev == NULL) {
-	    table->entries[table_index] = entry->next;
-	  } else {
-	    prev->next = entry->next;
-	  }
-	  xmpp_free(ctx, entry);
-	  table->num_keys--;
-	  return 0;
-	}
-	prev = entry;
-	entry = entry->next;
-   }
-   /* no match */
-   return -1;
+    /* look up the hash entry */
+    entry = table->entries[table_index];
+    prev = NULL;
+    while (entry != NULL) {
+        /* traverse the linked list looking for the key */
+        if (!strcmp(key, entry->key)) {
+            /* match, remove the entry */
+            xmpp_free(ctx, entry->key);
+            if (table->free)
+                table->free(ctx, entry->value);
+            if (prev == NULL) {
+                table->entries[table_index] = entry->next;
+            } else {
+                prev->next = entry->next;
+            }
+            xmpp_free(ctx, entry);
+            table->num_keys--;
+            return 0;
+        }
+        prev = entry;
+        entry = entry->next;
+    }
+    /* no match */
+    return -1;
 }
 
 int hash_num_keys(hash_t *table)
@@ -226,16 +231,15 @@ hash_iterator_t *hash_iter_new(hash_t *table)
 
     iter = xmpp_alloc(ctx, sizeof(*iter));
     if (iter != NULL) {
-	iter->ref = 1;
-	iter->table = hash_clone(table);
-	iter->entry = NULL;
-	iter->index = -1;
+        iter->ref = 1;
+        iter->table = hash_clone(table);
+        iter->entry = NULL;
+        iter->index = -1;
     }
 
     return iter;
 }
 
-
 /** release an iterator that is no longer needed */
 void hash_iter_release(hash_iterator_t *iter)
 {
@@ -244,37 +248,38 @@ void hash_iter_release(hash_iterator_t *iter)
     iter->ref--;
 
     if (iter->ref == 0) { // ref is unsigned!!!
-	hash_release(iter->table);
-	xmpp_free(ctx, iter);
+        hash_release(iter->table);
+        xmpp_free(ctx, iter);
     }
 }
 
 /** return the next hash table key from the iterator.
     the returned key should not be freed */
-const char * hash_iter_next(hash_iterator_t *iter)
+const char *hash_iter_next(hash_iterator_t *iter)
 {
     hash_t *table = iter->table;
     hashentry_t *entry = iter->entry;
     int i;
 
     /* advance until we find the next entry */
-    if (entry != NULL) entry = entry->next;
+    if (entry != NULL)
+        entry = entry->next;
     if (entry == NULL) {
-	/* we're off the end of list, search for a new entry */
-	i = iter->index + 1;
-	while (i < iter->table->length) {
-	    entry = table->entries[i];
-	    if (entry != NULL) {
-		iter->index = i;
-		break;
-	    }
-	    i++;
-	}
+        /* we're off the end of list, search for a new entry */
+        i = iter->index + 1;
+        while (i < iter->table->length) {
+            entry = table->entries[i];
+            if (entry != NULL) {
+                iter->index = i;
+                break;
+            }
+            i++;
+        }
     }
 
     if (entry == NULL) {
-	/* no more keys! */
-	return NULL;
+        /* no more keys! */
+        return NULL;
     }
 
     /* remember our current match */

src/hash.h

@@ -1,7 +1,7 @@
 /* hash.h
 ** strophe XMPP client library -- hash table interface
-** 
-** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -18,23 +18,23 @@
 
 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 *const 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 *const ctx, const 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 *const table);
 
 /** release a hash table when no longer needed */
-void hash_release(hash_t * const table);
+void hash_release(hash_t *const 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 *const key, void *data);
 
 /** look up a key in a hash table */
 void *hash_get(hash_t *table, const char *key);
@@ -56,6 +56,6 @@ void hash_iter_release(hash_iterator_t *iter);
 
 /** return the next hash table key from the iterator.
     the returned key should not be freed */
-const char * hash_iter_next(hash_iterator_t *iter);
+const char *hash_iter_next(hash_iterator_t *iter);
 
 #endif /* __LIBXMPPP_HASH_H__ */

src/jid.c

@@ -1,7 +1,7 @@
 /* jid.c
 ** strophe XMPP client library -- helper functions for parsing JIDs
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -28,15 +28,17 @@
  *  @return an allocated string with the full JID or NULL if no domain
  *      is specified
  */
-char *xmpp_jid_new(xmpp_ctx_t *ctx, const char *node,
-				    const char *domain,
-				    const char *resource)
+char *xmpp_jid_new(xmpp_ctx_t *ctx,
+                   const char *node,
+                   const char *domain,
+                   const char *resource)
 {
     char *result;
     size_t len, nlen, dlen, rlen;
 
     /* jid must at least have a domain */
-    if (domain == NULL) return NULL;
+    if (domain == NULL)
+        return NULL;
 
     /* accumulate lengths */
     dlen = strlen(domain);
@@ -47,23 +49,23 @@ char *xmpp_jid_new(xmpp_ctx_t *ctx, const char *node,
     /* concat components */
     result = xmpp_alloc(ctx, len + 1);
     if (result != NULL) {
-	if (node != NULL) {
-	    memcpy(result, node, nlen - 1);
-	    result[nlen-1] = '@';
-	}
+        if (node != NULL) {
+            memcpy(result, node, nlen - 1);
+            result[nlen - 1] = '@';
+        }
         memcpy(result + nlen, domain, dlen);
-	if (resource != NULL) {
-	    result[nlen+dlen] = '/';
-	    memcpy(result+nlen+dlen+1, resource, rlen - 1);
-	}
-	result[len] = '\0';
+        if (resource != NULL) {
+            result[nlen + dlen] = '/';
+            memcpy(result + nlen + dlen + 1, resource, rlen - 1);
+        }
+        result[len] = '\0';
     }
 
     return result;
 }
 
 /** Create a bare JID from a JID.
- *  
+ *
  *  @param ctx the Strophe context object
  *  @param jid the JID
  *
@@ -77,15 +79,15 @@ char *xmpp_jid_bare(xmpp_ctx_t *ctx, const char *jid)
     len = strcspn(jid, "/");
     result = xmpp_alloc(ctx, len + 1);
     if (result != NULL) {
-	memcpy(result, jid, len);
-	result[len] = '\0';
+        memcpy(result, jid, len);
+        result[len] = '\0';
     }
 
     return result;
 }
 
 /** Create a node string from a JID.
- *  
+ *
  *  @param ctx a Strophe context object
  *  @param jid the JID
  *
@@ -99,11 +101,11 @@ char *xmpp_jid_node(xmpp_ctx_t *ctx, const char *jid)
 
     c = strchr(jid, '@');
     if (c != NULL) {
-	result = xmpp_alloc(ctx, (c-jid) + 1);
-	if (result != NULL) {
-	    memcpy(result, jid, (c-jid));
-	    result[c-jid] = '\0';
-	}
+        result = xmpp_alloc(ctx, (c - jid) + 1);
+        if (result != NULL) {
+            memcpy(result, jid, (c - jid));
+            result[c - jid] = '\0';
+        }
     }
 
     return result;
@@ -124,17 +126,17 @@ char *xmpp_jid_domain(xmpp_ctx_t *ctx, const char *jid)
 
     c = strchr(jid, '@');
     if (c == NULL) {
-	/* no node, assume domain */
-	c = jid;
+        /* no node, assume domain */
+        c = jid;
     } else {
-	/* advance past the separator */
-	c++;
+        /* advance past the separator */
+        c++;
     }
     dlen = strcspn(c, "/"); /* do not include resource */
     result = xmpp_alloc(ctx, dlen + 1);
     if (result != NULL) {
-	memcpy(result, c, dlen);
-	result[dlen] = '\0';
+        memcpy(result, c, dlen);
+        result[dlen] = '\0';
     }
 
     return result;
@@ -145,7 +147,7 @@ char *xmpp_jid_domain(xmpp_ctx_t *ctx, const char *jid)
  *  @param ctx a Strophe context object
  *  @param jid the JID
  *
- *  @return an allocated string with the resource or NULL if no resource 
+ *  @return an allocated string with the resource or NULL if no resource
  *      is found or an error occurs
  */
 char *xmpp_jid_resource(xmpp_ctx_t *ctx, const char *jid)

src/md5.c

@@ -29,22 +29,21 @@
 #include "md5.h"
 
 /* little-endian word access macros */
-#define GET_32BIT_LSB_FIRST(cp) \
-    (((uint32_t)(unsigned char)(cp)[0]) | \
-     ((uint32_t)(unsigned char)(cp)[1] << 8 ) | \
+#define GET_32BIT_LSB_FIRST(cp)                 \
+    (((uint32_t)(unsigned char)(cp)[0]) |       \
+     ((uint32_t)(unsigned char)(cp)[1] << 8) |  \
      ((uint32_t)(unsigned char)(cp)[2] << 16) | \
      ((uint32_t)(unsigned char)(cp)[3] << 24))
 
-#define PUT_32BIT_LSB_FIRST(cp, value) \
-    do { \
-        (cp)[0] = (value) & 0xFF; \
-        (cp)[1] = ((value) >> 8)  & 0xFF; \
+#define PUT_32BIT_LSB_FIRST(cp, value)    \
+    do {                                  \
+        (cp)[0] = (value)&0xFF;           \
+        (cp)[1] = ((value) >> 8) & 0xFF;  \
         (cp)[2] = ((value) >> 16) & 0xFF; \
         (cp)[3] = ((value) >> 24) & 0xFF; \
-    } while(0)
+    } while (0)
 
-static void MD5Transform(uint32_t buf[4], const unsigned char inext[64],
-                         struct MD5Context *ctx);
+static void MD5Transform(uint32_t buf[4], const unsigned char inext[64]);
 
 /*
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
@@ -75,10 +74,10 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
 
     t = ctx->bits[0];
     if ((ctx->bits[0] = (t + ((uint32_t)len << 3)) & 0xffffffff) < t)
-        ctx->bits[1]++;         /* Carry from low to high */
+        ctx->bits[1]++; /* Carry from low to high */
     ctx->bits[1] += len >> 29;
 
-    t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
+    t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
 
     /* Handle any leading odd-sized chunks */
 
@@ -91,7 +90,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
             return;
         }
         memcpy(p, buf, t);
-        MD5Transform(ctx->buf, ctx->in, ctx);
+        MD5Transform(ctx->buf, ctx->in);
         buf += t;
         len -= t;
     }
@@ -99,7 +98,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
 
     while (len >= 64) {
         memcpy(ctx->in, buf, 64);
-        MD5Transform(ctx->buf, ctx->in, ctx);
+        MD5Transform(ctx->buf, ctx->in);
         buf += 64;
         len -= 64;
     }
@@ -110,7 +109,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
 }
 
 /*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
 void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
@@ -133,7 +132,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     if (count < 8) {
         /* Two lots of padding:  Pad the first block to 64 bytes */
         memset(p, 0, count);
-        MD5Transform(ctx->buf, ctx->in, ctx);
+        MD5Transform(ctx->buf, ctx->in);
 
         /* Now fill the next block with 56 bytes */
         memset(ctx->in, 0, 56);
@@ -146,12 +145,12 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     PUT_32BIT_LSB_FIRST(ctx->in + 56, ctx->bits[0]);
     PUT_32BIT_LSB_FIRST(ctx->in + 60, ctx->bits[1]);
 
-    MD5Transform(ctx->buf, ctx->in, ctx);
+    MD5Transform(ctx->buf, ctx->in);
     PUT_32BIT_LSB_FIRST(digest, ctx->buf[0]);
     PUT_32BIT_LSB_FIRST(digest + 4, ctx->buf[1]);
     PUT_32BIT_LSB_FIRST(digest + 8, ctx->buf[2]);
     PUT_32BIT_LSB_FIRST(digest + 12, ctx->buf[3]);
-    memset(ctx, 0, sizeof(*ctx));       /* In case it's sensitive */
+    memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
@@ -173,21 +172,20 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
         w = w<<s | w>>(32-s),  printf(" - w: %x\n", w), w += x )
 */
 #define MD5STEP(f, w, x, y, z, data, s) \
-        ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
+    (w += f(x, y, z) + data, w = w << s | w >> (32 - s), w += x)
 
 /*
  * The core of the MD5 algorithm, this alters an existing MD5 hash to
  * reflect the addition of 16 longwords of new data.  MD5Update blocks
  * the data and converts bytes into longwords for this routine.
  */
-static void MD5Transform(uint32_t buf[4], const unsigned char inext[64],
-                         struct MD5Context *ctx)
+static void MD5Transform(uint32_t buf[4], const unsigned char inext[64])
 {
     register uint32_t a, b, c, d, i;
     uint32_t in[16];
-    
+
     for (i = 0; i < 16; i++)
-      in[i] = GET_32BIT_LSB_FIRST(inext + 4 * i);
+        in[i] = GET_32BIT_LSB_FIRST(inext + 4 * i);
 
     a = buf[0];
     b = buf[1];

src/md5.h

@@ -21,7 +21,8 @@ struct MD5Context {
 };
 
 void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
+void MD5Update(struct MD5Context *context,
+               unsigned char const *buf,
                uint32_t len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 

src/oocontext.cpp

@@ -1,84 +0,0 @@
-/* oocontext.cpp
-** strophe XMPP client library -- C++ context implementation
-**
-** 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 <stdlib.h>
-
-#include "strophe.h"
-#include "strophepp.h"
-
-XMPP::Context::Context()
-{
-    m_mem.alloc = callAlloc;
-    m_mem.realloc = callRealloc;
-    m_mem.free = callFree;
-    m_mem.userdata = (void *)this;
-
-    m_log.handler = callLog;
-    m_log.userdata = (void *)this;
-
-    m_ctx = ::xmpp_ctx_new(&m_mem, &m_log);
-}
-
-XMPP::Context::~Context()
-{
-    ::xmpp_ctx_free(m_ctx);
-}
-
-void *XMPP::Context::alloc(const size_t size)
-{
-    return ::malloc(size);
-}
-
-void *XMPP::Context::realloc(void *p, const size_t size)
-{
-    return ::realloc(p, size);
-}
-
-void XMPP::Context::free(void *p)
-{
-    ::free(p);
-}
-
-void XMPP::Context::log(const xmpp_log_level_t level,
-                        const char * const area,
-                        const char * const msg)
-{
-    /* do nothing by default */
-}
-
-xmpp_ctx_t *XMPP::Context::getContext()
-{
-    return m_ctx;
-}
-
-void *XMPP::Context::callAlloc(const size_t size, void * const userdata)
-{
-    return reinterpret_cast<Context *>(userdata)->alloc(size);
-}
-
-void *XMPP::Context::callRealloc(void *p, const size_t size,
-                                 void * const userdata)
-{
-    return reinterpret_cast<Context *>(userdata)->realloc(p, size);
-}
-
-void XMPP::Context::callFree(void *p, void * const userdata)
-{
-    reinterpret_cast<Context *>(userdata)->free(p);
-}
-
-void XMPP::Context::callLog(void * const userdata,
-                            const xmpp_log_level_t level,
-                            const char * const area,
-                            const char * const msg)
-{
-    reinterpret_cast<Context *>(userdata)->log(level, area, msg);
-}

src/oostanza.cpp

@@ -1,77 +0,0 @@
-/* oostanza.cpp
-** strophe XMPP client library -- C++ context implementation
-**
-** 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 "strophe.h"
-#include "strophepp.h"
-
-using namespace XMPP;
-
-void *Stanza::operator new(size_t size, Context *ctx)
-{
-    void *p;
-
-    /* we must allocate extra room for the Context object so that the
-    destructor can access it to free the object.  C++ does not allow
-    us to access normal members in the destructor, so we have to hide
-    it.  This must be prepended as well, since C++ will add stuff to
-    the end in subclasses. */
-
-    p = ctx->alloc(size + sizeof(Context *));
-    if (!p) return p;
-
-    *reinterpret_cast<Context **>(p) = ctx;
-    p = reinterpret_cast<void *>(reinterpret_cast<char *>(p) +
-                                 sizeof(Context *));
-
-    return p;
-}
-
-void Stanza::operator delete(void *p)
-{
-    Context *ctx;
-
-    ctx = *reinterpret_cast<Context **>(reinterpret_cast<char *>(p) - 4);
-    ctx->free(reinterpret_cast<char *>(p) - 4);
-}
-
-Stanza::Stanza(Context *ctx)
-{
-    m_ctx = ctx;
-    m_stanza = ::xmpp_stanza_new(ctx->getContext());
-    // TODO: check for errors
-}
-
-Stanza::~Stanza()
-{
-}
-
-Stanza *Stanza::create(Context *ctx)
-{
-    return new (ctx) Stanza(ctx);
-}
-
-void Stanza::release()
-{
-    if (::xmpp_stanza_release(m_stanza))
-        delete this;
-}
-
-Stanza *Stanza::clone()
-{
-    ::xmpp_stanza_clone(m_stanza);
-    return this;
-}
-
-Stanza *Stanza::copy()
-{
-    // TODO
-    return NULL;
-}

src/ostypes.h

@@ -1,8 +1,8 @@
 /* ostypes.h
-** strophe XMPP client library -- type definitions for platforms 
+** strophe XMPP client library -- type definitions for platforms
 **     without stdint.h
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -17,9 +17,9 @@
 #ifndef __LIBSTROPHE_OSTYPES_H__
 #define __LIBSTROPHE_OSTYPES_H__
 
-#include <stddef.h>     /* size_t */
+#include <stddef.h> /* size_t */
 
-#if defined (_MSC_VER) && _MSC_VER < 1600
+#if defined(_MSC_VER) && _MSC_VER < 1600
 typedef signed char int8_t;
 typedef short int int16_t;
 typedef int int32_t;
@@ -28,7 +28,7 @@ typedef __int64 int64_t;
 typedef unsigned char uint8_t;
 typedef unsigned short int uint16_t;
 typedef unsigned int uint32_t;
-typedef unsigned __int64 uint64_t; 
+typedef unsigned __int64 uint64_t;
 
 #ifndef UINT16_MAX
 #define UINT16_MAX ((uint16_t)0xffff)

src/parser.h

@@ -1,7 +1,7 @@
 /* parser.h
 ** strophe XMPP client library -- parser structures and functions
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
@@ -22,19 +22,18 @@ 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);
+                                      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);
+                                       void *const userdata);
 
-
-parser_t *parser_new(xmpp_ctx_t *ctx, 
+parser_t *parser_new(xmpp_ctx_t *ctx,
                      parser_start_callback startcb,
                      parser_end_callback endcb,
                      parser_stanza_callback stanzacb,
                      void *userdata);
 void parser_free(parser_t *parser);
-char* parser_attr_name(xmpp_ctx_t *ctx, char *nsname);
+char *parser_attr_name(xmpp_ctx_t *ctx, char *nsname);
 int parser_reset(parser_t *parser);
 int parser_feed(parser_t *parser, char *chunk, int len);
 

src/parser_expat.c

@@ -1,7 +1,7 @@
 /* parser.c
 ** strophe XMPP client library -- xml parser handlers and utility functions
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -19,13 +19,10 @@
 
 #include <expat.h>
 
-#include <strophe.h>
+#include "strophe.h"
 #include "common.h"
 #include "parser.h"
 
-/* Use the Unit Separator to delimit namespace and name in our XML*/
-#define NAMESPACE_SEP ('\x1F')
-
 /* Allocate inner text by this number bytes more. Expat splits string
  * "new\nline" into 3 strings: "new" "\n" "line". Expecting this pattern,
  * we can leave few bytes in the inner_text for "\n". It should reduce
@@ -41,13 +38,53 @@ struct _parser_t {
     void *userdata;
     int depth;
     xmpp_stanza_t *stanza;
-    char* inner_text;
+    char *inner_text;
     /* number of allocated bytes */
     int inner_text_size;
     /* excluding terminal '\0' */
     int inner_text_used;
 };
 
+/* Use the Unit Separator to delimit namespace and name in our XML */
+const XML_Char namespace_sep = '\x1F';
+
+/*
+ * Cached strophe ctx. It is used for memory suite.
+ * Note, expat doesn't support userdata in memory suite, therefore,
+ * we can support only one strophe context. If user creates more than one
+ * context, this module will fallback to default library allocator for all
+ * contexts other than mem_ctx.
+ */
+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);
+    else
+        return NULL;
+}
+
+static void *parser_mem_realloc(void *ptr, size_t size)
+{
+    if (mem_ctx != NULL)
+        return xmpp_realloc(mem_ctx, ptr, size);
+    else
+        return NULL;
+}
+
+static void parser_mem_free(void *ptr)
+{
+    if (mem_ctx != NULL)
+        xmpp_free(mem_ctx, ptr);
+}
+
+static const XML_Memory_Handling_Suite parser_mem_suite = {
+    .malloc_fcn = &parser_mem_malloc,
+    .realloc_fcn = &parser_mem_realloc,
+    .free_fcn = &parser_mem_free,
+};
+
 /* return allocated string with the name from a delimited
  * namespace/name string */
 static char *_xml_name(xmpp_ctx_t *ctx, const char *nsname)
@@ -56,15 +93,16 @@ static char *_xml_name(xmpp_ctx_t *ctx, const char *nsname)
     const char *c;
     size_t len;
 
-    c = strchr(nsname, NAMESPACE_SEP);
-    if (c == NULL) return xmpp_strdup(ctx, nsname);
+    c = strchr(nsname, namespace_sep);
+    if (c == NULL)
+        return xmpp_strdup(ctx, nsname);
 
     c++;
     len = strlen(c);
     result = xmpp_alloc(ctx, len + 1);
     if (result != NULL) {
-	memcpy(result, c, len);
-	result[len] = '\0';
+        memcpy(result, c, len);
+        result[len] = '\0';
     }
 
     return result;
@@ -76,13 +114,13 @@ static char *_xml_namespace(xmpp_ctx_t *ctx, const char *nsname)
     char *result = NULL;
     const char *c;
 
-    c = strchr(nsname, NAMESPACE_SEP);
+    c = strchr(nsname, namespace_sep);
     if (c != NULL) {
-	result = xmpp_alloc(ctx, (c-nsname) + 1);
-	if (result != NULL) {
-	    memcpy(result, nsname, (c-nsname));
-	    result[c-nsname] = '\0';
-	}
+        result = xmpp_alloc(ctx, (c - nsname) + 1);
+        if (result != NULL) {
+            memcpy(result, nsname, (c - nsname));
+            result[c - nsname] = '\0';
+        }
     }
 
     return result;
@@ -93,12 +131,13 @@ static void _set_attributes(xmpp_stanza_t *stanza, const XML_Char **attrs)
     char *attr;
     int i;
 
-    if (!attrs) return;
+    if (!attrs)
+        return;
 
     for (i = 0; attrs[i]; i += 2) {
         /* 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_stanza_set_attribute(stanza, attr, attrs[i + 1]);
         xmpp_free(stanza->ctx, attr);
     }
 }
@@ -123,9 +162,8 @@ static void complete_inner_text(parser_t *parser)
     }
 }
 
-static void _start_element(void *userdata,
-                           const XML_Char *nsname,
-                           const XML_Char **attrs)
+static void
+_start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
 {
     parser_t *parser = (parser_t *)userdata;
     xmpp_stanza_t *child;
@@ -137,8 +175,7 @@ static void _start_element(void *userdata,
     if (parser->depth == 0) {
         /* notify the owner */
         if (parser->startcb)
-            parser->startcb(name, (char **)attrs,
-                            parser->userdata);
+            parser->startcb(name, (char **)attrs, parser->userdata);
     } else {
         /* build stanzas at depth 1 */
         if (!parser->stanza && parser->depth != 1) {
@@ -164,8 +201,10 @@ static void _start_element(void *userdata,
         }
     }
 
-    if (ns) xmpp_free(parser->ctx, ns);
-    if (name) xmpp_free(parser->ctx, name);
+    if (ns)
+        xmpp_free(parser->ctx, ns);
+    if (name)
+        xmpp_free(parser->ctx, name);
 
     parser->depth++;
 }
@@ -187,8 +226,7 @@ static void _end_element(void *userdata, const XML_Char *name)
             parser->stanza = parser->stanza->parent;
         } else {
             if (parser->stanzacb)
-                parser->stanzacb(parser->stanza,
-                                 parser->userdata);
+                parser->stanzacb(parser->stanza, parser->userdata);
             xmpp_stanza_release(parser->stanza);
             parser->stanza = NULL;
         }
@@ -200,13 +238,14 @@ static void _characters(void *userdata, const XML_Char *s, int len)
     parser_t *parser = (parser_t *)userdata;
     char *p;
 
-    if (parser->depth < 2) return;
+    if (parser->depth < 2)
+        return;
 
     /* Join all parts to a single resulting string. Stanza is created in
      * _start_element() and _end_element(). */
     if (parser->inner_text_used + len >= parser->inner_text_size) {
-        parser->inner_text_size = parser->inner_text_used + len + 1 +
-                                  INNER_TEXT_PADDING;
+        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);
         if (p == NULL) {
@@ -251,7 +290,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
     return parser;
 }
 
-char* parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
+char *parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
 {
     return _xml_name(ctx, nsname);
 }
@@ -263,7 +302,7 @@ void parser_free(parser_t *parser)
         XML_ParserFree(parser->expat);
 
     if (parser->inner_text) {
-        xmpp_free (parser->ctx, parser->inner_text);
+        xmpp_free(parser->ctx, parser->inner_text);
         parser->inner_text = NULL;
     }
 
@@ -273,23 +312,38 @@ void parser_free(parser_t *parser)
 /* shuts down and restarts XML parser.  true on success */
 int parser_reset(parser_t *parser)
 {
-    if (parser->expat)
-	XML_ParserFree(parser->expat);
+    XML_Bool ret;
+    const XML_Memory_Handling_Suite *mem = NULL;
 
-    if (parser->stanza) 
-	xmpp_stanza_release(parser->stanza);
+    if (parser->expat) {
+        ret = XML_ParserReset(parser->expat, NULL);
+        if (ret != XML_TRUE) {
+            XML_ParserFree(parser->expat);
+            parser->expat = NULL;
+        }
+    } else {
+        if (mem_ctx == NULL)
+            mem_ctx = parser->ctx;
+        if (parser->ctx == mem_ctx)
+            mem = &parser_mem_suite;
+        parser->expat = XML_ParserCreate_MM(NULL, mem, &namespace_sep);
+    }
 
-    parser->expat = XML_ParserCreateNS(NULL, NAMESPACE_SEP);
-    if (!parser->expat) return 0;
-
-    parser->depth = 0;
-    parser->stanza = NULL;
+    if (parser->stanza) {
+        xmpp_stanza_release(parser->stanza);
+        parser->stanza = NULL;
+    }
 
     if (parser->inner_text) {
-        xmpp_free (parser->ctx, parser->inner_text);
+        xmpp_free(parser->ctx, parser->inner_text);
         parser->inner_text = NULL;
     }
 
+    if (!parser->expat)
+        return 0;
+
+    parser->depth = 0;
+
     XML_SetUserData(parser->expat, parser);
     XML_SetElementHandler(parser->expat, _start_element, _end_element);
     XML_SetCharacterDataHandler(parser->expat, _characters);

src/parser_libxml2.c

@@ -1,7 +1,7 @@
 /* parser.c
 ** strophe XMPP client library -- xml parser handlers and utility functions
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -20,7 +20,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <strophe.h>
+#include "strophe.h"
 #include "common.h"
 #include "parser.h"
 
@@ -36,53 +36,56 @@ struct _parser_t {
     xmpp_stanza_t *stanza;
 };
 
-static void _set_attributes(xmpp_stanza_t *stanza, int nattrs,
-                            const xmlChar **attrs)
+static void
+_set_attributes(xmpp_stanza_t *stanza, int nattrs, const xmlChar **attrs)
 {
     int i, len;
     char *value;
 
-    if (!attrs) return;
+    if (!attrs)
+        return;
 
     /* 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];
+    for (i = 0; i < nattrs * 5; i += 5) {
+        len = attrs[i + 4] - attrs[i + 3];
         value = xmpp_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);
-	}
+        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);
+        }
     }
 }
 
 /* SAX2 gives us the attrs in an incredibly inconvenient array,
  * convert it to what the start callback is expecting */
-static char **_convert_attrs(parser_t *parser, int nattrs,
-                             const xmlChar **attrs)
+static char **
+_convert_attrs(parser_t *parser, int nattrs, const xmlChar **attrs)
 {
     int c, i, o, len;
     char *value;
     char **ret;
 
-    if (!attrs) return NULL;
+    if (!attrs)
+        return NULL;
 
-    ret = xmpp_alloc(parser->ctx, (nattrs+1)*2*sizeof(char*));
-    if (!ret) return NULL;
-    memset(ret, 0, (nattrs+1)*2*sizeof(char*));
+    ret = xmpp_alloc(parser->ctx, (nattrs + 1) * 2 * sizeof(char *));
+    if (!ret)
+        return NULL;
+    memset(ret, 0, (nattrs + 1) * 2 * sizeof(char *));
 
     for (c = 0; c < nattrs; c++) {
         i = c * 5;
         o = c * 2;
 
-        len = attrs[i+4] - attrs[i+3];
+        len = attrs[i + 4] - attrs[i + 3];
         value = xmpp_alloc(parser->ctx, len + 1);
         if (value) {
-            memcpy(value, attrs[i+3], len);
+            memcpy(value, attrs[i + 3], len);
             value[len] = '\0';
-            ret[o] = xmpp_strdup(parser->ctx, (char*)attrs[i]);
-            ret[o+1] = value;
+            ret[o] = xmpp_strdup(parser->ctx, (char *)attrs[i]);
+            ret[o + 1] = value;
         }
     }
 
@@ -97,77 +100,92 @@ static void _free_cbattrs(parser_t *parser, char **attrs)
         return;
 
     for (i = 0; attrs[i]; i += 2) {
-        if (attrs[i]) xmpp_free(parser->ctx, attrs[i]);
-        if (attrs[i+1]) xmpp_free(parser->ctx, attrs[i+1]);
+        if (attrs[i])
+            xmpp_free(parser->ctx, attrs[i]);
+        if (attrs[i + 1])
+            xmpp_free(parser->ctx, attrs[i + 1]);
     }
 
     xmpp_free(parser->ctx, attrs);
 }
 
-static void _start_element(void *userdata, 
-                           const xmlChar *name, const xmlChar *prefix,
-                           const xmlChar *uri, int nnamespaces,
-                           const xmlChar **namespaces, int nattrs,
-                           int ndefaulted, const xmlChar **attrs)
+static void _start_element(void *userdata,
+                           const xmlChar *name,
+                           const xmlChar *prefix,
+                           const xmlChar *uri,
+                           int nnamespaces,
+                           const xmlChar **namespaces,
+                           int nattrs,
+                           int ndefaulted,
+                           const xmlChar **attrs)
 {
     parser_t *parser = (parser_t *)userdata;
     xmpp_stanza_t *child;
     char **cbattrs;
 
+    UNUSED(prefix);
+    UNUSED(nnamespaces);
+    UNUSED(namespaces);
+    UNUSED(ndefaulted);
+
     if (parser->depth == 0) {
         /* notify the owner */
         if (parser->startcb) {
             cbattrs = _convert_attrs(parser, nattrs, attrs);
-            parser->startcb((char *)name, cbattrs, 
-                            parser->userdata);
+            parser->startcb((char *)name, cbattrs, parser->userdata);
             _free_cbattrs(parser, cbattrs);
-	}
+        }
     } else {
-	/* build stanzas at depth 1 */
-	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?");
-	} else if (!parser->stanza) {
-	    /* starting a new toplevel stanza */
-	    parser->stanza = xmpp_stanza_new(parser->ctx);
-	    if (!parser->stanza) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(parser->stanza, (char *)name);
-	    _set_attributes(parser->stanza, nattrs, attrs);
-	    if (uri)
-		xmpp_stanza_set_ns(parser->stanza, (char *)uri);
-	} else {
-	    /* starting a child of conn->stanza */
-	    child = xmpp_stanza_new(parser->ctx);
-	    if (!child) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(child, (char *)name);
-	    _set_attributes(child, nattrs, attrs);
-	    if (uri)
-		xmpp_stanza_set_ns(child, (char *)uri);
+        /* build stanzas at depth 1 */
+        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?");
+        } else if (!parser->stanza) {
+            /* starting a new toplevel stanza */
+            parser->stanza = xmpp_stanza_new(parser->ctx);
+            if (!parser->stanza) {
+                /* FIXME: can't allocate, disconnect */
+            }
+            xmpp_stanza_set_name(parser->stanza, (char *)name);
+            _set_attributes(parser->stanza, nattrs, attrs);
+            if (uri)
+                xmpp_stanza_set_ns(parser->stanza, (char *)uri);
+        } else {
+            /* starting a child of conn->stanza */
+            child = xmpp_stanza_new(parser->ctx);
+            if (!child) {
+                /* FIXME: can't allocate, disconnect */
+            }
+            xmpp_stanza_set_name(child, (char *)name);
+            _set_attributes(child, nattrs, attrs);
+            if (uri)
+                xmpp_stanza_set_ns(child, (char *)uri);
 
-	    /* add child to parent */
-	    xmpp_stanza_add_child(parser->stanza, child);
-	    
-	    /* the child is owned by the toplevel stanza now */
-	    xmpp_stanza_release(child);
+            /* add child to parent */
+            xmpp_stanza_add_child(parser->stanza, child);
 
-	    /* make child the current stanza */
-	    parser->stanza = child;
-	}
+            /* the child is owned by the toplevel stanza now */
+            xmpp_stanza_release(child);
+
+            /* make child the current stanza */
+            parser->stanza = child;
+        }
     }
 
     parser->depth++;
 }
 
-static void _end_element(void *userdata, const xmlChar *name,
-                         const xmlChar *prefix, const xmlChar *uri)
+static void _end_element(void *userdata,
+                         const xmlChar *name,
+                         const xmlChar *prefix,
+                         const xmlChar *uri)
 {
     parser_t *parser = (parser_t *)userdata;
 
+    UNUSED(prefix);
+    UNUSED(uri);
+
     parser->depth--;
 
     if (parser->depth == 0) {
@@ -175,16 +193,15 @@ static void _end_element(void *userdata, const xmlChar *name,
         if (parser->endcb)
             parser->endcb((char *)name, parser->userdata);
     } else {
-	if (parser->stanza->parent) {
-	    /* we're finishing a child stanza, so set current to the parent */
-	    parser->stanza = parser->stanza->parent;
-	} else {
+        if (parser->stanza->parent) {
+            /* we're finishing a child stanza, so set current to the parent */
+            parser->stanza = parser->stanza->parent;
+        } else {
             if (parser->stanzacb)
-                parser->stanzacb(parser->stanza,
-                                 parser->userdata);
+                parser->stanzacb(parser->stanza, parser->userdata);
             xmpp_stanza_release(parser->stanza);
             parser->stanza = NULL;
-	}
+        }
     }
 }
 
@@ -194,13 +211,14 @@ static void _characters(void *userdata, const xmlChar *chr, int len)
     xmpp_stanza_t *stanza;
 
     /* skip unimportant whitespace, etc */
-    if (parser->depth < 2) return;
+    if (parser->depth < 2)
+        return;
 
     /* create and populate stanza */
     stanza = xmpp_stanza_new(parser->ctx);
     if (!stanza) {
-	/* FIXME: allocation error, disconnect */
-	return;
+        /* FIXME: allocation error, disconnect */
+        return;
     }
     xmpp_stanza_set_text_with_size(stanza, (char *)chr, len);
 
@@ -239,7 +257,7 @@ parser_t *parser_new(xmpp_ctx_t *ctx,
     return parser;
 }
 
-char* parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
+char *parser_attr_name(xmpp_ctx_t *ctx, char *nsname)
 {
     return xmpp_strdup(ctx, nsname);
 }
@@ -259,14 +277,14 @@ int parser_reset(parser_t *parser)
 {
     if (parser->xmlctx)
         xmlFreeParserCtxt(parser->xmlctx);
-    if (parser->stanza) 
-	xmpp_stanza_release(parser->stanza);
+    if (parser->stanza)
+        xmpp_stanza_release(parser->stanza);
 
     parser->stanza = NULL;
     parser->depth = 0;
 
-    parser->xmlctx = xmlCreatePushParserCtxt(&parser->handlers, 
-                                             parser, NULL, 0, NULL);
+    parser->xmlctx =
+        xmlCreatePushParserCtxt(&parser->handlers, parser, NULL, 0, NULL);
 
     return parser->xmlctx ? 1 : 0;
 }

src/rand.c

@@ -20,15 +20,15 @@
  */
 
 #include <assert.h>
-#include <string.h>     /* memeset */
-#include <time.h>       /* clock, time */
+#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 "common.h"  /* xmpp_alloc, xmpp_free */
+#include "ostypes.h" /* uint8_t, uint32_t, size_t */
 #include "sha1.h"
-#include "snprintf.h"   /* xmpp_snprintf */
+#include "snprintf.h" /* xmpp_snprintf */
 
-#include "rand.h"       /* xmpp_rand_t */
+#include "rand.h" /* xmpp_rand_t */
 
 #define outlen SHA1_DIGEST_SIZE
 #define seedlen (440 / 8)
@@ -55,15 +55,15 @@ struct _xmpp_rand_t {
 };
 
 /* returns smallest number mupliple of y that not less than x */
-#define round_up(x, y) (((x) + (y) - 1) / (y) * (y))
+#define round_up(x, y) (((x) + (y)-1) / (y) * (y))
 /* returns smallest integer number that not less than x/y */
-#define div_round_up(x, y) (((x) + (y) - 1) / (y))
+#define div_round_up(x, y) (((x) + (y)-1) / (y))
 
 /* adds two arrays as numbers in big-endian representation and stores
  * result in the first one.
  */
-static void arr_add(uint8_t *arr1, size_t arr1_len,
-                    uint8_t *arr2, size_t arr2_len)
+static void
+arr_add(uint8_t *arr1, size_t arr1_len, uint8_t *arr2, size_t arr2_len)
 {
     size_t i;
     uint32_t acc;
@@ -89,8 +89,10 @@ static void store_be32(uint32_t val, uint8_t be[4])
     be[3] = (uint8_t)(val & 0xff);
 }
 
-static void Hash_df(uint8_t *input_string, size_t input_string_len,
-                    uint8_t *output_string, size_t no_of_bytes_to_return)
+static void Hash_df(uint8_t *input_string,
+                    size_t input_string_len,
+                    uint8_t *output_string,
+                    size_t no_of_bytes_to_return)
 {
     uint8_t counter;
     uint8_t temp[round_up(seedlen, outlen)];
@@ -119,7 +121,8 @@ static void Hash_df(uint8_t *input_string, size_t input_string_len,
 static void Hash_DRBG_Instantiate(Hash_DRBG_CTX *ctx,
                                   uint8_t *entropy_input,
                                   size_t entropy_input_len,
-                                  uint8_t *nonce, size_t nonce_len)
+                                  uint8_t *nonce,
+                                  size_t nonce_len)
 {
     uint8_t seed_material[ENTROPY_MAX + NONCE_MAX];
     uint8_t seed0[seedlen + 1];
@@ -162,8 +165,8 @@ static void Hash_DRBG_Reseed(Hash_DRBG_CTX *ctx,
     ctx->reseed_counter = 1;
 }
 
-static void Hashgen(uint8_t *V, uint8_t *output,
-                    size_t requested_number_of_bytes)
+static void
+Hashgen(uint8_t *V, uint8_t *output, size_t requested_number_of_bytes)
 {
     uint8_t data[seedlen];
     uint8_t W[GENERATE_MAX];
@@ -187,7 +190,8 @@ static void Hashgen(uint8_t *V, uint8_t *output,
 }
 
 /* assume additional_input is zero length string */
-static int Hash_DRBG_Generate(Hash_DRBG_CTX *ctx, uint8_t *output,
+static int Hash_DRBG_Generate(Hash_DRBG_CTX *ctx,
+                              uint8_t *output,
                               size_t requested_number_of_bytes)
 {
     uint8_t H[outlen];
@@ -211,14 +215,14 @@ static int Hash_DRBG_Generate(Hash_DRBG_CTX *ctx, uint8_t *output,
     return 0;
 }
 
-#define ENTROPY_ACCUMULATE(ptr, last, type, arg)    \
-do {                                                \
-    type __arg = (type)(arg);                       \
-    if ((char*)ptr + sizeof(__arg) < (char*)last) { \
-        *(type*)ptr = __arg;                        \
-        ptr = (void*)((char*)ptr + sizeof(__arg));  \
-    }                                               \
-} while (0)
+#define ENTROPY_ACCUMULATE(ptr, last, type, arg)          \
+    do {                                                  \
+        type __arg = (type)(arg);                         \
+        if ((char *)ptr + sizeof(__arg) < (char *)last) { \
+            *(type *)ptr = __arg;                         \
+            ptr = (void *)((char *)ptr + sizeof(__arg));  \
+        }                                                 \
+    } while (0)
 
 static void xmpp_rand_reseed(xmpp_rand_t *rand)
 {
@@ -289,25 +293,32 @@ int xmpp_rand(xmpp_rand_t *rand)
     return result;
 }
 
+static void rand_byte2hex(unsigned char byte, char *hex)
+{
+    static const char hex_tbl[16] = {'0', '1', '2', '3', '4', '5', '6', '7',
+                                     '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    hex[0] = hex_tbl[(byte >> 4) & 0x0f];
+    hex[1] = hex_tbl[byte & 0x0f];
+}
+
 void xmpp_rand_nonce(xmpp_rand_t *rand, char *output, size_t len)
 {
     size_t i;
-    size_t rand_len = len / 2;
-#ifndef _MSC_VER
-    unsigned char rand_buf[rand_len];
-#else
-    unsigned char *rand_buf = (unsigned char *)_alloca(rand_len);
-#endif
+    const size_t rand_len = len / 2;
 
-    /* current implementation returns printable HEX representation of
-     * a random buffer, however base64 encoding can be used instead;
-     * the only problem is that base64_encode() allocates memory and
-     * as result can fail.
+    /*
+     * We don't want to use any allocation here, because this function
+     * can't fail. Also we want to avoid VLA.
+     * Current implementation uses half of the output buffer for random buffer
+     * generation and then converts it to HEX representation.
      */
 
-    xmpp_rand_bytes(rand, rand_buf, rand_len);
-    for (i = 0; i < rand_len; ++i) {
-        xmpp_snprintf(output + i * 2, len, "%02x", rand_buf[i]);
-        len -= 2;
+    if (rand_len > 0) {
+        xmpp_rand_bytes(rand, (unsigned char *)output, rand_len);
+        for (i = rand_len; i > 0; --i)
+            rand_byte2hex(output[i - 1], &output[(i - 1) * 2]);
     }
+    if (len > 0)
+        output[len - 1] = '\0';
 }

src/rand.h

@@ -16,8 +16,8 @@
 #ifndef __LIBSTROPHE_RAND_H__
 #define __LIBSTROPHE_RAND_H__
 
-#include <stddef.h>     /* size_t */
-#include "strophe.h"    /* xmpp_ctx_t */
+#include <stddef.h>  /* size_t */
+#include "strophe.h" /* xmpp_ctx_t */
 
 typedef struct _xmpp_rand_t xmpp_rand_t;
 

src/resolver.c

@@ -16,18 +16,26 @@
 #if !defined(_WIN32) && !defined(HAVE_CARES)
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>             /* res_query */
+#include <resolv.h>
 #endif /* _WIN32 && HAVE_CARES */
 
 #ifdef HAVE_CARES
 #include <ares.h>
+/* for select(2) */
+#ifdef _WIN32
+#include <winsock2.h>
+#else /* _WIN32 */
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#endif /* !_WIN32 */
 #endif /* HAVE_CARES */
 
-#include <string.h>             /* strncpy */
+#include <string.h> /* strncpy */
 
 #include "ostypes.h"
 #include "snprintf.h"
-#include "util.h"               /* xmpp_min */
+#include "util.h" /* xmpp_min */
 #include "resolver.h"
 
 #define MESSAGE_HEADER_LEN 12
@@ -44,7 +52,8 @@ static int resolver_ares_srv_lookup_buf(xmpp_ctx_t *ctx,
                                         const unsigned char *buf,
                                         size_t len,
                                         resolver_srv_rr_t **srv_rr_list);
-static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
+static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx,
+                                    const char *fulldomain,
                                     resolver_srv_rr_t **srv_rr_list);
 #endif /* HAVE_CARES */
 
@@ -55,12 +64,14 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
                                        resolver_srv_rr_t **srv_rr_list);
 #endif /* !HAVE_CARES */
 
-#ifdef _WIN32
-static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
+#if defined(_WIN32) && !defined(HAVE_CARES)
+static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx,
+                                     const char *fulldomain,
                                      resolver_srv_rr_t **srv_rr_list);
 static int resolver_win32_srv_query(const char *fulldomain,
-                                    unsigned char *buf, size_t len);
-#endif /* _WIN32 */
+                                    unsigned char *buf,
+                                    size_t len);
+#endif /* _WIN32 && !HAVE_CARES */
 
 /*******************************************************************************
  * Implementation.
@@ -110,8 +121,7 @@ static void resolver_srv_list_sort(resolver_srv_rr_t **srv_rr_list)
              */
             if ((rr_current->priority > rr_next->priority) ||
                 (rr_current->priority == rr_next->priority &&
-                 rr_current->weight < rr_next->weight))
-            {
+                 rr_current->weight < rr_next->weight)) {
                 /* Swap node */
                 swap = 1;
                 if (rr_prev != NULL) {
@@ -137,8 +147,10 @@ static void resolver_srv_list_sort(resolver_srv_rr_t **srv_rr_list)
     *srv_rr_list = rr_head;
 }
 
-int resolver_srv_lookup_buf(xmpp_ctx_t *ctx, const unsigned char *buf,
-                            size_t len, resolver_srv_rr_t **srv_rr_list)
+int resolver_srv_lookup_buf(xmpp_ctx_t *ctx,
+                            const unsigned char *buf,
+                            size_t len,
+                            resolver_srv_rr_t **srv_rr_list)
 {
     int set;
 
@@ -152,8 +164,11 @@ int resolver_srv_lookup_buf(xmpp_ctx_t *ctx, const unsigned char *buf,
     return set;
 }
 
-int resolver_srv_lookup(xmpp_ctx_t *ctx, const char *service, const char *proto,
-                        const char *domain, resolver_srv_rr_t **srv_rr_list)
+int resolver_srv_lookup(xmpp_ctx_t *ctx,
+                        const char *service,
+                        const char *proto,
+                        const char *domain,
+                        resolver_srv_rr_t **srv_rr_list)
 {
 #define RESOLVER_BUF_MAX 65536
     unsigned char *buf;
@@ -164,13 +179,15 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx, const char *service, const char *proto,
     (void)buf;
     (void)len;
 
-    xmpp_snprintf(fulldomain, sizeof(fulldomain),
-                  "_%s._%s.%s", service, proto, domain);
+    xmpp_snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s", service, proto,
+                  domain);
 
     *srv_rr_list = NULL;
 
 #ifdef HAVE_CARES
+
     set = resolver_ares_srv_lookup(ctx, fulldomain, srv_rr_list);
+
 #else /* HAVE_CARES */
 
 #ifdef _WIN32
@@ -185,7 +202,7 @@ int resolver_srv_lookup(xmpp_ctx_t *ctx, const char *service, const char *proto,
 
 #ifdef _WIN32
     len = resolver_win32_srv_query(fulldomain, buf, RESOLVER_BUF_MAX);
-#else /* _WIN32 */
+#else  /* _WIN32 */
     len = res_query(fulldomain, MESSAGE_C_IN, MESSAGE_T_SRV, buf,
                     RESOLVER_BUF_MAX);
 #endif /* _WIN32 */
@@ -251,9 +268,11 @@ static uint8_t message_header_rcode(const struct message_header *header)
  * Returns length of the non-truncated resulting string, may be bigger than
  * name_max.
  */
-static size_t message_name_append_safe(char *name, size_t name_len,
+static size_t message_name_append_safe(char *name,
+                                       size_t name_len,
                                        size_t name_max,
-                                       const char *tail, size_t tail_len)
+                                       const char *tail,
+                                       size_t tail_len)
 {
     size_t copy_len;
 
@@ -266,9 +285,11 @@ static size_t message_name_append_safe(char *name, size_t name_len,
 }
 
 /* Returns length of the compressed name. This is NOT the same as strlen(). */
-static unsigned message_name_get(const unsigned char *buf, size_t buf_len,
+static unsigned message_name_get(const unsigned char *buf,
+                                 size_t buf_len,
                                  unsigned buf_offset,
-                                 char *name, size_t name_max)
+                                 char *name,
+                                 size_t name_max)
 {
     size_t name_len = 0;
     unsigned i = buf_offset;
@@ -276,26 +297,29 @@ static unsigned message_name_get(const unsigned char *buf, size_t buf_len,
     unsigned rc;
     unsigned char label_len;
 
-
     while (1) {
-        if (i >= buf_len) return 0;
+        if (i >= buf_len)
+            return 0;
         label_len = buf[i++];
-        if (label_len == 0) break;
+        if (label_len == 0)
+            break;
 
         /* Label */
         if ((label_len & 0xc0) == 0) {
-            if (i + label_len - 1 >= buf_len) return 0;
+            if (i + label_len - 1 >= buf_len)
+                return 0;
             if (name != NULL) {
                 name_len = message_name_append_safe(name, name_len, name_max,
                                                     (char *)&buf[i], label_len);
-                name_len = message_name_append_safe(name, name_len, name_max,
-                                                    ".", 1);
+                name_len =
+                    message_name_append_safe(name, name_len, name_max, ".", 1);
             }
             i += label_len;
 
-        /* Pointer */
+            /* Pointer */
         } else if ((label_len & 0xc0) == 0xc0) {
-            if (i >= buf_len) return 0;
+            if (i >= buf_len)
+                return 0;
             pointer = (label_len & 0x3f) << 8 | buf[i++];
             if (name != NULL && name_len >= name_max && name_max > 0) {
                 /* We have filled the name buffer. Don't pass it recursively. */
@@ -303,20 +327,22 @@ static unsigned message_name_get(const unsigned char *buf, size_t buf_len,
                 name = NULL;
                 name_max = 0;
             }
-            rc = message_name_get(buf, buf_len, pointer,
-                                  name != NULL ? &name[name_len] : NULL,
-                                  name_max > name_len ? name_max - name_len : 0);
-            if (rc == 0) return 0;
+            rc = message_name_get(
+                buf, buf_len, pointer, name != NULL ? &name[name_len] : NULL,
+                name_max > name_len ? name_max - name_len : 0);
+            if (rc == 0)
+                return 0;
             /* Pointer is always the last. */
             break;
 
-        /* The 10 and 01 combinations are reserved for future use. */
+            /* The 10 and 01 combinations are reserved for future use. */
         } else {
             return 0;
         }
     }
     if (label_len == 0) {
-        if (name_len == 0) name_len = 1;
+        if (name_len == 0)
+            name_len = 1;
         /*
          * At this point name_len is length of the resulting name,
          * including '\0'. This value can be exported to allocate buffer
@@ -334,20 +360,21 @@ static unsigned message_name_get(const unsigned char *buf, size_t buf_len,
     return i - buf_offset;
 }
 
-static unsigned message_name_len(const unsigned char *buf, size_t buf_len,
-                                 unsigned buf_offset)
+static unsigned
+message_name_len(const unsigned char *buf, size_t buf_len, unsigned buf_offset)
 {
     return message_name_get(buf, buf_len, buf_offset, NULL, SIZE_MAX);
 }
 
-#define BUF_OVERFLOW_CHECK(ptr, len) do {         \
-    if ((ptr) >= (len)) {                         \
-        if (*srv_rr_list != NULL)                 \
-            resolver_srv_free(ctx, *srv_rr_list); \
-        *srv_rr_list = NULL;                      \
-        return XMPP_DOMAIN_NOT_FOUND;             \
-    }                                             \
-} while (0)
+#define BUF_OVERFLOW_CHECK(ptr, len)                  \
+    do {                                              \
+        if ((ptr) >= (len)) {                         \
+            if (*srv_rr_list != NULL)                 \
+                resolver_srv_free(ctx, *srv_rr_list); \
+            *srv_rr_list = NULL;                      \
+            return XMPP_DOMAIN_NOT_FOUND;             \
+        }                                             \
+    } while (0)
 
 static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
                                        const unsigned char *buf,
@@ -376,8 +403,7 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
     header.nscount = xmpp_ntohs_ptr(&buf[8]);
     header.arcount = xmpp_ntohs_ptr(&buf[10]);
     if (message_header_qr(&header) != MESSAGE_RESPONSE ||
-        message_header_rcode(&header) != 0)
-    {
+        message_header_rcode(&header) != 0) {
         return XMPP_DOMAIN_NOT_FOUND;
     }
     j = MESSAGE_HEADER_LEN;
@@ -387,7 +413,8 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
         BUF_OVERFLOW_CHECK(j, len);
         name_len = message_name_len(buf, len, j);
         /* error in name format */
-        if (name_len == 0) return XMPP_DOMAIN_NOT_FOUND;
+        if (name_len == 0)
+            return XMPP_DOMAIN_NOT_FOUND;
         j += name_len + 4;
     }
 
@@ -395,7 +422,8 @@ static int resolver_raw_srv_lookup_buf(xmpp_ctx_t *ctx,
         BUF_OVERFLOW_CHECK(j, len);
         name_len = message_name_len(buf, len, j);
         /* error in name format */
-        if (name_len == 0) return XMPP_DOMAIN_NOT_FOUND;
+        if (name_len == 0)
+            return XMPP_DOMAIN_NOT_FOUND;
         j += name_len;
         BUF_OVERFLOW_CHECK(j + 16, len);
         type = xmpp_ntohs_ptr(&buf[j]);
@@ -469,11 +497,13 @@ static int resolver_ares_srv_lookup_buf(xmpp_ctx_t *ctx,
     return *srv_rr_list == NULL ? XMPP_DOMAIN_NOT_FOUND : XMPP_DOMAIN_FOUND;
 }
 
-static void ares_srv_lookup_callback(void *arg, int status, int timeouts,
-                                     unsigned char *buf, int len)
+static void ares_srv_lookup_callback(
+    void *arg, int status, int timeouts, unsigned char *buf, int len)
 {
     struct resolver_ares_ctx *actx = arg;
 
+    (void)timeouts;
+
     if (status != ARES_SUCCESS)
         actx->result = XMPP_DOMAIN_NOT_FOUND;
     else
@@ -481,7 +511,8 @@ static void ares_srv_lookup_callback(void *arg, int status, int timeouts,
                                                     &actx->srv_rr_list);
 }
 
-static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
+static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx,
+                                    const char *fulldomain,
                                     resolver_srv_rr_t **srv_rr_list)
 {
     struct resolver_ares_ctx actx;
@@ -520,7 +551,7 @@ static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
 
 #endif /* HAVE_CARES */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(HAVE_CARES)
 /*******************************************************************************
  * Next part was copied from sock.c and contains old win32 code.
  *
@@ -536,135 +567,138 @@ static int resolver_ares_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windns.h>
-#include <Iphlpapi.h>
+#include <iphlpapi.h>
 
-struct dnsquery_header
-{
-	unsigned short id;
-	unsigned char qr;
-	unsigned char opcode;
-	unsigned char aa;
-	unsigned char tc;
-	unsigned char rd;
-	unsigned char ra;
-	unsigned char z;
-	unsigned char rcode;
-	unsigned short qdcount;
-	unsigned short ancount;
-	unsigned short nscount;
-	unsigned short arcount;
+struct dnsquery_header {
+    unsigned short id;
+    unsigned char qr;
+    unsigned char opcode;
+    unsigned char aa;
+    unsigned char tc;
+    unsigned char rd;
+    unsigned char ra;
+    unsigned char z;
+    unsigned char rcode;
+    unsigned short qdcount;
+    unsigned short ancount;
+    unsigned short nscount;
+    unsigned short arcount;
 };
 
-struct dnsquery_question
-{
-	char qname[1024];
-	unsigned short qtype;
-	unsigned short qclass;
+struct dnsquery_question {
+    char qname[1024];
+    unsigned short qtype;
+    unsigned short qclass;
 };
 
-static void netbuf_add_16bitnum(unsigned char *buf, int buflen, int *offset, unsigned short num)
+static void netbuf_add_16bitnum(unsigned char *buf,
+                                int buflen,
+                                int *offset,
+                                unsigned short num)
 {
-	unsigned char *start = buf + *offset;
-	unsigned char *p = start;
+    unsigned char *start = buf + *offset;
+    unsigned char *p = start;
 
-	/* assuming big endian */
-	*p++ = (num >> 8) & 0xff;
-	*p++ = (num)      & 0xff;
+    /* assuming big endian */
+    *p++ = (num >> 8) & 0xff;
+    *p++ = (num)&0xff;
 
-	*offset += 2;
+    *offset += 2;
 }
 
-static void netbuf_add_domain_name(unsigned char *buf, int buflen, int *offset,
-			    char *name)
+static void
+netbuf_add_domain_name(unsigned char *buf, int buflen, int *offset, char *name)
 {
-	unsigned char *start = buf + *offset;
-	unsigned char *p = start;
-	unsigned char *wordstart, *wordend;
+    unsigned char *start = buf + *offset;
+    unsigned char *p = start;
+    unsigned char *wordstart, *wordend;
 
-	wordstart = (unsigned char *)name;
+    wordstart = (unsigned char *)name;
 
-	while (*wordstart)
-	{
-		int len;
-		wordend = wordstart;
-		while (*wordend && *wordend != '.')
-		{
-			wordend++;
-		}
+    while (*wordstart) {
+        int len;
+        wordend = wordstart;
+        while (*wordend && *wordend != '.') {
+            wordend++;
+        }
 
-		len = (int)(wordend - wordstart);
+        len = (int)(wordend - wordstart);
 
-		if (len > 0x3F)
-		{
-			len = 0x3F;
-		}
+        if (len > 0x3F) {
+            len = 0x3F;
+        }
 
-		*p++ = len;
+        *p++ = len;
 
-		while (wordstart != wordend)
-		{
-			*p++ = *wordstart++;
-		}
+        while (wordstart != wordend) {
+            *p++ = *wordstart++;
+        }
 
-		if (*wordstart == '.')
-		{
-			wordstart++;
-		}
-	}
+        if (*wordstart == '.') {
+            wordstart++;
+        }
+    }
 
-	*p++ = '\0';
+    *p++ = '\0';
 
-	*offset += (int)(p - start);
+    *offset += (int)(p - start);
 }
 
-static void netbuf_add_dnsquery_header(unsigned char *buf, int buflen, int *offset, struct dnsquery_header *header)
+static void netbuf_add_dnsquery_header(unsigned char *buf,
+                                       int buflen,
+                                       int *offset,
+                                       struct dnsquery_header *header)
 {
-	unsigned char *p;
+    unsigned char *p;
 
-	netbuf_add_16bitnum(buf, buflen, offset, header->id);
+    netbuf_add_16bitnum(buf, buflen, offset, header->id);
 
-	p = buf + *offset;
-	*p++ =    ((header->qr     & 0x01) << 7)
-		| ((header->opcode & 0x0F) << 3)
-		| ((header->aa     & 0x01) << 2)
-		| ((header->tc     & 0x01) << 1)
-		| ((header->rd     & 0x01));
-	*p++ =    ((header->ra     & 0x01) << 7)
-		| ((header->z      & 0x07) << 4)
-		| ((header->rcode  & 0x0F));
-	*offset += 2;
+    p = buf + *offset;
+    *p++ = ((header->qr & 0x01) << 7) | ((header->opcode & 0x0F) << 3) |
+           ((header->aa & 0x01) << 2) | ((header->tc & 0x01) << 1) |
+           ((header->rd & 0x01));
+    *p++ = ((header->ra & 0x01) << 7) | ((header->z & 0x07) << 4) |
+           ((header->rcode & 0x0F));
+    *offset += 2;
 
-	netbuf_add_16bitnum(buf, buflen, offset, header->qdcount);
-	netbuf_add_16bitnum(buf, buflen, offset, header->ancount);
-	netbuf_add_16bitnum(buf, buflen, offset, header->nscount);
-	netbuf_add_16bitnum(buf, buflen, offset, header->arcount);
+    netbuf_add_16bitnum(buf, buflen, offset, header->qdcount);
+    netbuf_add_16bitnum(buf, buflen, offset, header->ancount);
+    netbuf_add_16bitnum(buf, buflen, offset, header->nscount);
+    netbuf_add_16bitnum(buf, buflen, offset, header->arcount);
 }
 
-static void netbuf_add_dnsquery_question(unsigned char *buf, int buflen, int *offset, struct dnsquery_question *question)
+static void netbuf_add_dnsquery_question(unsigned char *buf,
+                                         int buflen,
+                                         int *offset,
+                                         struct dnsquery_question *question)
 {
-	netbuf_add_domain_name(buf, buflen, offset, question->qname);
-	netbuf_add_16bitnum(buf, buflen, offset, question->qtype);
-	netbuf_add_16bitnum(buf, buflen, offset, question->qclass);
+    netbuf_add_domain_name(buf, buflen, offset, question->qname);
+    netbuf_add_16bitnum(buf, buflen, offset, question->qtype);
+    netbuf_add_16bitnum(buf, buflen, offset, question->qclass);
 }
 
-static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
+static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx,
+                                     const char *fulldomain,
                                      resolver_srv_rr_t **srv_rr_list)
 {
     resolver_srv_rr_t *rr;
     HINSTANCE hdnsapi = NULL;
 
-    DNS_STATUS (WINAPI * pDnsQuery_A)(PCSTR, WORD, DWORD, PIP4_ARRAY, DNS_RECORDA**, PVOID*);
-    void (WINAPI * pDnsRecordListFree)(DNS_RECORDA*, DNS_FREE_TYPE);
+    DNS_STATUS(WINAPI * pDnsQuery_A)
+    (PCSTR, WORD, DWORD, PIP4_ARRAY, DNS_RECORDA **, PVOID *);
+    void(WINAPI * pDnsRecordListFree)(DNS_RECORDA *, DNS_FREE_TYPE);
 
     if (hdnsapi = LoadLibrary("dnsapi.dll")) {
         pDnsQuery_A = (void *)GetProcAddress(hdnsapi, "DnsQuery_A");
-        pDnsRecordListFree = (void *)GetProcAddress(hdnsapi, "DnsRecordListFree");
+        pDnsRecordListFree =
+            (void *)GetProcAddress(hdnsapi, "DnsRecordListFree");
 
         if (pDnsQuery_A && pDnsRecordListFree) {
             DNS_RECORDA *dnsrecords = NULL;
             DNS_STATUS error;
 
-            error = pDnsQuery_A(fulldomain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &dnsrecords, NULL);
+            error = pDnsQuery_A(fulldomain, DNS_TYPE_SRV, DNS_QUERY_STANDARD,
+                                NULL, &dnsrecords, NULL);
 
             if (error == 0) {
                 DNS_RECORDA *current = dnsrecords;
@@ -696,255 +730,246 @@ static int resolver_win32_srv_lookup(xmpp_ctx_t *ctx, const char *fulldomain,
     return *srv_rr_list != NULL ? XMPP_DOMAIN_FOUND : XMPP_DOMAIN_NOT_FOUND;
 }
 
-static int resolver_win32_srv_query(const char *fulldomain,
-                                    unsigned char *buf, size_t len)
+static int
+resolver_win32_srv_query(const char *fulldomain, unsigned char *buf, size_t len)
 {
     int set = 0;
     int insize = 0;
 
-    /* if dnsapi didn't work/isn't there, try querying the dns server manually */
-    if (!set)
-    {
-	struct dnsquery_header header;
-	struct dnsquery_question question;
-	int offset = 0;
-	int addrlen;
-	sock_t sock;
-	struct sockaddr_in dnsaddr;
-	char dnsserverips[16][256];
-	int numdnsservers = 0;
-	int j;
+    /* if dnsapi didn't work/isn't there, try querying the dns server manually
+     */
+    if (!set) {
+        struct dnsquery_header header;
+        struct dnsquery_question question;
+        int offset = 0;
+        int addrlen;
+        sock_t sock;
+        struct sockaddr_in dnsaddr;
+        char dnsserverips[16][256];
+        int numdnsservers = 0;
+        int j;
 
-	/* Try getting the DNS server ips from GetNetworkParams() in iphlpapi first */
-	if (!numdnsservers)
-	{
-		HINSTANCE hiphlpapi = NULL;
-		DWORD (WINAPI * pGetNetworkParams)(PFIXED_INFO, PULONG);
+        /* Try getting the DNS server ips from GetNetworkParams() in iphlpapi
+         * first */
+        if (!numdnsservers) {
+            HINSTANCE hiphlpapi = NULL;
+            DWORD(WINAPI * pGetNetworkParams)(PFIXED_INFO, PULONG);
 
-		if (hiphlpapi = LoadLibrary("Iphlpapi.dll"))
-		{
-			pGetNetworkParams = (void *)GetProcAddress(hiphlpapi, "GetNetworkParams");
+            if (hiphlpapi = LoadLibrary("Iphlpapi.dll")) {
+                pGetNetworkParams =
+                    (void *)GetProcAddress(hiphlpapi, "GetNetworkParams");
 
-			if (pGetNetworkParams)
-			{
-				FIXED_INFO *fi;
-				ULONG len;
-				DWORD error;
-				char buffer[65535];
+                if (pGetNetworkParams) {
+                    FIXED_INFO *fi;
+                    ULONG len;
+                    DWORD error;
+                    char buffer[65535];
 
-				len = 65535;
-				fi = (FIXED_INFO *)buffer;
+                    len = 65535;
+                    fi = (FIXED_INFO *)buffer;
 
-				if ((error = pGetNetworkParams(fi, &len)) == ERROR_SUCCESS)
-				{
-					IP_ADDR_STRING *pias = &(fi->DnsServerList);
+                    if ((error = pGetNetworkParams(fi, &len)) ==
+                        ERROR_SUCCESS) {
+                        IP_ADDR_STRING *pias = &(fi->DnsServerList);
 
-					while (pias && numdnsservers < 16)
-					{
-                                                strcpy(dnsserverips[numdnsservers++], pias->IpAddress.String);
-						pias = pias->Next;
-					}
-				}
-			}
-		}
-		FreeLibrary(hiphlpapi);
-	}
+                        while (pias && numdnsservers < 16) {
+                            strcpy(dnsserverips[numdnsservers++],
+                                   pias->IpAddress.String);
+                            pias = pias->Next;
+                        }
+                    }
+                }
+            }
+            FreeLibrary(hiphlpapi);
+        }
 
-	/* Next, try getting the DNS server ips from the registry */
-	if (!numdnsservers)
-	{
-		HKEY search;
-		LONG error;
+        /* Next, try getting the DNS server ips from the registry */
+        if (!numdnsservers) {
+            HKEY search;
+            LONG error;
 
-		error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, KEY_READ, &search);
+            error = RegOpenKeyEx(
+                HKEY_LOCAL_MACHINE,
+                "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0,
+                KEY_READ, &search);
 
-		if (error != ERROR_SUCCESS)
-		{
-			error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &search);
-		}
+            if (error != ERROR_SUCCESS) {
+                error = RegOpenKeyEx(
+                    HKEY_LOCAL_MACHINE,
+                    "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0,
+                    KEY_READ, &search);
+            }
 
-		if (error == ERROR_SUCCESS)
-		{
-			char name[512];
-			DWORD len = 512;
+            if (error == ERROR_SUCCESS) {
+                char name[512];
+                DWORD len = 512;
 
-			error = RegQueryValueEx(search, "NameServer", NULL, NULL, (LPBYTE)name, &len);
+                error = RegQueryValueEx(search, "NameServer", NULL, NULL,
+                                        (LPBYTE)name, &len);
 
-			if (error != ERROR_SUCCESS)
-			{
-				error = RegQueryValueEx(search, "DhcpNameServer", NULL, NULL, (LPBYTE)name, &len);
-			}
+                if (error != ERROR_SUCCESS) {
+                    error = RegQueryValueEx(search, "DhcpNameServer", NULL,
+                                            NULL, (LPBYTE)name, &len);
+                }
 
-			if (error == ERROR_SUCCESS)
-			{
-				char *parse = "0123456789.", *start, *end;
-				start = name;
-				end = name;
-				name[len] = '\0';
+                if (error == ERROR_SUCCESS) {
+                    char *parse = "0123456789.", *start, *end;
+                    start = name;
+                    end = name;
+                    name[len] = '\0';
 
-				while (*start && numdnsservers < 16)
-				{
-					while (strchr(parse, *end))
-					{
-						end++;
-					}
+                    while (*start && numdnsservers < 16) {
+                        while (strchr(parse, *end)) {
+                            end++;
+                        }
 
-					strncpy(dnsserverips[numdnsservers++], start, end - start);
+                        strncpy(dnsserverips[numdnsservers++], start,
+                                end - start);
 
-					while (*end && !strchr(parse, *end))
-					{
-						end++;
-					}
+                        while (*end && !strchr(parse, *end)) {
+                            end++;
+                        }
 
-					start = end;
-				}
-			}
-		}
+                        start = end;
+                    }
+                }
+            }
 
-		RegCloseKey(search);
-	}
+            RegCloseKey(search);
+        }
 
-	if (!numdnsservers)
-	{
-		HKEY searchlist;
-		LONG error;
+        if (!numdnsservers) {
+            HKEY searchlist;
+            LONG error;
 
-		error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces", 0, KEY_READ, &searchlist);
+            error = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                                 "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\P"
+                                 "arameters\\Interfaces",
+                                 0, KEY_READ, &searchlist);
 
-		if (error == ERROR_SUCCESS)
-		{
-			unsigned int i;
-			DWORD numinterfaces = 0;
+            if (error == ERROR_SUCCESS) {
+                unsigned int i;
+                DWORD numinterfaces = 0;
 
-			RegQueryInfoKey(searchlist, NULL, NULL, NULL, &numinterfaces, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                RegQueryInfoKey(searchlist, NULL, NULL, NULL, &numinterfaces,
+                                NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-			for (i = 0; i < numinterfaces; i++)
-			{
-				char name[512];
-				DWORD len = 512;
-				HKEY searchentry;
+                for (i = 0; i < numinterfaces; i++) {
+                    char name[512];
+                    DWORD len = 512;
+                    HKEY searchentry;
 
-				RegEnumKeyEx(searchlist, i, (LPTSTR)name, &len, NULL, NULL, NULL, NULL);
+                    RegEnumKeyEx(searchlist, i, (LPTSTR)name, &len, NULL, NULL,
+                                 NULL, NULL);
 
-				if (RegOpenKeyEx(searchlist, name, 0, KEY_READ, &searchentry) == ERROR_SUCCESS)
-				{
-					if (RegQueryValueEx(searchentry, "DhcpNameServer", NULL, NULL, (LPBYTE)name, &len) == ERROR_SUCCESS)
-					{
-						char *parse = "0123456789.", *start, *end;
-						start = name;
-						end = name;
-						name[len] = '\0';
+                    if (RegOpenKeyEx(searchlist, name, 0, KEY_READ,
+                                     &searchentry) == ERROR_SUCCESS) {
+                        if (RegQueryValueEx(searchentry, "DhcpNameServer", NULL,
+                                            NULL, (LPBYTE)name,
+                                            &len) == ERROR_SUCCESS) {
+                            char *parse = "0123456789.", *start, *end;
+                            start = name;
+                            end = name;
+                            name[len] = '\0';
 
-						while (*start && numdnsservers < 16)
-						{
-							while (strchr(parse, *end))
-							{
-								end++;
-							}
+                            while (*start && numdnsservers < 16) {
+                                while (strchr(parse, *end)) {
+                                    end++;
+                                }
 
-							strncpy(dnsserverips[numdnsservers++], start, end - start);
+                                strncpy(dnsserverips[numdnsservers++], start,
+                                        end - start);
 
-							while (*end && !strchr(parse, *end))
-							{
-								end++;
-							}
+                                while (*end && !strchr(parse, *end)) {
+                                    end++;
+                                }
 
-							start = end;
-						}
-					}
-					else if (RegQueryValueEx(searchentry, "NameServer", NULL, NULL, (LPBYTE)name, &len) == ERROR_SUCCESS)
-					{
-						char *parse = "0123456789.", *start, *end;
-						start = name;
-						end = name;
-						name[len] = '\0';
+                                start = end;
+                            }
+                        } else if (RegQueryValueEx(searchentry, "NameServer",
+                                                   NULL, NULL, (LPBYTE)name,
+                                                   &len) == ERROR_SUCCESS) {
+                            char *parse = "0123456789.", *start, *end;
+                            start = name;
+                            end = name;
+                            name[len] = '\0';
 
-						while (*start && numdnsservers < 16)
-						{
-							while (strchr(parse, *end))
-							{
-								end++;
-							}
+                            while (*start && numdnsservers < 16) {
+                                while (strchr(parse, *end)) {
+                                    end++;
+                                }
 
-							strncpy(dnsserverips[numdnsservers++], start, end - start);
+                                strncpy(dnsserverips[numdnsservers++], start,
+                                        end - start);
 
-							while (*end && !strchr(parse, *end))
-							{
-								end++;
-							}
+                                while (*end && !strchr(parse, *end)) {
+                                    end++;
+                                }
 
-							start = end;
-						}
-					}
-					RegCloseKey(searchentry);
-				}
-			}
-			RegCloseKey(searchlist);
-		}
-	}
+                                start = end;
+                            }
+                        }
+                        RegCloseKey(searchentry);
+                    }
+                }
+                RegCloseKey(searchlist);
+            }
+        }
 
-	/* If we have a DNS server, use it */
-	if (numdnsservers)
-	{
-		ULONG nonblocking = 1;
-		int i;
+        /* If we have a DNS server, use it */
+        if (numdnsservers) {
+            ULONG nonblocking = 1;
+            int i;
 
-		memset(&header, 0, sizeof(header));
-		header.id = 12345; /* FIXME: Get a better id here */
-		header.rd = 1;
-		header.qdcount = 1;
+            memset(&header, 0, sizeof(header));
+            header.id = 12345; /* FIXME: Get a better id here */
+            header.rd = 1;
+            header.qdcount = 1;
 
-		netbuf_add_dnsquery_header(buf, (int)len, &offset, &header);
+            netbuf_add_dnsquery_header(buf, (int)len, &offset, &header);
 
-		memset(&question, 0, sizeof(question));
-		strncpy(question.qname, fulldomain, 1024);
-		question.qtype = 33; /* SRV */
-		question.qclass = 1; /* INTERNET! */
+            memset(&question, 0, sizeof(question));
+            strncpy(question.qname, fulldomain, 1024);
+            question.qtype = MESSAGE_T_SRV; /* SRV */
+            question.qclass = MESSAGE_C_IN; /* INTERNET! */
 
-		netbuf_add_dnsquery_question(buf, (int)len, &offset, &question);
+            netbuf_add_dnsquery_question(buf, (int)len, &offset, &question);
 
-		insize = 0;
-		for (i = 0; i < numdnsservers && insize <= 0; i++)
-		{
-			sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-			ioctlsocket(sock, FIONBIO, &nonblocking);
+            insize = 0;
+            for (i = 0; i < numdnsservers && insize <= 0; i++) {
+                sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+                ioctlsocket(sock, FIONBIO, &nonblocking);
 
-			memset(&dnsaddr, 0, sizeof(dnsaddr));
+                memset(&dnsaddr, 0, sizeof(dnsaddr));
 
-			dnsaddr.sin_family      = AF_INET;
-			dnsaddr.sin_port        = htons(53);
-			dnsaddr.sin_addr.s_addr = inet_addr(dnsserverips[i]);
+                dnsaddr.sin_family = AF_INET;
+                dnsaddr.sin_port = htons(53);
+                dnsaddr.sin_addr.s_addr = inet_addr(dnsserverips[i]);
 
-			addrlen = sizeof(dnsaddr);
-			sendto(sock, (char *)buf, offset, 0, (struct sockaddr *)&dnsaddr, addrlen);
-			for (j = 0; j < 50; j++)
-			{
-				insize = recvfrom(sock, (char *)buf, (int)len, 0, (struct sockaddr *)&dnsaddr, &addrlen);
-				if (insize == SOCKET_ERROR)
-				{
-					if (sock_error() == WSAEWOULDBLOCK)
-					{
-						Sleep(100);
-					}
-					else
-					{
-						break;
-					}
-				}
-				else
-				{
-					break;
-				}
-			}
-
-			closesocket(sock);
-		}
-                set = insize > 0;
-	}
+                addrlen = sizeof(dnsaddr);
+                sendto(sock, (char *)buf, offset, 0,
+                       (struct sockaddr *)&dnsaddr, addrlen);
+                for (j = 0; j < 50; j++) {
+                    insize = recvfrom(sock, (char *)buf, (int)len, 0,
+                                      (struct sockaddr *)&dnsaddr, &addrlen);
+                    if (insize == SOCKET_ERROR) {
+                        if (sock_error() == WSAEWOULDBLOCK) {
+                            Sleep(100);
+                        } else {
+                            break;
+                        }
+                    } else {
+                        break;
+                    }
+                }
 
+                closesocket(sock);
+            }
+            set = insize > 0;
+        }
     }
 
     return set ? insize : -1;
 }
 
-#endif /* _WIN32 */
+#endif /* _WIN32 && !HAVE_CARES */

src/resolver.h

@@ -46,8 +46,10 @@ void resolver_shutdown(void);
  *
  *  @return XMPP_DOMAIN_FOUND on success or XMPP_DOMAIN_NOT_FOUND on fail
  */
-int resolver_srv_lookup_buf(xmpp_ctx_t *ctx, const unsigned char *buf,
-                            size_t len, resolver_srv_rr_t **srv_rr_list);
+int resolver_srv_lookup_buf(xmpp_ctx_t *ctx,
+                            const unsigned char *buf,
+                            size_t len,
+                            resolver_srv_rr_t **srv_rr_list);
 /** Resolve SRV record.
  *
  *  @param ctx a Strophe context object
@@ -58,8 +60,11 @@ int resolver_srv_lookup_buf(xmpp_ctx_t *ctx, const unsigned char *buf,
  *
  *  @return XMPP_DOMAIN_FOUND on success or XMPP_DOMAIN_NOT_FOUND on fail
  */
-int resolver_srv_lookup(xmpp_ctx_t *ctx, const char *service, const char *proto,
-                        const char *domain, resolver_srv_rr_t **srv_rr_list);
+int resolver_srv_lookup(xmpp_ctx_t *ctx,
+                        const char *service,
+                        const char *proto,
+                        const char *domain,
+                        resolver_srv_rr_t **srv_rr_list);
 
 /** Release a list returned by resolver_srv_lookup() or
  *  resolver_srv_lookup_buf().

src/sasl.c

@@ -1,7 +1,7 @@
 /* sasl.c
 ** strophe XMPP client library -- SASL authentication helpers
-** 
-** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -21,7 +21,6 @@
 #include "ostypes.h"
 #include "sasl.h"
 #include "md5.h"
-#include "sha1.h"
 #include "scram.h"
 #include "rand.h"
 #include "util.h"
@@ -29,21 +28,21 @@
 /* strtok_s() has appeared in visual studio 2005.
    Use own implementation for older versions. */
 #ifdef _MSC_VER
-# if (_MSC_VER >= 1400)
-# define strtok_r strtok_s
-# else
-# define strtok_r xmpp_strtok_r
-# endif
+#if (_MSC_VER >= 1400)
+#define strtok_r strtok_s
+#else
+#define strtok_r xmpp_strtok_r
+#endif
 #endif /* _MSC_VER */
 
-
 /** generate authentication string for the SASL PLAIN mechanism */
-char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password) {
+char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password)
+{
     size_t idlen, passlen;
     size_t msglen;
     char *result = NULL;
     char *msg;
-    
+
     /* our message is Base64(authzid,\0,authid,\0,password)
        if there is no authzid, that field is left empty */
 
@@ -52,12 +51,12 @@ char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password) {
     msglen = 2 + idlen + passlen;
     msg = xmpp_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);
+        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);
     }
 
     return result;
@@ -72,8 +71,8 @@ static char *_make_string(xmpp_ctx_t *ctx, const char *s, const unsigned len)
 
     result = xmpp_alloc(ctx, len + 1);
     if (result != NULL) {
-	memcpy(result, s, len);
-	result[len] = '\0';
+        memcpy(result, s, len);
+        result[len] = '\0';
     }
     return result;
 }
@@ -86,10 +85,10 @@ static char *_make_quoted(xmpp_ctx_t *ctx, const char *s)
 
     result = xmpp_alloc(ctx, len + 3);
     if (result != NULL) {
-	result[0] = '"';
-	memcpy(result+1, s, len);
-	result[len+1] = '"';
-	result[len+2] = '\0';
+        result[0] = '"';
+        memcpy(result + 1, s, len);
+        result[len + 1] = '"';
+        result[len + 2] = '\0';
     }
     return result;
 }
@@ -104,51 +103,56 @@ 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!");
-	return NULL;
+        xmpp_error(ctx, "SASL", "couldn't Base64 decode challenge!");
+        return NULL;
     }
 
     result = hash_new(ctx, 10, xmpp_free);
     if (result != NULL) {
-	s = text;
-	while (*s != '\0') {
-	    /* skip any leading commas and spaces */
-	    while ((*s == ',') || (*s == ' ')) s++;
-	    /* accumulate a key ending at '=' */
-	    t = s;
-	    while ((*t != '=') && (*t != '\0')) t++;
-	    if (*t == '\0') break; /* bad string */
-	    key = _make_string(ctx, (char *)s, (t-s));
-	    if (key == NULL) break;
+        s = text;
+        while (*s != '\0') {
+            /* skip any leading commas and spaces */
+            while ((*s == ',') || (*s == ' '))
+                s++;
+            /* accumulate a key ending at '=' */
+            t = s;
+            while ((*t != '=') && (*t != '\0'))
+                t++;
+            if (*t == '\0')
+                break; /* bad string */
+            key = _make_string(ctx, (char *)s, (t - s));
+            if (key == NULL)
+                break;
             /* advance our start pointer past the key */
-	    s = t + 1;
-	    t = s;
-	    /* if we see quotes, grab the string in between */
-	    if ((*s == '\'') || (*s == '"')) {
-		t++;
-		while ((*t != *s) && (*t != '\0'))
-		    t++;
-		value = _make_string(ctx, (char *)s+1, (t-s-1));
-		if (*t == *s) {
-		    s = t + 1;
-		} else {
-		    s = t;
-		}
-	    /* otherwise, accumulate a value ending in ',' or '\0' */
-	    } else {
-		while ((*t != ',') && (*t != '\0')) t++;
-		value = _make_string(ctx, (char *)s, (t-s));
-		s = t;
-	    }
-	    if (value == NULL) {
-		xmpp_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);
-	}
+            s = t + 1;
+            t = s;
+            /* if we see quotes, grab the string in between */
+            if ((*s == '\'') || (*s == '"')) {
+                t++;
+                while ((*t != *s) && (*t != '\0'))
+                    t++;
+                value = _make_string(ctx, (char *)s + 1, (t - s - 1));
+                if (*t == *s) {
+                    s = t + 1;
+                } else {
+                    s = t;
+                }
+                /* otherwise, accumulate a value ending in ',' or '\0' */
+            } else {
+                while ((*t != ',') && (*t != '\0'))
+                    t++;
+                value = _make_string(ctx, (char *)s, (t - s));
+                s = t;
+            }
+            if (value == NULL) {
+                xmpp_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);
+        }
     }
     xmpp_free(ctx, text);
 
@@ -162,90 +166,97 @@ static void _digest_to_hex(const char *digest, char *hex)
     const char hexdigit[] = "0123456789abcdef";
 
     for (i = 0; i < 16; i++) {
-	*hex++ = hexdigit[ (digest[i] >> 4) & 0x0F ];
-	*hex++ = hexdigit[ digest[i] & 0x0F ];
+        *hex++ = hexdigit[(digest[i] >> 4) & 0x0F];
+        *hex++ = hexdigit[digest[i] & 0x0F];
     }
 }
 
 /** append 'key="value"' to a buffer, growing as necessary */
-static char *_add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, 
-		      char *buf, int *len, int quote)
+static char *
+_add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
 {
-    int olen,nlen;
+    int olen, nlen;
     int keylen, valuelen;
     const char *value, *qvalue;
     char *c;
 
     /* allocate a zero-length string if necessary */
     if (buf == NULL) {
-	buf = xmpp_alloc(ctx, 1);
-	buf[0] = '\0';
+        buf = xmpp_alloc(ctx, 1);
+        buf[0] = '\0';
     }
-    if (buf == NULL) return NULL;
+    if (buf == NULL)
+        return NULL;
 
     /* get current string length */
     olen = strlen(buf);
     value = hash_get(table, key);
     if (value == NULL) {
-	xmpp_error(ctx, "SASL", "couldn't retrieve value for '%s'", key);
-	value = "";
+        xmpp_error(ctx, "SASL", "couldn't retrieve value for '%s'", key);
+        value = "";
     }
     if (quote) {
-	qvalue = _make_quoted(ctx, value);
+        qvalue = _make_quoted(ctx, value);
     } else {
-	qvalue = value;
+        qvalue = value;
     }
     /* added length is key + '=' + value */
     /*   (+ ',' if we're not the first entry   */
     keylen = strlen(key);
     valuelen = strlen(qvalue);
     nlen = (olen ? 1 : 0) + keylen + 1 + valuelen + 1;
-    buf = xmpp_realloc(ctx, buf, olen+nlen);
+    buf = xmpp_realloc(ctx, buf, olen + nlen);
 
     if (buf != NULL) {
-	c = buf + olen;
-	if (olen) *c++ = ',';
-	memcpy(c, key, keylen); c += keylen;
-	*c++ = '=';
-	memcpy(c, qvalue, valuelen); c += valuelen;
-	*c++ = '\0';
+        c = buf + olen;
+        if (olen)
+            *c++ = ',';
+        memcpy(c, key, keylen);
+        c += keylen;
+        *c++ = '=';
+        memcpy(c, qvalue, valuelen);
+        c += valuelen;
+        *c++ = '\0';
     }
 
-    if (quote) xmpp_free(ctx, (char *)qvalue);
+    if (quote)
+        xmpp_free(ctx, (char *)qvalue);
 
     return buf;
 }
 
 /** generate auth response string for the SASL DIGEST-MD5 mechanism */
-char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
-			const char *jid, const char *password) {
+char *sasl_digest_md5(xmpp_ctx_t *ctx,
+                      const char *challenge,
+                      const char *jid,
+                      const char *password)
+{
     hash_t *table;
     char *result = NULL;
     char *node, *domain, *realm;
     char *value;
     char *response;
-    int rlen;
     struct MD5Context MD5;
     unsigned char digest[16], HA1[16], HA2[16];
     char hex[32];
     char cnonce[13];
 
-    /* our digest response is 
-	Hex( KD( HEX(MD5(A1)),
-	  nonce ':' nc ':' cnonce ':' qop ':' HEX(MD5(A2))
-	))
+    /* our digest response is
+    Hex( KD( HEX(MD5(A1)),
+      nonce ':' nc ':' cnonce ':' qop ':' HEX(MD5(A2))
+    ))
 
        where KD(k, s) = MD5(k ':' s),
-	A1 = MD5( node ':' realm ':' password ) ':' nonce ':' cnonce
-	A2 = "AUTHENTICATE" ':' "xmpp/" domain
+    A1 = MD5( node ':' realm ':' password ) ':' nonce ':' cnonce
+    A2 = "AUTHENTICATE" ':' "xmpp/" domain
 
        If there is an authzid it is ':'-appended to A1 */
 
     /* parse the challenge */
     table = _parse_digest_challenge(ctx, challenge);
     if (table == NULL) {
-	xmpp_error(ctx, "SASL", "couldn't parse digest challenge");
-	return NULL;
+        xmpp_error(ctx, "SASL", "couldn't parse digest challenge");
+        return NULL;
     }
 
     node = xmpp_jid_node(ctx, jid);
@@ -255,8 +266,8 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
        server */
     realm = hash_get(table, "realm");
     if (realm == NULL || strlen(realm) == 0) {
-	hash_add(table, "realm", xmpp_strdup(ctx, domain));
-	realm = hash_get(table, "realm");
+        hash_add(table, "realm", xmpp_strdup(ctx, domain));
+        realm = hash_get(table, "realm");
     }
 
     /* add our response fields */
@@ -268,10 +279,10 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
         hash_add(table, "qop", xmpp_strdup(ctx, "auth"));
     value = xmpp_alloc(ctx, 5 + strlen(domain) + 1);
     memcpy(value, "xmpp/", 5);
-    memcpy(value+5, domain, strlen(domain));
-    value[5+strlen(domain)] = '\0';
+    memcpy(value + 5, domain, strlen(domain));
+    value[5 + strlen(domain)] = '\0';
     hash_add(table, "digest-uri", value);
-    
+
     /* generate response */
 
     /* construct MD5(node : realm : password) */
@@ -304,8 +315,8 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
     value = hash_get(table, "digest-uri");
     MD5Update(&MD5, (unsigned char *)value, strlen(value));
     if (strcmp(hash_get(table, "qop"), "auth") != 0) {
-	MD5Update(&MD5, (unsigned char *)":00000000000000000000000000000000",
-		  33);
+        MD5Update(&MD5, (unsigned char *)":00000000000000000000000000000000",
+                  33);
     }
     MD5Final(digest, &MD5);
 
@@ -332,7 +343,7 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
     MD5Update(&MD5, (unsigned char *)hex, 32);
     MD5Final(digest, &MD5);
 
-    response = xmpp_alloc(ctx, 32+1);
+    response = xmpp_alloc(ctx, 32 + 1);
     _digest_to_hex((char *)digest, hex);
     memcpy(response, hex, 32);
     response[32] = '\0';
@@ -340,17 +351,16 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
 
     /* construct reply */
     result = NULL;
-    rlen = 0;
-    result = _add_key(ctx, table, "username", result, &rlen, 1); 
-    result = _add_key(ctx, table, "realm", result, &rlen, 1); 
-    result = _add_key(ctx, table, "nonce", result, &rlen, 1); 
-    result = _add_key(ctx, table, "cnonce", result, &rlen, 1); 
-    result = _add_key(ctx, table, "nc", result, &rlen, 0); 
-    result = _add_key(ctx, table, "qop", result, &rlen, 0); 
-    result = _add_key(ctx, table, "digest-uri", result, &rlen, 1); 
-    result = _add_key(ctx, table, "response", result, &rlen, 0); 
-    result = _add_key(ctx, table, "charset", result, &rlen, 0);
- 
+    result = _add_key(ctx, table, "username", result, 1);
+    result = _add_key(ctx, table, "realm", result, 1);
+    result = _add_key(ctx, table, "nonce", result, 1);
+    result = _add_key(ctx, table, "cnonce", result, 1);
+    result = _add_key(ctx, table, "nc", result, 0);
+    result = _add_key(ctx, table, "qop", result, 0);
+    result = _add_key(ctx, table, "digest-uri", result, 1);
+    result = _add_key(ctx, table, "response", result, 0);
+    result = _add_key(ctx, table, "charset", result, 0);
+
     xmpp_free(ctx, node);
     xmpp_free(ctx, domain);
     hash_release(table); /* also frees value strings */
@@ -362,13 +372,16 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
     return response;
 }
 
-/** generate auth response string for the SASL SCRAM-SHA-1 mechanism */
-char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
-                      const char *first_bare, const char *jid,
-                      const char *password)
+/** generate auth response string for the SASL SCRAM mechanism */
+char *sasl_scram(xmpp_ctx_t *ctx,
+                 const struct hash_alg *alg,
+                 const char *challenge,
+                 const char *first_bare,
+                 const char *jid,
+                 const char *password)
 {
-    uint8_t key[SHA1_DIGEST_SIZE];
-    uint8_t sign[SHA1_DIGEST_SIZE];
+    uint8_t key[SCRAM_DIGEST_SIZE];
+    uint8_t sign[SCRAM_DIGEST_SIZE];
     char *r = NULL;
     char *s = NULL;
     char *i = NULL;
@@ -385,7 +398,8 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
     char *result = NULL;
     size_t response_len;
     size_t auth_len;
-    int j;
+
+    UNUSED(jid);
 
     tmp = xmpp_strdup(ctx, challenge);
     if (!tmp) {
@@ -420,7 +434,8 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
         goto out_sval;
     }
 
-    response_len = 39 + strlen(r);
+    /* "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);
     if (!response) {
         goto out_auth;
@@ -430,18 +445,17 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
     xmpp_snprintf(auth, auth_len, "%s,%s,%s", first_bare + 3, challenge,
                   response);
 
-    SCRAM_SHA1_ClientKey((uint8_t *)password, strlen(password),
-                         (uint8_t *)sval, sval_len, (uint32_t)ival, key);
-    SCRAM_SHA1_ClientSignature(key, (uint8_t *)auth, strlen(auth), sign);
-    for (j = 0; j < SHA1_DIGEST_SIZE; j++) {
-        sign[j] ^= key[j];
-    }
+    SCRAM_ClientKey(alg, (uint8_t *)password, strlen(password), (uint8_t *)sval,
+                    sval_len, (uint32_t)ival, key);
+    SCRAM_ClientSignature(alg, key, (uint8_t *)auth, strlen(auth), sign);
+    SCRAM_ClientProof(alg, sign, key, sign);
 
-    sign_b64 = xmpp_base64_encode(ctx, sign, sizeof(sign));
+    sign_b64 = xmpp_base64_encode(ctx, sign, alg->digest_size);
     if (!sign_b64) {
         goto out_response;
     }
 
+    /* Check for buffer overflow */
     if (strlen(response) + strlen(sign_b64) + 3 + 1 > response_len) {
         xmpp_free(ctx, sign_b64);
         goto out_response;
@@ -450,8 +464,8 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
     strcat(response, sign_b64);
     xmpp_free(ctx, sign_b64);
 
-    response_b64 = xmpp_base64_encode(ctx, (unsigned char *)response,
-                                      strlen(response));
+    response_b64 =
+        xmpp_base64_encode(ctx, (unsigned char *)response, strlen(response));
     if (!response_b64) {
         goto out_response;
     }

src/sasl.h

@@ -1,7 +1,7 @@
 /* sasl.h
 ** strophe XMPP client library -- SASL authentication helpers
-** 
-** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -17,14 +17,20 @@
 #define __LIBSTROPHE_SASL_H__
 
 #include "strophe.h"
+#include "scram.h"
 
 /** low-level sasl routines */
 
 char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password);
-char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
-		      const char *jid, const char *password);
-char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
-                      const char *first_bare, const char *jid,
+char *sasl_digest_md5(xmpp_ctx_t *ctx,
+                      const char *challenge,
+                      const char *jid,
                       const char *password);
+char *sasl_scram(xmpp_ctx_t *ctx,
+                 const struct hash_alg *alg,
+                 const char *challenge,
+                 const char *first_bare,
+                 const char *jid,
+                 const char *password);
 
 #endif /* _LIBXMPP_SASL_H__ */

src/scram.c

@@ -19,56 +19,103 @@
 #include <assert.h>
 #include <string.h>
 
+#include "common.h"
 #include "sha1.h"
+#include "sha256.h"
+#include "sha512.h"
 #include "ostypes.h"
 
 #include "scram.h"
 
-#define HMAC_BLOCK_SIZE 64
+#define HMAC_BLOCK_SIZE_MAX 128
 
 static const uint8_t ipad = 0x36;
 static const uint8_t opad = 0x5C;
 
-static void crypto_HMAC_SHA1(const uint8_t *key, size_t key_len,
-                             const uint8_t *text, size_t len,
-                             uint8_t *digest)
-{
-    uint8_t key_pad[HMAC_BLOCK_SIZE];
-    uint8_t key_ipad[HMAC_BLOCK_SIZE];
-    uint8_t key_opad[HMAC_BLOCK_SIZE];
-    uint8_t sha_digest[SHA1_DIGEST_SIZE];
-    int i;
-    SHA1_CTX ctx;
+const struct hash_alg scram_sha1 = {
+    "SCRAM-SHA-1",
+    SASL_MASK_SCRAMSHA1,
+    SHA1_DIGEST_SIZE,
+    (void (*)(const uint8_t *, size_t, uint8_t *))crypto_SHA1,
+    (void (*)(void *))crypto_SHA1_Init,
+    (void (*)(void *, const uint8_t *, size_t))crypto_SHA1_Update,
+    (void (*)(void *, uint8_t *))crypto_SHA1_Final};
 
-    memset(key_pad, 0, sizeof(key_pad));
-    if (key_len <= HMAC_BLOCK_SIZE) {
+const struct hash_alg scram_sha256 = {
+    "SCRAM-SHA-256",
+    SASL_MASK_SCRAMSHA256,
+    SHA256_DIGEST_SIZE,
+    (void (*)(const uint8_t *, size_t, uint8_t *))sha256_hash,
+    (void (*)(void *))sha256_init,
+    (void (*)(void *, const uint8_t *, size_t))sha256_process,
+    (void (*)(void *, uint8_t *))sha256_done};
+
+const struct hash_alg scram_sha512 = {
+    "SCRAM-SHA-512",
+    SASL_MASK_SCRAMSHA512,
+    SHA512_DIGEST_SIZE,
+    (void (*)(const uint8_t *, size_t, uint8_t *))sha512_hash,
+    (void (*)(void *))sha512_init,
+    (void (*)(void *, const uint8_t *, size_t))sha512_process,
+    (void (*)(void *, uint8_t *))sha512_done};
+
+union common_hash_ctx {
+    SHA1_CTX sha1;
+    sha256_context sha256;
+    sha512_context sha512;
+};
+
+static void crypto_HMAC(const struct hash_alg *alg,
+                        const uint8_t *key,
+                        size_t key_len,
+                        const uint8_t *text,
+                        size_t len,
+                        uint8_t *digest)
+{
+    uint8_t key_pad[HMAC_BLOCK_SIZE_MAX];
+    uint8_t key_ipad[HMAC_BLOCK_SIZE_MAX];
+    uint8_t key_opad[HMAC_BLOCK_SIZE_MAX];
+    uint8_t sha_digest[SCRAM_DIGEST_SIZE];
+    size_t blocksize;
+    size_t i;
+    union common_hash_ctx ctx;
+
+    assert(alg->digest_size <= HMAC_BLOCK_SIZE_MAX);
+    blocksize = alg->digest_size < 48 ? 64 : 128;
+
+    memset(key_pad, 0, blocksize);
+    if (key_len <= blocksize) {
         memcpy(key_pad, key, key_len);
     } else {
         /* according to RFC2104 */
-        crypto_SHA1(key, key_len, key_pad);
+        alg->hash(key, key_len, key_pad);
     }
 
-    for (i = 0; i < HMAC_BLOCK_SIZE; i++) {
+    for (i = 0; i < blocksize; i++) {
         key_ipad[i] = key_pad[i] ^ ipad;
         key_opad[i] = key_pad[i] ^ opad;
     }
 
-    crypto_SHA1_Init(&ctx);
-    crypto_SHA1_Update(&ctx, key_ipad, HMAC_BLOCK_SIZE);
-    crypto_SHA1_Update(&ctx, text, len);
-    crypto_SHA1_Final(&ctx, sha_digest);
+    alg->init((void *)&ctx);
+    alg->update((void *)&ctx, key_ipad, blocksize);
+    alg->update((void *)&ctx, text, len);
+    alg->final((void *)&ctx, sha_digest);
 
-    crypto_SHA1_Init(&ctx);
-    crypto_SHA1_Update(&ctx, key_opad, HMAC_BLOCK_SIZE);
-    crypto_SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
-    crypto_SHA1_Final(&ctx, digest);
+    alg->init((void *)&ctx);
+    alg->update((void *)&ctx, key_opad, blocksize);
+    alg->update((void *)&ctx, sha_digest, alg->digest_size);
+    alg->final((void *)&ctx, digest);
 }
 
-static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
-                          const uint8_t *salt, size_t salt_len, uint32_t i,
-                          uint8_t *digest)
+static void SCRAM_Hi(const struct hash_alg *alg,
+                     const uint8_t *text,
+                     size_t len,
+                     const uint8_t *salt,
+                     size_t salt_len,
+                     uint32_t i,
+                     uint8_t *digest)
 {
-    int  k;
+    size_t k;
     uint32_t j;
     uint8_t tmp[128];
 
@@ -77,7 +124,7 @@ static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
     /* assume salt + INT(1) isn't longer than sizeof(tmp) */
     assert(salt_len <= sizeof(tmp) - sizeof(int1));
 
-    memset(digest, 0, SHA1_DIGEST_SIZE);
+    memset(digest, 0, alg->digest_size);
     if (i == 0) {
         return;
     }
@@ -86,46 +133,53 @@ static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
     memcpy(&tmp[salt_len], int1, sizeof(int1));
 
     /* 'text' for Hi is a 'key' for HMAC */
-    crypto_HMAC_SHA1(text, len, tmp, salt_len + sizeof(int1), digest);
-    memcpy(tmp, digest, SHA1_DIGEST_SIZE);
+    crypto_HMAC(alg, text, len, tmp, salt_len + sizeof(int1), digest);
+    memcpy(tmp, digest, alg->digest_size);
 
     for (j = 1; j < i; j++) {
-        crypto_HMAC_SHA1(text, len, tmp, SHA1_DIGEST_SIZE, tmp);
-        for (k = 0; k < SHA1_DIGEST_SIZE; k++) {
+        crypto_HMAC(alg, text, len, tmp, alg->digest_size, tmp);
+        for (k = 0; k < alg->digest_size; k++) {
             digest[k] ^= tmp[k];
         }
     }
 }
 
-void SCRAM_SHA1_ClientKey(const uint8_t *password, size_t len,
-                          const uint8_t *salt, size_t salt_len, uint32_t i,
-                          uint8_t *key)
+void SCRAM_ClientKey(const struct hash_alg *alg,
+                     const uint8_t *password,
+                     size_t len,
+                     const uint8_t *salt,
+                     size_t salt_len,
+                     uint32_t i,
+                     uint8_t *key)
 {
-    uint8_t salted[SHA1_DIGEST_SIZE];
+    uint8_t salted[SCRAM_DIGEST_SIZE];
 
     /* XXX: Normalize(password) is omitted */
 
-    SCRAM_SHA1_Hi(password, len, salt, salt_len, i, salted);
-    crypto_HMAC_SHA1(salted, SHA1_DIGEST_SIZE, (uint8_t *)"Client Key",
-                     strlen("Client Key"), key);
+    SCRAM_Hi(alg, password, len, salt, salt_len, i, salted);
+    crypto_HMAC(alg, salted, alg->digest_size, (uint8_t *)"Client Key",
+                strlen("Client Key"), key);
 }
 
-void SCRAM_SHA1_ClientSignature(const uint8_t *ClientKey,
-                                const uint8_t *AuthMessage, size_t len,
-                                uint8_t *sign)
+void SCRAM_ClientSignature(const struct hash_alg *alg,
+                           const uint8_t *ClientKey,
+                           const uint8_t *AuthMessage,
+                           size_t len,
+                           uint8_t *sign)
 {
-    uint8_t stored[SHA1_DIGEST_SIZE];
+    uint8_t stored[SCRAM_DIGEST_SIZE];
 
-    crypto_SHA1(ClientKey, SHA1_DIGEST_SIZE, stored);
-    crypto_HMAC_SHA1(stored, SHA1_DIGEST_SIZE, AuthMessage, len, sign);
+    alg->hash(ClientKey, alg->digest_size, stored);
+    crypto_HMAC(alg, stored, alg->digest_size, AuthMessage, len, sign);
 }
 
-void SCRAM_SHA1_ClientProof(const uint8_t *ClientKey,
-                            const uint8_t *ClientSignature,
-                            uint8_t *proof)
+void SCRAM_ClientProof(const struct hash_alg *alg,
+                       const uint8_t *ClientKey,
+                       const uint8_t *ClientSignature,
+                       uint8_t *proof)
 {
-    int i;
-    for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
+    size_t i;
+    for (i = 0; i < alg->digest_size; i++) {
         proof[i] = ClientKey[i] ^ ClientSignature[i];
     }
 }

src/scram.h

@@ -1,5 +1,5 @@
 /* scram.h
- * strophe XMPP client library -- SCRAM-SHA1 helper functions
+ * strophe XMPP client library -- SCRAM helper functions
  *
  * Copyright (C) 2013 Dmitry Podgorny <pasis.ua@gmail.com>
  *
@@ -10,7 +10,7 @@
  */
 
 /** @file
- *  SCRAM-SHA1 helper functions.
+ *  SCRAM helper functions.
  */
 
 #ifndef __LIBSTROPHE_SCRAM_H__
@@ -19,18 +19,41 @@
 /* make sure the stdint.h types are available */
 #include "ostypes.h"
 
-#include "sha1.h"
+/* Maximum possible digest size. Used for buffers allocation. */
+#include "sha512.h"
+#define SCRAM_DIGEST_SIZE SHA512_DIGEST_SIZE
 
-void SCRAM_SHA1_ClientKey(const uint8_t *password, size_t len,
-                          const uint8_t *salt, size_t salt_len, uint32_t i,
-                          uint8_t *key);
+struct hash_alg {
+    const char *scram_name;
+    int mask;
+    size_t digest_size;
+    void (*hash)(const uint8_t *, size_t, uint8_t *);
+    void (*init)(void *);
+    void (*update)(void *, const uint8_t *, size_t);
+    void (*final)(void *, uint8_t *);
+};
 
-void SCRAM_SHA1_ClientSignature(const uint8_t *ClientKey,
-                                const uint8_t *AuthMessage, size_t len,
-                                uint8_t *sign);
+extern const struct hash_alg scram_sha1;
+extern const struct hash_alg scram_sha256;
+extern const struct hash_alg scram_sha512;
 
-void SCRAM_SHA1_ClientProof(const uint8_t *ClientKey,
-                            const uint8_t *ClientSignature,
-                            uint8_t *proof);
+void SCRAM_ClientKey(const struct hash_alg *alg,
+                     const uint8_t *password,
+                     size_t len,
+                     const uint8_t *salt,
+                     size_t salt_len,
+                     uint32_t i,
+                     uint8_t *key);
+
+void SCRAM_ClientSignature(const struct hash_alg *alg,
+                           const uint8_t *ClientKey,
+                           const uint8_t *AuthMessage,
+                           size_t len,
+                           uint8_t *sign);
+
+void SCRAM_ClientProof(const struct hash_alg *alg,
+                       const uint8_t *ClientKey,
+                       const uint8_t *ClientSignature,
+                       uint8_t *proof);
 
 #endif /* __LIBSTROPHE_SCRAM_H__ */

src/sha.h

@@ -0,0 +1,112 @@
+/* public api for steve reid's public domain SHA-1 implementation */
+/* this file is in the public domain */
+
+/** @file
+ *  SHA-1 hash API.
+ */
+
+#ifndef __LIBSTROPHE_SHA_H__
+#define __LIBSTROPHE_SHA_H__
+
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* make sure the stdint.h types are available */
+#include "ostypes.h"
+
+#if defined(__BIG_ENDIAN__) ||                                   \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+
+#define STORE32H(x, y)      \
+    do {                    \
+        uint32_t __t = (x); \
+        memcpy(y, &__t, 4); \
+    } while (0)
+
+#define LOAD32H(x, y)       \
+    do {                    \
+        memcpy(&(x), y, 4); \
+        x &= 0xFFFFFFFF;    \
+    } while (0)
+
+#define STORE64H(x, y)      \
+    do {                    \
+        uint64_t __t = (x); \
+        memcpy(y, &__t, 8); \
+    } while (0)
+
+#define LOAD64H(x, y)       \
+    do {                    \
+        memcpy(&(x), y, 8); \
+    } while (0)
+
+#elif defined(__LITTLE_ENDIAN__) ||                                 \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+
+#define STORE32H(x, y)                         \
+    do {                                       \
+        (y)[0] = (uint8_t)(((x) >> 24) & 255); \
+        (y)[1] = (uint8_t)(((x) >> 16) & 255); \
+        (y)[2] = (uint8_t)(((x) >> 8) & 255);  \
+        (y)[3] = (uint8_t)((x)&255);           \
+    } while (0)
+
+#define LOAD32H(x, y)                                                     \
+    do {                                                                  \
+        x = ((uint32_t)((y)[0] & 255) << 24) |                            \
+            ((uint32_t)((y)[1] & 255) << 16) |                            \
+            ((uint32_t)((y)[2] & 255) << 8) | ((uint32_t)((y)[3] & 255)); \
+    } while (0)
+
+#define STORE64H(x, y)                         \
+    do {                                       \
+        (y)[0] = (uint8_t)(((x) >> 56) & 255); \
+        (y)[1] = (uint8_t)(((x) >> 48) & 255); \
+        (y)[2] = (uint8_t)(((x) >> 40) & 255); \
+        (y)[3] = (uint8_t)(((x) >> 32) & 255); \
+        (y)[4] = (uint8_t)(((x) >> 24) & 255); \
+        (y)[5] = (uint8_t)(((x) >> 16) & 255); \
+        (y)[6] = (uint8_t)(((x) >> 8) & 255);  \
+        (y)[7] = (uint8_t)((x)&255);           \
+    } while (0)
+
+#define LOAD64H(x, y)                                                         \
+    do {                                                                      \
+        x = (((uint64_t)((y)[0] & 255)) << 56) |                              \
+            (((uint64_t)((y)[1] & 255)) << 48) |                              \
+            (((uint64_t)((y)[2] & 255)) << 40) |                              \
+            (((uint64_t)((y)[3] & 255)) << 32) |                              \
+            (((uint64_t)((y)[4] & 255)) << 24) |                              \
+            (((uint64_t)((y)[5] & 255)) << 16) |                              \
+            (((uint64_t)((y)[6] & 255)) << 8) | (((uint64_t)((y)[7] & 255))); \
+    } while (0)
+
+#else
+#error Unknown endianness not supported
+#endif
+
+#ifdef _MSC_VER
+#define CONST64(n) n##ui64
+#else
+#define CONST64(n) n##ULL
+#endif
+
+#define RORc(x, y)                                           \
+    (((((uint32_t)(x)&0xFFFFFFFFUL) >> (uint32_t)((y)&31)) | \
+      ((uint32_t)(x) << (uint32_t)((32 - ((y)&31)) & 31))) & \
+     0xFFFFFFFFUL)
+#define ROR64c(x, y)                                                       \
+    (((((x)&CONST64(0xFFFFFFFFFFFFFFFF)) >> ((uint64_t)(y)&CONST64(63))) | \
+      ((x) << (((uint64_t)64 - ((y)&63)) & 63))) &                         \
+     CONST64(0xFFFFFFFFFFFFFFFF))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LIBSTROPHE_SHA_H__ */

src/sha1.c

@@ -8,16 +8,16 @@ By Steve Reid <sreid@sea-to-sky.net>
 100% Public Domain
 
 -----------------
-Modified 7/98 
+Modified 7/98
 By James H. Brown <jbrown@burgoyne.com>
 Still 100% Public Domain
 
 Corrected a problem which generated improper hash values on 16 bit machines
 Routine SHA1Update changed from
-	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+    void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
 len)
 to
-	void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+    void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
 long len)
 
 The 'len' parameter was declared an int which works fine on 32 bit machines.
@@ -30,7 +30,7 @@ Since the file IO in main() reads 16K at a time, any file 8K or larger would
 be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
 "a"s).
 
-I also changed the declaration of variables i & j in SHA1Update to 
+I also changed the declaration of variables i & j in SHA1Update to
 unsigned long from unsigned int for the same reason.
 
 These changes should make no difference to any 32 bit implementations since
@@ -57,7 +57,7 @@ Still 100% public domain
 Modified 4/01
 By Saul Kravitz <Saul.Kravitz@celera.com>
 Still 100% PD
-Modified to run on Compaq Alpha hardware.  
+Modified to run on Compaq Alpha hardware.
 
 -----------------
 Modified 07/2002
@@ -75,9 +75,6 @@ move public api to sha1.h
 #include "ostypes.h"
 #include "sha1.h"
 
-/* Don't change user's data */
-#define SHA1HANDSOFF
-
 static uint32_t host_to_be(uint32_t i);
 static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
 
@@ -86,27 +83,38 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
 /* blk0() and blk() perform the initial expand. */
 /* I got the idea of expanding during the round function from SSLeay */
 #define blk0(i) (block->l[i] = host_to_be(block->l[i]))
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
+#define blk(i)                                                                 \
+    (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ \
+                                block->l[(i + 2) & 15] ^ block->l[i & 15],     \
+                            1))
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
+#define R0(v, w, x, y, z, i)                                     \
+    z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
+    w = rol(w, 30);
+#define R1(v, w, x, y, z, i)                                    \
+    z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
+    w = rol(w, 30);
+#define R2(v, w, x, y, z, i)                            \
+    z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); \
+    w = rol(w, 30);
+#define R3(v, w, x, y, z, i)                                          \
+    z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \
+    w = rol(w, 30);
+#define R4(v, w, x, y, z, i)                            \
+    z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \
+    w = rol(w, 30);
 
 static uint32_t host_to_be(uint32_t i)
 {
-#define le_to_be(i) ((rol((i),24) & 0xFF00FF00) | (rol((i),8) & 0x00FF00FF))
-#if defined(__BIG_ENDIAN__) || \
+#define le_to_be(i) ((rol((i), 24) & 0xFF00FF00) | (rol((i), 8) & 0x00FF00FF))
+#if defined(__BIG_ENDIAN__) ||                                   \
     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
     return i;
-#elif defined(__LITTLE_ENDIAN__) || \
-      (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-      __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#elif defined(__LITTLE_ENDIAN__) ||                                 \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
     return le_to_be(i);
 #else /* fallback to run-time check */
     static const union {
@@ -118,6 +126,13 @@ static uint32_t host_to_be(uint32_t i)
 #undef le_to_be
 }
 
+static void *(*volatile SHA1_explicit_memset)(void *, int, size_t) = &memset;
+
+static void SHA1_cleanse(void *p, size_t len)
+{
+    SHA1_explicit_memset(p, 0, len);
+}
+
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
 {
@@ -126,15 +141,11 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
         uint8_t c[64];
         uint32_t l[16];
     } CHAR64LONG16;
-    CHAR64LONG16* block;
+    CHAR64LONG16 *block;
 
-#ifdef SHA1HANDSOFF
     static uint8_t workspace[64];
-    block = (CHAR64LONG16*)workspace;
+    block = (CHAR64LONG16 *)workspace;
     memcpy(block, buffer, 64);
-#else
-    block = (CHAR64LONG16*)buffer;
-#endif
 
     /* Copy context->state[] to working vars */
     a = state[0];
@@ -144,6 +155,7 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
     e = state[4];
 
     /* 4 rounds of 20 operations each. Loop unrolled. */
+    /* clang-format off */
     R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
     R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
     R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
@@ -164,6 +176,7 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
     R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
     R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
     R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* clang-format on */
 
     /* Add the working vars back into context.state[] */
     state[0] += a;
@@ -173,12 +186,15 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
     state[4] += e;
 
     /* Wipe variables */
-    a = b = c = d = e = 0;
+    SHA1_cleanse(&a, sizeof(a));
+    SHA1_cleanse(&b, sizeof(b));
+    SHA1_cleanse(&c, sizeof(c));
+    SHA1_cleanse(&d, sizeof(d));
+    SHA1_cleanse(&e, sizeof(e));
 }
 
-
 /* SHA1Init - Initialize new context */
-void crypto_SHA1_Init(SHA1_CTX* context)
+void crypto_SHA1_Init(SHA1_CTX *context)
 {
     /* SHA1 initialization constants */
     context->state[0] = 0x67452301;
@@ -189,9 +205,9 @@ void crypto_SHA1_Init(SHA1_CTX* context)
     context->count[0] = context->count[1] = 0;
 }
 
-
 /* Run your data through this. */
-void crypto_SHA1_Update(SHA1_CTX* context, const uint8_t* data,
+void crypto_SHA1_Update(SHA1_CTX *context,
+                        const uint8_t *data,
                         const size_t len)
 {
     size_t i, j;
@@ -201,52 +217,49 @@ void crypto_SHA1_Update(SHA1_CTX* context, const uint8_t* data,
         context->count[1]++;
     context->count[1] += (uint32_t)(len >> 29);
     if ((j + len) > 63) {
-        memcpy(&context->buffer[j], data, (i = 64-j));
+        memcpy(&context->buffer[j], data, (i = 64 - j));
         SHA1_Transform(context->state, context->buffer);
-        for ( ; i + 63 < len; i += 64) {
+        for (; i + 63 < len; i += 64) {
             SHA1_Transform(context->state, data + i);
         }
         j = 0;
-    }
-    else i = 0;
+    } else
+        i = 0;
     memcpy(&context->buffer[j], &data[i], len - i);
 }
 
-
 /* Add padding and return the message digest. */
-void crypto_SHA1_Final(SHA1_CTX* context, uint8_t* digest)
+void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest)
 {
     uint32_t i;
-    uint8_t  finalcount[8];
+    uint8_t finalcount[8];
 
     for (i = 0; i < 8; i++) {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >>
+                                         ((3 - (i & 3)) * 8)) &
+                                        255); /* Endian independent */
     }
     crypto_SHA1_Update(context, (uint8_t *)"\200", 1);
     while ((context->count[0] & 504) != 448) {
         crypto_SHA1_Update(context, (uint8_t *)"\0", 1);
     }
-    crypto_SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+    /* Should cause a SHA1_Transform() */
+    crypto_SHA1_Update(context, finalcount, 8);
     for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
-        digest[i] = (uint8_t)
-         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+        digest[i] =
+            (uint8_t)((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
     }
-    
-    /* Wipe variables */
-    i = 0;
-    memset(context->buffer, 0, 64);
-    memset(context->state, 0, 20);
-    memset(context->count, 0, 8);
-    memset(finalcount, 0, 8);	/* SWR */
 
-#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite its own static vars */
+    /* Wipe variables */
+    SHA1_cleanse(context->buffer, 64);
+    SHA1_cleanse(context->state, 20);
+    SHA1_cleanse(context->count, 8);
+    SHA1_cleanse(finalcount, 8); /* SWR */
+
     SHA1_Transform(context->state, context->buffer);
-#endif
 }
 
-
-void crypto_SHA1(const uint8_t* data, size_t len, uint8_t* digest)
+void crypto_SHA1(const uint8_t *data, size_t len, uint8_t *digest)
 {
     SHA1_CTX ctx;
     crypto_SHA1_Init(&ctx);

src/sha1.h

@@ -18,16 +18,17 @@ extern "C" {
 typedef struct {
     uint32_t state[5];
     uint32_t count[2];
-    uint8_t  buffer[64];
+    uint8_t buffer[64];
 } SHA1_CTX;
 
 #define SHA1_DIGEST_SIZE 20
 
-void crypto_SHA1_Init(SHA1_CTX* context);
-void crypto_SHA1_Update(SHA1_CTX* context, const uint8_t* data,
+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_Final(SHA1_CTX* context, uint8_t* digest);
-void crypto_SHA1(const uint8_t* data, size_t len, uint8_t* digest);
+void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest);
+void crypto_SHA1(const uint8_t *data, size_t len, uint8_t *digest);
 
 #ifdef __cplusplus
 }

src/sha256.c

@@ -0,0 +1,210 @@
+/*
+ * Code originally from LibTomCrypt -- Licensed under the Public Domain/WTFPL2.0
+ */
+
+#include "sha256.h"
+#include "sha.h"
+
+/* Various logical functions */
+#define Ch(x, y, z) (z ^ (x & (y ^ z)))
+#define Maj(x, y, z) (((x | y) & z) | (x & y))
+#define S(x, n) RORc((x), (n))
+#define R(x, n) (((x)&0xFFFFFFFFUL) >> (n))
+#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22))
+#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25))
+#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3))
+#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10))
+
+static void sha256_compress(sha256_context *md, const uint8_t *buf)
+{
+    uint32_t S[8], W[64], t0, t1;
+    int i;
+
+    /* copy state into S */
+    for (i = 0; i < 8; i++) {
+        S[i] = md->state[i];
+    }
+
+    /* copy the state into 512-bits into W[0..15] */
+    for (i = 0; i < 16; i++) {
+        LOAD32H(W[i], buf + (4 * i));
+    }
+
+    /* fill W[16..63] */
+    for (i = 16; i < 64; i++) {
+        W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
+    }
+
+    /* Compress */
+#define RND(a, b, c, d, e, f, g, h, i, ki)        \
+    t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i]; \
+    t1 = Sigma0(a) + Maj(a, b, c);                \
+    d += t0;                                      \
+    h = t0 + t1;
+
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 0, 0x428a2f98);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 1, 0x71374491);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 2, 0xb5c0fbcf);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 3, 0xe9b5dba5);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 4, 0x3956c25b);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 5, 0x59f111f1);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 6, 0x923f82a4);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 7, 0xab1c5ed5);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 8, 0xd807aa98);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 9, 0x12835b01);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 10, 0x243185be);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 11, 0x550c7dc3);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 12, 0x72be5d74);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 13, 0x80deb1fe);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 14, 0x9bdc06a7);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 15, 0xc19bf174);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 16, 0xe49b69c1);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 17, 0xefbe4786);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 18, 0x0fc19dc6);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 19, 0x240ca1cc);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 20, 0x2de92c6f);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 21, 0x4a7484aa);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 22, 0x5cb0a9dc);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 23, 0x76f988da);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 24, 0x983e5152);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 25, 0xa831c66d);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 26, 0xb00327c8);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 27, 0xbf597fc7);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 28, 0xc6e00bf3);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 29, 0xd5a79147);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 30, 0x06ca6351);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 31, 0x14292967);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 32, 0x27b70a85);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 33, 0x2e1b2138);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 34, 0x4d2c6dfc);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 35, 0x53380d13);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 36, 0x650a7354);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 37, 0x766a0abb);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 38, 0x81c2c92e);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 39, 0x92722c85);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 40, 0xa2bfe8a1);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 41, 0xa81a664b);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 42, 0xc24b8b70);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 43, 0xc76c51a3);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 44, 0xd192e819);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 45, 0xd6990624);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 46, 0xf40e3585);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 47, 0x106aa070);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 48, 0x19a4c116);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 49, 0x1e376c08);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 50, 0x2748774c);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 51, 0x34b0bcb5);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 52, 0x391c0cb3);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 53, 0x4ed8aa4a);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 54, 0x5b9cca4f);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 55, 0x682e6ff3);
+    RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], 56, 0x748f82ee);
+    RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], 57, 0x78a5636f);
+    RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], 58, 0x84c87814);
+    RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], 59, 0x8cc70208);
+    RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], 60, 0x90befffa);
+    RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], 61, 0xa4506ceb);
+    RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], 62, 0xbef9a3f7);
+    RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], 63, 0xc67178f2);
+
+#undef RND
+
+    /* feedback */
+    for (i = 0; i < 8; i++) {
+        md->state[i] = md->state[i] + S[i];
+    }
+}
+
+void sha256_init(sha256_context *md)
+{
+    md->curlen = 0;
+    md->length = 0;
+    md->state[0] = 0x6A09E667UL;
+    md->state[1] = 0xBB67AE85UL;
+    md->state[2] = 0x3C6EF372UL;
+    md->state[3] = 0xA54FF53AUL;
+    md->state[4] = 0x510E527FUL;
+    md->state[5] = 0x9B05688CUL;
+    md->state[6] = 0x1F83D9ABUL;
+    md->state[7] = 0x5BE0CD19UL;
+}
+
+void sha256_process(sha256_context *md, const uint8_t *in, size_t inlen)
+{
+    size_t n;
+    if (md->curlen > sizeof(md->buf)) {
+        return;
+    }
+    if ((md->length + inlen) < md->length) {
+        return;
+    }
+    while (inlen > 0) {
+        if (md->curlen == 0 && inlen >= 64) {
+            sha256_compress(md, in);
+            md->length += 64 * 8;
+            in += 64;
+            inlen -= 64;
+        } else {
+            n = (((inlen) < ((64 - md->curlen))) ? (inlen)
+                                                 : ((64 - md->curlen)));
+            memcpy(md->buf + md->curlen, in, (size_t)n);
+            md->curlen += n;
+            in += n;
+            inlen -= n;
+            if (md->curlen == 64) {
+                sha256_compress(md, md->buf);
+                md->length += 8 * 64;
+                md->curlen = 0;
+            }
+        }
+    }
+}
+
+void sha256_done(sha256_context *md, uint8_t *out)
+{
+    int i;
+
+    if (md->curlen >= sizeof(md->buf)) {
+        return;
+    }
+
+    /* increase the length of the message */
+    md->length += md->curlen * 8;
+
+    /* append the '1' bit */
+    md->buf[md->curlen++] = (uint8_t)0x80;
+
+    /* if the length is currently above 56 bytes we append zeros
+     * then compress.  Then we can fall back to padding zeros and length
+     * encoding like normal.
+     */
+    if (md->curlen > 56) {
+        while (md->curlen < 64) {
+            md->buf[md->curlen++] = (uint8_t)0;
+        }
+        sha256_compress(md, md->buf);
+        md->curlen = 0;
+    }
+
+    /* pad upto 56 bytes of zeroes */
+    while (md->curlen < 56) {
+        md->buf[md->curlen++] = (uint8_t)0;
+    }
+
+    /* store length */
+    STORE64H(md->length, md->buf + 56);
+    sha256_compress(md, md->buf);
+
+    /* copy output */
+    for (i = 0; i < 8; i++) {
+        STORE32H(md->state[i], out + (4 * i));
+    }
+}
+
+void sha256_hash(const uint8_t *data, size_t len, uint8_t *digest)
+{
+    sha256_context md;
+    sha256_init(&md);
+    sha256_process(&md, data, len);
+    sha256_done(&md, digest);
+}

src/sha256.h

@@ -0,0 +1,34 @@
+/* public api for LibTomCrypt SHA-256 implementation */
+
+/** @file
+ *  SHA-256 hash API.
+ */
+
+#ifndef __LIBSTROPHE_SHA256_H__
+#define __LIBSTROPHE_SHA256_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* make sure the stdint.h types are available */
+#include "ostypes.h"
+
+typedef struct {
+    uint64_t length;
+    uint32_t state[8], curlen;
+    uint8_t buf[64];
+} sha256_context;
+
+#define SHA256_DIGEST_SIZE 32
+
+void sha256_init(sha256_context *md);
+void sha256_process(sha256_context *md, const uint8_t *in, size_t inlen);
+void sha256_done(sha256_context *md, uint8_t *out);
+
+void sha256_hash(const uint8_t *data, size_t len, uint8_t *digest);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LIBSTROPHE_SHA256_H__ */

src/sha512.c

@@ -0,0 +1,201 @@
+/*
+ * Code originally from LibTomCrypt -- Licensed under the Public Domain/WTFPL2.0
+ */
+
+#include "sha512.h"
+#include "sha.h"
+
+/* the K array */
+static const uint64_t K[80] = {
+    CONST64(0x428a2f98d728ae22), CONST64(0x7137449123ef65cd),
+    CONST64(0xb5c0fbcfec4d3b2f), CONST64(0xe9b5dba58189dbbc),
+    CONST64(0x3956c25bf348b538), CONST64(0x59f111f1b605d019),
+    CONST64(0x923f82a4af194f9b), CONST64(0xab1c5ed5da6d8118),
+    CONST64(0xd807aa98a3030242), CONST64(0x12835b0145706fbe),
+    CONST64(0x243185be4ee4b28c), CONST64(0x550c7dc3d5ffb4e2),
+    CONST64(0x72be5d74f27b896f), CONST64(0x80deb1fe3b1696b1),
+    CONST64(0x9bdc06a725c71235), CONST64(0xc19bf174cf692694),
+    CONST64(0xe49b69c19ef14ad2), CONST64(0xefbe4786384f25e3),
+    CONST64(0x0fc19dc68b8cd5b5), CONST64(0x240ca1cc77ac9c65),
+    CONST64(0x2de92c6f592b0275), CONST64(0x4a7484aa6ea6e483),
+    CONST64(0x5cb0a9dcbd41fbd4), CONST64(0x76f988da831153b5),
+    CONST64(0x983e5152ee66dfab), CONST64(0xa831c66d2db43210),
+    CONST64(0xb00327c898fb213f), CONST64(0xbf597fc7beef0ee4),
+    CONST64(0xc6e00bf33da88fc2), CONST64(0xd5a79147930aa725),
+    CONST64(0x06ca6351e003826f), CONST64(0x142929670a0e6e70),
+    CONST64(0x27b70a8546d22ffc), CONST64(0x2e1b21385c26c926),
+    CONST64(0x4d2c6dfc5ac42aed), CONST64(0x53380d139d95b3df),
+    CONST64(0x650a73548baf63de), CONST64(0x766a0abb3c77b2a8),
+    CONST64(0x81c2c92e47edaee6), CONST64(0x92722c851482353b),
+    CONST64(0xa2bfe8a14cf10364), CONST64(0xa81a664bbc423001),
+    CONST64(0xc24b8b70d0f89791), CONST64(0xc76c51a30654be30),
+    CONST64(0xd192e819d6ef5218), CONST64(0xd69906245565a910),
+    CONST64(0xf40e35855771202a), CONST64(0x106aa07032bbd1b8),
+    CONST64(0x19a4c116b8d2d0c8), CONST64(0x1e376c085141ab53),
+    CONST64(0x2748774cdf8eeb99), CONST64(0x34b0bcb5e19b48a8),
+    CONST64(0x391c0cb3c5c95a63), CONST64(0x4ed8aa4ae3418acb),
+    CONST64(0x5b9cca4f7763e373), CONST64(0x682e6ff3d6b2b8a3),
+    CONST64(0x748f82ee5defb2fc), CONST64(0x78a5636f43172f60),
+    CONST64(0x84c87814a1f0ab72), CONST64(0x8cc702081a6439ec),
+    CONST64(0x90befffa23631e28), CONST64(0xa4506cebde82bde9),
+    CONST64(0xbef9a3f7b2c67915), CONST64(0xc67178f2e372532b),
+    CONST64(0xca273eceea26619c), CONST64(0xd186b8c721c0c207),
+    CONST64(0xeada7dd6cde0eb1e), CONST64(0xf57d4f7fee6ed178),
+    CONST64(0x06f067aa72176fba), CONST64(0x0a637dc5a2c898a6),
+    CONST64(0x113f9804bef90dae), CONST64(0x1b710b35131c471b),
+    CONST64(0x28db77f523047d84), CONST64(0x32caab7b40c72493),
+    CONST64(0x3c9ebe0a15c9bebc), CONST64(0x431d67c49c100d4c),
+    CONST64(0x4cc5d4becb3e42b6), CONST64(0x597f299cfc657e2a),
+    CONST64(0x5fcb6fab3ad6faec), CONST64(0x6c44198c4a475817)};
+
+/* Various logical functions */
+#define Ch(x, y, z) (z ^ (x & (y ^ z)))
+#define Maj(x, y, z) (((x | y) & z) | (x & y))
+#define S(x, n) ROR64c(x, n)
+#define R(x, n) (((x)&CONST64(0xFFFFFFFFFFFFFFFF)) >> ((uint64_t)n))
+#define Sigma0(x) (S(x, 28) ^ S(x, 34) ^ S(x, 39))
+#define Sigma1(x) (S(x, 14) ^ S(x, 18) ^ S(x, 41))
+#define Gamma0(x) (S(x, 1) ^ S(x, 8) ^ R(x, 7))
+#define Gamma1(x) (S(x, 19) ^ S(x, 61) ^ R(x, 6))
+
+/* compress 1024-bits */
+static void sha512_compress(sha512_context *md, const uint8_t *buf)
+{
+    uint64_t S[8], W[80], t0, t1;
+    int i;
+
+    /* copy state into S */
+    for (i = 0; i < 8; i++) {
+        S[i] = md->state[i];
+    }
+
+    /* copy the state into 1024-bits into W[0..15] */
+    for (i = 0; i < 16; i++) {
+        LOAD64H(W[i], buf + (8 * i));
+    }
+
+    /* fill W[16..79] */
+    for (i = 16; i < 80; i++) {
+        W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
+    }
+
+    /* Compress */
+#define RND(a, b, c, d, e, f, g, h, i)              \
+    t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \
+    t1 = Sigma0(a) + Maj(a, b, c);                  \
+    d += t0;                                        \
+    h = t0 + t1;
+
+    for (i = 0; i < 80; i += 8) {
+        RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i + 0);
+        RND(S[7], S[0], S[1], S[2], S[3], S[4], S[5], S[6], i + 1);
+        RND(S[6], S[7], S[0], S[1], S[2], S[3], S[4], S[5], i + 2);
+        RND(S[5], S[6], S[7], S[0], S[1], S[2], S[3], S[4], i + 3);
+        RND(S[4], S[5], S[6], S[7], S[0], S[1], S[2], S[3], i + 4);
+        RND(S[3], S[4], S[5], S[6], S[7], S[0], S[1], S[2], i + 5);
+        RND(S[2], S[3], S[4], S[5], S[6], S[7], S[0], S[1], i + 6);
+        RND(S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[0], i + 7);
+    }
+
+    /* feedback */
+    for (i = 0; i < 8; i++) {
+        md->state[i] = md->state[i] + S[i];
+    }
+}
+
+void sha512_init(sha512_context *md)
+{
+    md->curlen = 0;
+    md->length = 0;
+    md->state[0] = CONST64(0x6a09e667f3bcc908);
+    md->state[1] = CONST64(0xbb67ae8584caa73b);
+    md->state[2] = CONST64(0x3c6ef372fe94f82b);
+    md->state[3] = CONST64(0xa54ff53a5f1d36f1);
+    md->state[4] = CONST64(0x510e527fade682d1);
+    md->state[5] = CONST64(0x9b05688c2b3e6c1f);
+    md->state[6] = CONST64(0x1f83d9abfb41bd6b);
+    md->state[7] = CONST64(0x5be0cd19137e2179);
+}
+
+void sha512_process(sha512_context *md, const uint8_t *in, size_t inlen)
+{
+    size_t n;
+    if (md->curlen > sizeof(md->buf)) {
+        return;
+    }
+    if ((md->length + inlen) < md->length) {
+        return;
+    }
+    while (inlen > 0) {
+        if (md->curlen == 0 && inlen >= 128) {
+            sha512_compress(md, in);
+            md->length += 128 * 8;
+            in += 128;
+            inlen -= 128;
+        } else {
+            n = (((inlen) < ((128u - md->curlen))) ? (inlen)
+                                                   : ((128u - md->curlen)));
+            memcpy(md->buf + md->curlen, in, (size_t)n);
+            md->curlen += n;
+            in += n;
+            inlen -= n;
+            if (md->curlen == 128) {
+                sha512_compress(md, md->buf);
+                md->length += 8 * 128;
+                md->curlen = 0;
+            }
+        }
+    }
+}
+
+void sha512_done(sha512_context *md, uint8_t *out)
+{
+    int i;
+
+    if (md->curlen >= sizeof(md->buf)) {
+        return;
+    }
+
+    /* increase the length of the message */
+    md->length += md->curlen * CONST64(8);
+
+    /* append the '1' bit */
+    md->buf[md->curlen++] = (uint8_t)0x80;
+
+    /* if the length is currently above 112 bytes we append zeros
+     * then compress.  Then we can fall back to padding zeros and length
+     * encoding like normal.
+     */
+    if (md->curlen > 112) {
+        while (md->curlen < 128) {
+            md->buf[md->curlen++] = (uint8_t)0;
+        }
+        sha512_compress(md, md->buf);
+        md->curlen = 0;
+    }
+
+    /* pad upto 120 bytes of zeroes
+     * note: that from 112 to 120 is the 64 MSB of the length.  We assume that
+     * you won't hash > 2^64 bits of data... :-)
+     */
+    while (md->curlen < 120) {
+        md->buf[md->curlen++] = (uint8_t)0;
+    }
+
+    /* store length */
+    STORE64H(md->length, md->buf + 120);
+    sha512_compress(md, md->buf);
+
+    /* copy output */
+    for (i = 0; i < 8; i++) {
+        STORE64H(md->state[i], out + (8 * i));
+    }
+}
+
+void sha512_hash(const uint8_t *data, size_t len, uint8_t *digest)
+{
+    sha512_context md;
+    sha512_init(&md);
+    sha512_process(&md, data, len);
+    sha512_done(&md, digest);
+}

src/sha512.h

@@ -0,0 +1,34 @@
+/* public api for LibTomCrypt SHA-512 implementation */
+
+/** @file
+ *  SHA-512 hash API.
+ */
+
+#ifndef __LIBSTROPHE_SHA512_H__
+#define __LIBSTROPHE_SHA512_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* make sure the stdint.h types are available */
+#include "ostypes.h"
+
+typedef struct {
+    uint64_t length, state[8];
+    uint8_t curlen;
+    uint8_t buf[128];
+} sha512_context;
+
+#define SHA512_DIGEST_SIZE 64
+
+void sha512_init(sha512_context *cc);
+void sha512_process(sha512_context *cc, const uint8_t *data, size_t len);
+void sha512_done(sha512_context *cc, uint8_t *dst);
+
+void sha512_hash(const uint8_t *data, size_t len, uint8_t *digest);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LIBSTROPHE_SHA512_H__ */

src/sock.c

@@ -1,7 +1,7 @@
 /* sock.c
 ** strophe XMPP client library -- socket abstraction implementation
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -21,8 +21,8 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <Iphlpapi.h>
-#include <Mstcpip.h>    /* tcp_keepalive */
+#include <iphlpapi.h>
+#include <mstcpip.h> /* tcp_keepalive */
 #else
 #include <errno.h>
 #include <unistd.h>
@@ -33,17 +33,9 @@
 #include <fcntl.h>
 #endif
 
-#include "common.h"
 #include "sock.h"
 #include "snprintf.h"
 
-struct _xmpp_sock_t {
-    xmpp_ctx_t *ctx;
-    struct addrinfo *ainfo_list;
-    struct addrinfo *current;
-    sock_t sock;
-};
-
 void sock_initialize(void)
 {
 #ifdef _WIN32
@@ -77,23 +69,13 @@ static int _in_progress(int error)
 #endif
 }
 
-xmpp_sock_t *sock_new(xmpp_ctx_t *ctx, const char *host, unsigned short port)
+sock_t sock_connect(const char *const host, const unsigned short port)
 {
-    xmpp_sock_t *xsock;
+    sock_t sock;
     char service[6];
-    struct addrinfo hints;
+    struct addrinfo *res, *ainfo, hints;
     int err;
 
-    xsock = xmpp_alloc(ctx, sizeof *xsock);
-    if (xsock == NULL) {
-        xmpp_error(ctx, "sock", "Memory allocation error.");
-        return NULL;
-    }
-    xsock->ctx = ctx;
-    xsock->ainfo_list = NULL;
-    xsock->current = NULL;
-    xsock->sock = -1;
-
     xmpp_snprintf(service, 6, "%u", port);
 
     memset(&hints, 0, sizeof(struct addrinfo));
@@ -104,33 +86,11 @@ xmpp_sock_t *sock_new(xmpp_ctx_t *ctx, const char *host, unsigned short port)
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_socktype = SOCK_STREAM;
 
-    err = getaddrinfo(host, service, &hints, &xsock->ainfo_list);
-    if (err != 0) {
-        xmpp_free(ctx, xsock);
-        xsock = NULL;
-    }
-    return xsock;
-}
+    err = getaddrinfo(host, service, &hints, &res);
+    if (err != 0)
+        return -1;
 
-void sock_free(xmpp_sock_t *xsock)
-{
-    if (xsock->ainfo_list != NULL)
-        freeaddrinfo(xsock->ainfo_list);
-    xmpp_free(xsock->ctx, xsock);
-}
-
-sock_t sock_connect(xmpp_sock_t *xsock)
-{
-    struct addrinfo *ainfo;
-    sock_t sock = -1;
-    int err;
-
-    if (xsock->current == NULL)
-        ainfo = xsock->ainfo_list;
-    else
-        ainfo = xsock->current->ai_next;
-
-    for (; ainfo != NULL; ainfo = ainfo->ai_next) {
+    for (ainfo = res; ainfo != NULL; ainfo = ainfo->ai_next) {
         sock = socket(ainfo->ai_family, ainfo->ai_socktype, ainfo->ai_protocol);
         if (sock < 0)
             continue;
@@ -143,13 +103,9 @@ sock_t sock_connect(xmpp_sock_t *xsock)
         }
         sock_close(sock);
     }
+    freeaddrinfo(res);
+    sock = ainfo == NULL ? -1 : sock;
 
-    xsock->sock = sock;
-    xsock->current = ainfo;
-    if (ainfo == NULL) {
-        freeaddrinfo(xsock->ainfo_list);
-        xsock->ainfo_list = NULL;
-    }
     return sock;
 }
 
@@ -167,7 +123,8 @@ int sock_set_keepalive(const sock_t sock, int timeout, int interval)
     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);
+    ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &ka, sizeof(ka), NULL, 0, &dw,
+                   NULL, NULL);
 #else
     ret = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval));
     if (ret < 0)
@@ -175,15 +132,19 @@ int sock_set_keepalive(const sock_t sock, int timeout, int interval)
 
     if (optval) {
 #ifdef TCP_KEEPIDLE
-        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &timeout, sizeof(timeout));
+        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));
+        /* 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));
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &interval,
+                         sizeof(interval));
         if (ret < 0)
             return ret;
 #endif /* TCP_KEEPINTVL */
@@ -229,12 +190,12 @@ int sock_set_nonblocking(const 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(const sock_t sock, void *const buff, const 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(const sock_t sock, const void *const buff, const size_t len)
 {
     return send(sock, buff, len, 0);
 }
@@ -242,7 +203,7 @@ int sock_write(const sock_t sock, const void * const buff, const size_t len)
 int sock_is_recoverable(const int error)
 {
 #ifdef _WIN32
-    return (error == WSAEINTR || error == WSAEWOULDBLOCK || 
+    return (error == WSAEINTR || error == WSAEWOULDBLOCK ||
             error == WSAEINPROGRESS);
 #else
     return (error == EAGAIN || error == EINTR);
@@ -251,27 +212,29 @@ int sock_is_recoverable(const int error)
 
 int sock_connect_error(const sock_t sock)
 {
-    struct sockaddr sa;
+    struct sockaddr_storage ss;
+    struct sockaddr *sa = (struct sockaddr *)&ss;
     socklen_t len;
     char temp;
 
-    memset(&sa, 0, sizeof(sa));
-    sa.sa_family = AF_UNSPEC;
-    len = sizeof(sa);
+    memset(&ss, 0, sizeof(ss));
+    len = sizeof(ss);
+    sa->sa_family = AF_UNSPEC;
 
     /* we don't actually care about the peer name, we're just checking if
      * we're connected or not */
-    if (getpeername(sock, &sa, &len) == 0)
-    {
+    if (getpeername(sock, sa, &len) == 0) {
         return 0;
     }
 
     /* it's possible that the error wasn't ENOTCONN, so if it wasn't,
      * return that */
 #ifdef _WIN32
-    if (sock_error() != WSAENOTCONN) return sock_error();
+    if (sock_error() != WSAENOTCONN)
+        return sock_error();
 #else
-    if (sock_error() != ENOTCONN) return sock_error();
+    if (sock_error() != ENOTCONN)
+        return sock_error();
 #endif
 
     /* load the correct error into errno through error slippage */

src/sock.h

@@ -1,7 +1,7 @@
 /* sock.h
 ** strophe XMPP client library -- socket abstraction header
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -25,22 +25,18 @@ typedef int sock_t;
 typedef SOCKET sock_t;
 #endif
 
-typedef struct _xmpp_sock_t xmpp_sock_t;
-
 void sock_initialize(void);
 void sock_shutdown(void);
 
 int sock_error(void);
 
-xmpp_sock_t *sock_new(xmpp_ctx_t *ctx, const char *host, unsigned short port);
-void sock_free(xmpp_sock_t *xsock);
-sock_t sock_connect(xmpp_sock_t *xsock);
+sock_t sock_connect(const char *const host, const unsigned short port);
 int sock_close(const 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_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);
 /* checks for an error after connect, return 0 if connect successful */
 int sock_connect_error(const sock_t sock);

src/tls.h

@@ -1,7 +1,7 @@
 /* tls.h
 ** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -35,8 +35,8 @@ 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 *const buff, const size_t len);
+int tls_write(tls_t *tls, const void *const buff, const size_t len);
 
 int tls_clear_pending_write(tls_t *tls);
 int tls_is_recoverable(int error);

src/tls_dummy.c

@@ -1,7 +1,7 @@
 /* tls_dummy.c
 ** strophe XMPP client library -- TLS abstraction dummy impl.
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -35,57 +35,73 @@ void tls_shutdown(void)
 
 tls_t *tls_new(xmpp_conn_t *conn)
 {
+    UNUSED(conn);
     /* always fail */
     return NULL;
 }
 
 void tls_free(tls_t *tls)
 {
+    UNUSED(tls);
     return;
 }
 
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
+    UNUSED(tls);
+    UNUSED(cafilename);
     return -1;
 }
 
 int tls_start(tls_t *tls)
 {
+    UNUSED(tls);
     return -1;
 }
 
 int tls_stop(tls_t *tls)
 {
+    UNUSED(tls);
     return -1;
 }
 
 int tls_error(tls_t *tls)
 {
+    UNUSED(tls);
     /* todo: some kind of error polling/dump */
     return 0;
 }
 
 int tls_pending(tls_t *tls)
 {
+    UNUSED(tls);
     return 0;
 }
 
-int tls_read(tls_t *tls, void * const buff, const size_t len)
+int tls_read(tls_t *tls, void *const buff, const size_t len)
 {
+    UNUSED(tls);
+    UNUSED(buff);
+    UNUSED(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 *const buff, const size_t len)
 {
+    UNUSED(tls);
+    UNUSED(buff);
+    UNUSED(len);
     return -1;
 }
 
 int tls_clear_pending_write(tls_t *tls)
 {
+    UNUSED(tls);
     return -1;
 }
 
 int tls_is_recoverable(int error)
 {
+    UNUSED(error);
     return 0;
 }

src/tls_gnutls.c

@@ -1,7 +1,7 @@
 /* tls.c
 ** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -79,8 +79,8 @@ int tls_set_credentials(tls_t *tls, const char *cafilename)
     int err;
 
     /* set trusted credentials -- takes a .pem filename */
-    err = gnutls_certificate_set_x509_trust_file(tls->cred,
-            cafilename, GNUTLS_X509_FMT_PEM);
+    err = gnutls_certificate_set_x509_trust_file(tls->cred, cafilename,
+                                                 GNUTLS_X509_FMT_PEM);
     if (err >= 0) {
         err = gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE,
                                      tls->cred);
@@ -117,10 +117,10 @@ int tls_is_recoverable(int error)
 
 int tls_pending(tls_t *tls)
 {
-    return gnutls_record_check_pending (tls->session);
+    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 *const buff, const size_t len)
 {
     int ret;
 
@@ -130,7 +130,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 *const buff, const size_t len)
 {
     int ret;
 
@@ -142,5 +142,6 @@ int tls_write(tls_t *tls, const void * const buff, const size_t len)
 
 int tls_clear_pending_write(tls_t *tls)
 {
+    UNUSED(tls);
     return 0;
 }

src/tls_openssl.c

@@ -1,7 +1,7 @@
 /* tls_openssl.c
 ** strophe XMPP client library -- TLS abstraction openssl impl.
 **
-** Copyright (C) 2005-008 Collecta, Inc. 
+** Copyright (C) 2005-008 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -13,7 +13,7 @@
  *  TLS implementation with OpenSSL.
  */
 
-#include <errno.h>   /* EINTR */
+#include <errno.h> /* EINTR */
 #include <string.h>
 
 #ifndef _WIN32
@@ -39,11 +39,11 @@
 #if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
 #undef OPENSSL_VERSION_NUMBER
 #if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
-#define OPENSSL_VERSION_NUMBER  0x1010000fL
+#define OPENSSL_VERSION_NUMBER 0x1010000fL
 #elif (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-#define OPENSSL_VERSION_NUMBER  0x1000200fL
+#define OPENSSL_VERSION_NUMBER 0x1000200fL
 #else
-#define OPENSSL_VERSION_NUMBER  0x1000107fL
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
 #endif
 #endif
 
@@ -62,10 +62,119 @@ enum {
 };
 
 static void _tls_sock_wait(tls_t *tls, int error);
+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);
 
+#define TLS_ERROR_STR(error, table) \
+    _tls_error_str(error, table, ARRAY_SIZE(table))
+
+#define TLS_ERROR_FIELD(x) [x] = #x
+const char *tls_errors[] = {
+    TLS_ERROR_FIELD(SSL_ERROR_NONE),
+    TLS_ERROR_FIELD(SSL_ERROR_SSL),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_READ),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_WRITE),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_X509_LOOKUP),
+    TLS_ERROR_FIELD(SSL_ERROR_SYSCALL),
+    TLS_ERROR_FIELD(SSL_ERROR_ZERO_RETURN),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_CONNECT),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_ACCEPT),
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_ASYNC),
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_ASYNC_JOB),
+#endif
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+    TLS_ERROR_FIELD(SSL_ERROR_WANT_CLIENT_HELLO_CB),
+#endif
+};
+const char *cert_errors[] = {
+    TLS_ERROR_FIELD(X509_V_OK),
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    TLS_ERROR_FIELD(X509_V_ERR_UNSPECIFIED),
+#endif
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_GET_CRL),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_SIGNATURE_FAILURE),
+    TLS_ERROR_FIELD(X509_V_ERR_CRL_SIGNATURE_FAILURE),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_NOT_YET_VALID),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_HAS_EXPIRED),
+    TLS_ERROR_FIELD(X509_V_ERR_CRL_NOT_YET_VALID),
+    TLS_ERROR_FIELD(X509_V_ERR_CRL_HAS_EXPIRED),
+    TLS_ERROR_FIELD(X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD),
+    TLS_ERROR_FIELD(X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD),
+    TLS_ERROR_FIELD(X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD),
+    TLS_ERROR_FIELD(X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD),
+    TLS_ERROR_FIELD(X509_V_ERR_OUT_OF_MEM),
+    TLS_ERROR_FIELD(X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT),
+    TLS_ERROR_FIELD(X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_CHAIN_TOO_LONG),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_REVOKED),
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_CA),
+    TLS_ERROR_FIELD(X509_V_ERR_PATH_LENGTH_EXCEEDED),
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_PURPOSE),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_UNTRUSTED),
+    TLS_ERROR_FIELD(X509_V_ERR_CERT_REJECTED),
+    TLS_ERROR_FIELD(X509_V_ERR_SUBJECT_ISSUER_MISMATCH),
+    TLS_ERROR_FIELD(X509_V_ERR_AKID_SKID_MISMATCH),
+    TLS_ERROR_FIELD(X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH),
+    TLS_ERROR_FIELD(X509_V_ERR_KEYUSAGE_NO_CERTSIGN),
+    TLS_ERROR_FIELD(X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER),
+    TLS_ERROR_FIELD(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION),
+    TLS_ERROR_FIELD(X509_V_ERR_KEYUSAGE_NO_CRL_SIGN),
+    TLS_ERROR_FIELD(X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION),
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_NON_CA),
+    TLS_ERROR_FIELD(X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED),
+    TLS_ERROR_FIELD(X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE),
+    TLS_ERROR_FIELD(X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED),
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_EXTENSION),
+    TLS_ERROR_FIELD(X509_V_ERR_INVALID_POLICY_EXTENSION),
+    TLS_ERROR_FIELD(X509_V_ERR_NO_EXPLICIT_POLICY),
+    TLS_ERROR_FIELD(X509_V_ERR_APPLICATION_VERIFICATION),
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    TLS_ERROR_FIELD(X509_V_ERR_DIFFERENT_CRL_SCOPE),
+    TLS_ERROR_FIELD(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE),
+    TLS_ERROR_FIELD(X509_V_ERR_UNNESTED_RESOURCE),
+    TLS_ERROR_FIELD(X509_V_ERR_PERMITTED_VIOLATION),
+    TLS_ERROR_FIELD(X509_V_ERR_EXCLUDED_VIOLATION),
+    TLS_ERROR_FIELD(X509_V_ERR_SUBTREE_MINMAX),
+    TLS_ERROR_FIELD(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE),
+    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),
+    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),
+    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
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    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),
+    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
+};
+#undef TLS_ERROR_FIELD
+
 void tls_initialize(void)
 {
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -110,11 +219,19 @@ tls_t *tls_new(xmpp_conn_t *conn)
 
     if (tls) {
         int ret;
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+        /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
+        X509_VERIFY_PARAM *param;
+#endif
         memset(tls, 0, sizeof(*tls));
 
         tls->ctx = conn->ctx;
         tls->sock = conn->sock;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         tls->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+#else
+        tls->ssl_ctx = SSL_CTX_new(TLS_client_method());
+#endif
         if (tls->ssl_ctx == NULL)
             goto err;
 
@@ -128,26 +245,44 @@ tls_t *tls_new(xmpp_conn_t *conn)
 
         SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL);
         SSL_CTX_set_mode(tls->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
-        SSL_CTX_set_default_verify_paths(tls->ssl_ctx);
+
+        ret = SSL_CTX_set_default_verify_paths(tls->ssl_ctx);
+        if (ret == 0 && !conn->tls_trust) {
+            /*
+             * Returns 1 on success and 0 on failure. A missing default
+             * 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;
+        }
 
         tls->ssl = SSL_new(tls->ssl_ctx);
         if (tls->ssl == NULL)
             goto err_free_ctx;
 
+#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, 0);
+        SSL_set_verify(tls->ssl, mode, NULL);
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
         /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
-        X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
+        param = SSL_get0_param(tls->ssl);
 
         /*
          * Allow only complete wildcards.  RFC 6125 discourages wildcard usage
          * completely, and lists internationalized domain names as a reason
          * against partial wildcards.
-         * See https://tools.ietf.org/html/rfc6125#section-7.2 for more information.
+         * See https://tools.ietf.org/html/rfc6125#section-7.2 for more
+         * information.
          */
-        X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+        X509_VERIFY_PARAM_set_hostflags(param,
+                                        X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
         X509_VERIFY_PARAM_set1_host(param, conn->domain, 0);
 #endif
 
@@ -177,6 +312,8 @@ void tls_free(tls_t *tls)
 
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
+    UNUSED(tls);
+    UNUSED(cafilename);
     return -1;
 }
 
@@ -203,8 +340,13 @@ int tls_start(tls_t *tls)
     }
 
     x509_res = SSL_get_verify_result(tls->ssl);
-    xmpp_debug(tls->ctx, "tls", "Certificate verification %s",
-               x509_res == X509_V_OK ? "passed" : "FAILED");
+    if (x509_res == X509_V_OK) {
+        xmpp_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);
+    }
     _tls_dump_cert_info(tls);
 
     _tls_set_error(tls, error);
@@ -247,10 +389,9 @@ int tls_stop(tls_t *tls)
 
 int tls_is_recoverable(int error)
 {
-    return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ
-            || error == SSL_ERROR_WANT_WRITE
-            || error == SSL_ERROR_WANT_CONNECT
-            || error == SSL_ERROR_WANT_ACCEPT);
+    return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ ||
+            error == SSL_ERROR_WANT_WRITE || error == SSL_ERROR_WANT_CONNECT ||
+            error == SSL_ERROR_WANT_ACCEPT);
 }
 
 int tls_pending(tls_t *tls)
@@ -258,7 +399,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 *const buff, const size_t len)
 {
     int ret;
 
@@ -268,7 +409,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 *const buff, const size_t len)
 {
     int ret;
 
@@ -280,6 +421,7 @@ int tls_write(tls_t *tls, const void * const buff, const size_t len)
 
 int tls_clear_pending_write(tls_t *tls)
 {
+    UNUSED(tls);
     return 0;
 }
 
@@ -291,7 +433,8 @@ static void _tls_sock_wait(tls_t *tls, int error)
     int nfds;
     int ret;
 
-    if (error == SSL_ERROR_NONE) return;
+    if (error == SSL_ERROR_NONE)
+        return;
 
     FD_ZERO(&rfds);
     FD_ZERO(&wfds);
@@ -299,8 +442,9 @@ static void _tls_sock_wait(tls_t *tls, int error)
         FD_SET(tls->sock, &rfds);
     if (error == SSL_ERROR_WANT_WRITE)
         FD_SET(tls->sock, &wfds);
-    nfds = (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE) ?
-           tls->sock + 1 : 0;
+    nfds = (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE)
+               ? tls->sock + 1
+               : 0;
     do {
         tv.tv_sec = TLS_TIMEOUT_SEC;
         tv.tv_usec = TLS_TIMEOUT_USEC;
@@ -308,10 +452,16 @@ static void _tls_sock_wait(tls_t *tls, int error)
     } while (ret == -1 && errno == EINTR);
 }
 
+static const char *_tls_error_str(int error, const char **tbl, size_t tbl_size)
+{
+    return (error >= 0 && (size_t)error < tbl_size) ? tbl[error] : "UNKNOWN";
+}
+
 static void _tls_set_error(tls_t *tls, int error)
 {
     if (error != 0 && !tls_is_recoverable(error)) {
-        xmpp_debug(tls->ctx, "tls", "error=%d errno=%d", error, errno);
+        xmpp_debug(tls->ctx, "tls", "error=%s(%d) errno=%d",
+                   TLS_ERROR_STR(error, tls_errors), error, errno);
         _tls_log_error(tls->ctx);
     }
     tls->lasterror = error;

src/tls_schannel.c

@@ -1,7 +1,7 @@
 /* tls_schannel.c
 ** strophe XMPP client library -- TLS abstraction schannel impl.
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -84,13 +84,13 @@ tls_t *tls_new(xmpp_conn_t *conn)
 
     /* no TLS support on win9x/me, despite what anyone says */
     if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-	return NULL;
+        return NULL;
     }
 
     tls = xmpp_alloc(ctx, sizeof(*tls));
 
     if (!tls) {
-	return NULL;
+        return NULL;
     }
 
     memset(tls, 0, sizeof(*tls));
@@ -98,30 +98,29 @@ tls_t *tls_new(xmpp_conn_t *conn)
     tls->conn = conn;
     tls->sock = sock;
 
-    if (!(tls->hsec32 = LoadLibrary ("secur32.dll"))) {
-	tls_free(tls);
-	return NULL;
+    if (!(tls->hsec32 = LoadLibrary("secur32.dll"))) {
+        tls_free(tls);
+        return NULL;
     }
 
     if (!(pInitSecurityInterface =
-	  (void *)GetProcAddress(tls->hsec32, "InitSecurityInterfaceA"))) {
-	tls_free(tls);
-	return NULL;
+              (void *)GetProcAddress(tls->hsec32, "InitSecurityInterfaceA"))) {
+        tls_free(tls);
+        return NULL;
     }
 
     tls->sft = pInitSecurityInterface();
 
     if (!tls->sft) {
-	tls_free(tls);
-	return NULL;
+        tls_free(tls);
+        return NULL;
     }
 
     ret = tls->sft->QuerySecurityPackageInfo(UNISP_NAME, &(tls->spi));
 
-    if (ret != SEC_E_OK)
-    {
-	tls_free(tls);
-	return NULL;
+    if (ret != SEC_E_OK) {
+        tls_free(tls);
+        return NULL;
     }
 
     xmpp_debug(ctx, "TLSS", "QuerySecurityPackageInfo() success");
@@ -140,13 +139,13 @@ tls_t *tls_new(xmpp_conn_t *conn)
     (void)algs;
 #endif
 
-    ret = tls->sft->AcquireCredentialsHandleA(NULL, UNISP_NAME,
-	SECPKG_CRED_OUTBOUND, NULL, &scred, NULL, NULL, &(tls->hcred), NULL);
+    ret = tls->sft->AcquireCredentialsHandleA(
+        NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, &scred, NULL, NULL,
+        &(tls->hcred), NULL);
 
-    if (ret != SEC_E_OK)
-    {
-	tls_free(tls);
-	return NULL;
+    if (ret != SEC_E_OK) {
+        tls_free(tls);
+        return NULL;
     }
 
     xmpp_debug(ctx, "TLSS", "AcquireCredentialsHandle() success");
@@ -155,25 +154,25 @@ tls_t *tls_new(xmpp_conn_t *conn)
 
     /* This bunch of queries should trip up wine until someone fixes
      * schannel support there */
-    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_SUPPORTED_ALGS, &spc_sa);
-    if (ret != SEC_E_OK)
-    {
-	tls_free(tls);
-	return NULL;
+    ret = tls->sft->QueryCredentialsAttributes(
+        &(tls->hcred), SECPKG_ATTR_SUPPORTED_ALGS, &spc_sa);
+    if (ret != SEC_E_OK) {
+        tls_free(tls);
+        return NULL;
     }
 
-    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_CIPHER_STRENGTHS, &spc_cs);
-    if (ret != SEC_E_OK)
-    {
-	tls_free(tls);
-	return NULL;
+    ret = tls->sft->QueryCredentialsAttributes(
+        &(tls->hcred), SECPKG_ATTR_CIPHER_STRENGTHS, &spc_cs);
+    if (ret != SEC_E_OK) {
+        tls_free(tls);
+        return NULL;
     }
 
-    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_SUPPORTED_PROTOCOLS, &spc_sp);
-    if (ret != SEC_E_OK)
-    {
-	tls_free(tls);
-	return NULL;
+    ret = tls->sft->QueryCredentialsAttributes(
+        &(tls->hcred), SECPKG_ATTR_SUPPORTED_PROTOCOLS, &spc_sp);
+    if (ret != SEC_E_OK) {
+        tls_free(tls);
+        return NULL;
     }
 
     return tls;
@@ -182,26 +181,26 @@ tls_t *tls_new(xmpp_conn_t *conn)
 void tls_free(tls_t *tls)
 {
     if (tls->recvbuffer) {
-	xmpp_free(tls->ctx, tls->recvbuffer);
+        xmpp_free(tls->ctx, tls->recvbuffer);
     }
 
     if (tls->readybuffer) {
-	xmpp_free(tls->ctx, tls->readybuffer);
+        xmpp_free(tls->ctx, tls->readybuffer);
     }
 
     if (tls->sendbuffer) {
-	xmpp_free(tls->ctx, tls->sendbuffer);
+        xmpp_free(tls->ctx, tls->sendbuffer);
     }
 
     if (tls->init) {
-	tls->sft->FreeCredentialsHandle(&(tls->hcred));
+        tls->sft->FreeCredentialsHandle(&(tls->hcred));
     }
 
     tls->sft = NULL;
 
     if (tls->hsec32) {
-	FreeLibrary(tls->hsec32);
-	tls->hsec32 = NULL;
+        FreeLibrary(tls->hsec32);
+        tls->hsec32 = NULL;
     }
 
     xmpp_free(tls->ctx, tls);
@@ -210,6 +209,8 @@ void tls_free(tls_t *tls)
 
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
+    UNUSED(tls);
+    UNUSED(cafilename);
     return -1;
 }
 
@@ -225,10 +226,10 @@ int tls_start(tls_t *tls)
     /* use the domain there as our name */
     name = tls->conn->domain;
 
-    ctxtreq = ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT
-	    | ISC_REQ_CONFIDENTIALITY | ISC_RET_EXTENDED_ERROR
-	    | ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_STREAM
-	    | ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_INTEGRITY;
+    ctxtreq = ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT |
+              ISC_REQ_CONFIDENTIALITY | ISC_RET_EXTENDED_ERROR |
+              ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_STREAM |
+              ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_INTEGRITY;
 
     memset(&(sbout[0]), 0, sizeof(sbout[0]));
     sbout[0].BufferType = SECBUFFER_TOKEN;
@@ -251,140 +252,134 @@ int tls_start(tls_t *tls)
     sbdin.cBuffers = 2;
     sbdin.pBuffers = sbin;
 
-    ret = tls->sft->InitializeSecurityContextA(&(tls->hcred), NULL, name, ctxtreq, 0, 0,
-					  NULL, 0, &(tls->hctxt), &sbdout,
-					  &ctxtattr, NULL);
+    ret = tls->sft->InitializeSecurityContextA(
+        &(tls->hcred), NULL, name, ctxtreq, 0, 0, NULL, 0, &(tls->hctxt),
+        &sbdout, &ctxtattr, NULL);
 
     unsigned char *p = sbin[0].pvBuffer;
     int len = 0;
 
-    while (ret == SEC_I_CONTINUE_NEEDED
-	   || ret == SEC_I_INCOMPLETE_CREDENTIALS
-     || ret == SEC_E_INCOMPLETE_MESSAGE) {
-	int inbytes = 0;
+    while (ret == SEC_I_CONTINUE_NEEDED ||
+           ret == SEC_I_INCOMPLETE_CREDENTIALS ||
+           ret == SEC_E_INCOMPLETE_MESSAGE) {
+        int inbytes = 0;
 
-  if (ret != SEC_E_INCOMPLETE_MESSAGE) {
-    len = 0;
-    p = sbin[0].pvBuffer;
-  }
+        if (ret != SEC_E_INCOMPLETE_MESSAGE) {
+            len = 0;
+            p = sbin[0].pvBuffer;
+        }
 
-	if (sbdout.pBuffers[0].cbBuffer) {
-	    unsigned char *writebuff = sbdout.pBuffers[0].pvBuffer;
-	    unsigned int writelen = sbdout.pBuffers[0].cbBuffer;
+        if (sbdout.pBuffers[0].cbBuffer) {
+            unsigned char *writebuff = sbdout.pBuffers[0].pvBuffer;
+            unsigned int writelen = sbdout.pBuffers[0].cbBuffer;
 
-	    sent = sock_write(tls->sock, writebuff, writelen);
-	    if (sent == -1) {
-		tls->lasterror = sock_error();
-	    }
-	    else
-	    {
-		writebuff += sent;
-		writelen -= sent;
-	    }
-	    tls->sft->FreeContextBuffer(sbdout.pBuffers[0].pvBuffer);
-	    sbdout.pBuffers[0].pvBuffer = NULL;
-	    sbdout.pBuffers[0].cbBuffer = 0;
-	}
+            sent = sock_write(tls->sock, writebuff, writelen);
+            if (sent == -1) {
+                tls->lasterror = sock_error();
+            } else {
+                writebuff += sent;
+                writelen -= sent;
+            }
+            tls->sft->FreeContextBuffer(sbdout.pBuffers[0].pvBuffer);
+            sbdout.pBuffers[0].pvBuffer = NULL;
+            sbdout.pBuffers[0].cbBuffer = 0;
+        }
 
-	/* poll for a bit until the remote server stops sending data, ie it
-	 * finishes sending the token */
-	inbytes = 1;
-	{
-	    fd_set fds;
-	    struct timeval tv;
+        /* poll for a bit until the remote server stops sending data, ie it
+         * finishes sending the token */
+        inbytes = 1;
+        {
+            fd_set fds;
+            struct timeval tv;
 
-	    tv.tv_sec = 2;
-	    tv.tv_usec = 0;
+            tv.tv_sec = 2;
+            tv.tv_usec = 0;
 
-	    FD_ZERO(&fds);
-	    FD_SET(tls->sock, &fds);
-    
-	    select(tls->sock, &fds, NULL, NULL, &tv);
-	}
+            FD_ZERO(&fds);
+            FD_SET(tls->sock, &fds);
 
-	while (inbytes > 0) {
-	    fd_set fds;
-	    struct timeval tv;
+            select(tls->sock, &fds, NULL, NULL, &tv);
+        }
 
-	    tv.tv_sec = 0;
-	    tv.tv_usec = 1000;
+        while (inbytes > 0) {
+            fd_set fds;
+            struct timeval tv;
 
-	    FD_ZERO(&fds);
-	    FD_SET(tls->sock, &fds);
-    
-	    select(tls->sock, &fds, NULL, NULL, &tv);
+            tv.tv_sec = 0;
+            tv.tv_usec = 1000;
 
-	    inbytes = sock_read(tls->sock, p, tls->spi->cbMaxToken - len);
+            FD_ZERO(&fds);
+            FD_SET(tls->sock, &fds);
 
-	    if (inbytes > 0) {
-		len += inbytes;
-		p += inbytes;
-	    }
-	    else
-	    {
-	        tls->lasterror = sock_error();
-	    }
+            select(tls->sock, &fds, NULL, NULL, &tv);
 
-	}
+            inbytes = sock_read(tls->sock, p, tls->spi->cbMaxToken - len);
 
-	sbin[0].cbBuffer = len;
+            if (inbytes > 0) {
+                len += inbytes;
+                p += inbytes;
+            } else {
+                tls->lasterror = sock_error();
+            }
+        }
 
-	ret = tls->sft->InitializeSecurityContextA(&(tls->hcred), &(tls->hctxt), name,
-					      ctxtreq, 0, 0, &sbdin, 0,
-					      &(tls->hctxt), &sbdout,
-					      &ctxtattr, NULL);
+        sbin[0].cbBuffer = len;
+
+        ret = tls->sft->InitializeSecurityContextA(
+            &(tls->hcred), &(tls->hctxt), name, ctxtreq, 0, 0, &sbdin, 0,
+            &(tls->hctxt), &sbdout, &ctxtattr, NULL);
     }
 
     if (ret == SEC_E_OK) {
-	if (sbdout.pBuffers[0].cbBuffer) {
-	    unsigned char *writebuff = sbdout.pBuffers[0].pvBuffer;
-	    unsigned int writelen = sbdout.pBuffers[0].cbBuffer;
-	    sent = sock_write(tls->sock, writebuff, writelen);
-	    if (sent == -1) {
-		tls->lasterror = sock_error();
-	    }
-	    else
-	    {
-		writebuff += sent;
-		writelen -= sent;
-	    }
-	    tls->sft->FreeContextBuffer(sbdout.pBuffers[0].pvBuffer);
-	    sbdout.pBuffers[0].pvBuffer = NULL;
-	    sbdout.pBuffers[0].cbBuffer = 0;
-	}
+        if (sbdout.pBuffers[0].cbBuffer) {
+            unsigned char *writebuff = sbdout.pBuffers[0].pvBuffer;
+            unsigned int writelen = sbdout.pBuffers[0].cbBuffer;
+            sent = sock_write(tls->sock, writebuff, writelen);
+            if (sent == -1) {
+                tls->lasterror = sock_error();
+            } else {
+                writebuff += sent;
+                writelen -= sent;
+            }
+            tls->sft->FreeContextBuffer(sbdout.pBuffers[0].pvBuffer);
+            sbdout.pBuffers[0].pvBuffer = NULL;
+            sbdout.pBuffers[0].cbBuffer = 0;
+        }
     }
 
     xmpp_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);
-	return 0;
+        tls->lasterror = ret;
+        xmpp_error(tls->ctx, "TLSS", "Schannel error 0x%lx",
+                   (unsigned long)ret);
+        return 0;
     }
 
     tls->sft->QueryContextAttributes(&(tls->hctxt), SECPKG_ATTR_STREAM_SIZES,
-				&(tls->spcss));
+                                     &(tls->spcss));
 
-    tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage
-			    + tls->spcss.cbTrailer;
-    tls->recvbuffer       = xmpp_alloc(tls->ctx, tls->recvbuffermaxlen);
-    tls->recvbufferpos    = 0;
+    tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
+                            tls->spcss.cbTrailer;
+    tls->recvbuffer = xmpp_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->sendbufferpos    = 0;
-    tls->sendbufferlen    = 0;
+    tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
+                            tls->spcss.cbTrailer;
+    tls->sendbuffer = xmpp_alloc(tls->ctx, tls->sendbuffermaxlen);
+    tls->sendbufferpos = 0;
+    tls->sendbufferlen = 0;
 
-    tls->readybuffer      = xmpp_alloc(tls->ctx, tls->spcss.cbMaximumMessage);
-    tls->readybufferpos   = 0;
-    tls->readybufferlen   = 0;
+    tls->readybuffer = xmpp_alloc(tls->ctx, tls->spcss.cbMaximumMessage);
+    tls->readybufferpos = 0;
+    tls->readybufferlen = 0;
 
     return 1;
 }
 
 int tls_stop(tls_t *tls)
 {
+    UNUSED(tls);
     return -1;
 }
 
@@ -395,67 +390,67 @@ int tls_error(tls_t *tls)
 
 int tls_is_recoverable(int error)
 {
-    return (error == SEC_E_OK || error == SEC_E_INCOMPLETE_MESSAGE
-	    || error == WSAEWOULDBLOCK || error == WSAEMSGSIZE
-	    || error == WSAEINPROGRESS);
+    return (error == SEC_E_OK || error == SEC_E_INCOMPLETE_MESSAGE ||
+            error == WSAEWOULDBLOCK || error == WSAEMSGSIZE ||
+            error == WSAEINPROGRESS);
 }
 
-int tls_pending(tls_t *tls) {
-	// There are 3 cases:
-	// - there is data in ready buffer, so it is by default pending
-	// - there is data in recv buffer. If it is not decrypted yet, means it
-	// was incomplete. This should be processed again only if there is data
-	// on the physical connection
-	// - there is data on the physical connection. This case is treated
-	// outside the tls (in event.c)
+int tls_pending(tls_t *tls)
+{
+    // There are 3 cases:
+    // - there is data in ready buffer, so it is by default pending
+    // - there is data in recv buffer. If it is not decrypted yet, means it
+    // was incomplete. This should be processed again only if there is data
+    // on the physical connection
+    // - there is data on the physical connection. This case is treated
+    // outside the tls (in event.c)
 
     if (tls->readybufferpos < tls->readybufferlen) {
-		return tls->readybufferlen - tls->readybufferpos;
-	}
+        return tls->readybufferlen - tls->readybufferpos;
+    }
 
-	return 0;
+    return 0;
 }
 
-int tls_read(tls_t *tls, void * const buff, const size_t len)
+int tls_read(tls_t *tls, void *const buff, const size_t len)
 {
     int bytes;
 
     /* first, if we've got some ready data, put that in the buffer */
-    if (tls->readybufferpos < tls->readybufferlen)
-    {
-	if (len < tls->readybufferlen - tls->readybufferpos) {
-	    bytes = len;
-	} else {
-	    bytes = tls->readybufferlen - tls->readybufferpos;
-	}
+    if (tls->readybufferpos < tls->readybufferlen) {
+        if (len < tls->readybufferlen - tls->readybufferpos) {
+            bytes = len;
+        } else {
+            bytes = tls->readybufferlen - tls->readybufferpos;
+        }
 
-	memcpy(buff, tls->readybuffer + tls->readybufferpos, bytes);
+        memcpy(buff, tls->readybuffer + tls->readybufferpos, bytes);
 
-	if (len < tls->readybufferlen - tls->readybufferpos) {
-	    tls->readybufferpos += bytes;
-	    return bytes;
-	} else {
-	    unsigned char *newbuff = buff;
-	    int read;
-	    tls->readybufferpos += bytes;
-	    newbuff += bytes;
-	    read = tls_read(tls, newbuff, len - bytes);
+        if (len < tls->readybufferlen - tls->readybufferpos) {
+            tls->readybufferpos += bytes;
+            return bytes;
+        } else {
+            unsigned char *newbuff = buff;
+            int read;
+            tls->readybufferpos += bytes;
+            newbuff += bytes;
+            read = tls_read(tls, newbuff, len - bytes);
 
-	    if (read == -1) {
-	        if (tls_is_recoverable(tls->lasterror)) {
-		    return bytes;
-		}
+            if (read == -1) {
+                if (tls_is_recoverable(tls->lasterror)) {
+                    return bytes;
+                }
 
-		return -1;
-	    }
+                return -1;
+            }
 
-	    return bytes + read;
-	}
+            return bytes + read;
+        }
     }
 
     /* next, top up our recv buffer */
     bytes = sock_read(tls->sock, tls->recvbuffer + tls->recvbufferpos,
-		      tls->recvbuffermaxlen - tls->recvbufferpos);
+                      tls->recvbuffermaxlen - tls->recvbufferpos);
 
     if (bytes == 0) {
         tls->lasterror = WSAECONNRESET;
@@ -463,76 +458,75 @@ int tls_read(tls_t *tls, void * const buff, const size_t len)
     }
 
     if (bytes == -1) {
-	if (!tls_is_recoverable(sock_error())) {
-	    tls->lasterror = sock_error();
-	    return -1;
-	}
+        if (!tls_is_recoverable(sock_error())) {
+            tls->lasterror = sock_error();
+            return -1;
+        }
     }
 
     if (bytes > 0) {
-	tls->recvbufferpos += bytes;
+        tls->recvbufferpos += bytes;
     }
 
     /* next, try to decrypt the recv buffer */
     if (tls->recvbufferpos > 0) {
-	SecBufferDesc sbddec;
-	SecBuffer sbdec[4];
-	int ret;
+        SecBufferDesc sbddec;
+        SecBuffer sbdec[4];
+        int ret;
 
-	memset(&sbddec, 0, sizeof(sbddec));
-	sbddec.ulVersion = SECBUFFER_VERSION;
-	sbddec.cBuffers = 4;
-	sbddec.pBuffers = sbdec;
+        memset(&sbddec, 0, sizeof(sbddec));
+        sbddec.ulVersion = SECBUFFER_VERSION;
+        sbddec.cBuffers = 4;
+        sbddec.pBuffers = sbdec;
 
-	memset(&(sbdec[0]), 0, sizeof(sbdec[0]));
-	sbdec[0].BufferType = SECBUFFER_DATA;
-	sbdec[0].pvBuffer = tls->recvbuffer;
-	sbdec[0].cbBuffer = tls->recvbufferpos;
+        memset(&(sbdec[0]), 0, sizeof(sbdec[0]));
+        sbdec[0].BufferType = SECBUFFER_DATA;
+        sbdec[0].pvBuffer = tls->recvbuffer;
+        sbdec[0].cbBuffer = tls->recvbufferpos;
 
-	memset(&(sbdec[1]), 0, sizeof(sbdec[1]));
-	sbdec[1].BufferType = SECBUFFER_EMPTY;
+        memset(&(sbdec[1]), 0, sizeof(sbdec[1]));
+        sbdec[1].BufferType = SECBUFFER_EMPTY;
 
-	memset(&(sbdec[2]), 0, sizeof(sbdec[2]));
-	sbdec[2].BufferType = SECBUFFER_EMPTY;
+        memset(&(sbdec[2]), 0, sizeof(sbdec[2]));
+        sbdec[2].BufferType = SECBUFFER_EMPTY;
 
-	memset(&(sbdec[3]), 0, sizeof(sbdec[3]));
-	sbdec[3].BufferType = SECBUFFER_EMPTY;
+        memset(&(sbdec[3]), 0, sizeof(sbdec[3]));
+        sbdec[3].BufferType = SECBUFFER_EMPTY;
 
-	ret = tls->sft->DecryptMessage(&(tls->hctxt), &sbddec, 0, NULL);
+        ret = tls->sft->DecryptMessage(&(tls->hctxt), &sbddec, 0, NULL);
 
-	if (ret == SEC_E_OK) {
-	    memcpy(tls->readybuffer, sbdec[1].pvBuffer, sbdec[1].cbBuffer);
-	    tls->readybufferpos = 0;
-	    tls->readybufferlen = sbdec[1].cbBuffer;
-	    /* have we got some data left over?  If so, copy it to the start
-	     * of the recv buffer */
-	    if (sbdec[3].BufferType == SECBUFFER_EXTRA) {
-		memcpy(tls->recvbuffer, sbdec[3].pvBuffer, sbdec[3].cbBuffer);
-		tls->recvbufferpos = sbdec[3].cbBuffer;
-	    } else {
-		tls->recvbufferpos = 0;
-	    }
+        if (ret == SEC_E_OK) {
+            memcpy(tls->readybuffer, sbdec[1].pvBuffer, sbdec[1].cbBuffer);
+            tls->readybufferpos = 0;
+            tls->readybufferlen = sbdec[1].cbBuffer;
+            /* have we got some data left over?  If so, copy it to the start
+             * of the recv buffer */
+            if (sbdec[3].BufferType == SECBUFFER_EXTRA) {
+                memcpy(tls->recvbuffer, sbdec[3].pvBuffer, sbdec[3].cbBuffer);
+                tls->recvbufferpos = sbdec[3].cbBuffer;
+            } else {
+                tls->recvbufferpos = 0;
+            }
 
-	    return tls_read(tls, buff, len);
-	} else if (ret == SEC_E_INCOMPLETE_MESSAGE) {
-	    tls->lasterror = SEC_E_INCOMPLETE_MESSAGE;
-	    return -1;
-	} else if (ret == SEC_I_RENEGOTIATE) {
-	    ret = tls_start(tls);
-	    if (!ret)
-	    {
-		return -1;
-	    }
+            return tls_read(tls, buff, len);
+        } else if (ret == SEC_E_INCOMPLETE_MESSAGE) {
+            tls->lasterror = SEC_E_INCOMPLETE_MESSAGE;
+            return -1;
+        } else if (ret == SEC_I_RENEGOTIATE) {
+            ret = tls_start(tls);
+            if (!ret) {
+                return -1;
+            }
 
-	    /* fake an incomplete message so we're called again */
-	    tls->lasterror = SEC_E_INCOMPLETE_MESSAGE;
-	    return -1;
-	}
+            /* fake an incomplete message so we're called again */
+            tls->lasterror = SEC_E_INCOMPLETE_MESSAGE;
+            return -1;
+        }
 
-	/* something bad happened, so we bail */
-	tls->lasterror = ret;
+        /* something bad happened, so we bail */
+        tls->lasterror = ret;
 
-	return -1;
+        return -1;
     }
 
     tls->lasterror = SEC_E_INCOMPLETE_MESSAGE;
@@ -542,29 +536,28 @@ int tls_read(tls_t *tls, void * const buff, const size_t len)
 
 int tls_clear_pending_write(tls_t *tls)
 {
-    if (tls->sendbufferpos < tls->sendbufferlen)
-    {
-	int bytes;
+    if (tls->sendbufferpos < tls->sendbufferlen) {
+        int bytes;
 
-	bytes = sock_write(tls->sock, tls->sendbuffer + tls->sendbufferpos,
-			   tls->sendbufferlen - tls->sendbufferpos);
+        bytes = sock_write(tls->sock, tls->sendbuffer + tls->sendbufferpos,
+                           tls->sendbufferlen - tls->sendbufferpos);
 
-	if (bytes == -1) {
-	    tls->lasterror = sock_error();
-	    return -1;
-	} else if (bytes > 0) {
-	    tls->sendbufferpos += bytes;
-	}
+        if (bytes == -1) {
+            tls->lasterror = sock_error();
+            return -1;
+        } else if (bytes > 0) {
+            tls->sendbufferpos += bytes;
+        }
 
-	if (tls->sendbufferpos < tls->sendbufferlen) {
-	    return 0;
-	}
+        if (tls->sendbufferpos < tls->sendbufferlen) {
+            return 0;
+        }
     }
 
     return 1;
 }
 
-int tls_write(tls_t *tls, const void * const buff, const size_t len)
+int tls_write(tls_t *tls, const void *const buff, const size_t len)
 {
     SecBufferDesc sbdenc;
     SecBuffer sbenc[4];
@@ -573,7 +566,7 @@ int tls_write(tls_t *tls, const void * const buff, const size_t len)
 
     ret = tls_clear_pending_write(tls);
     if (ret <= 0) {
-	return ret;
+        return ret;
     }
 
     tls->sendbufferpos = 0;
@@ -601,51 +594,49 @@ int tls_write(tls_t *tls, const void * const buff, const size_t len)
 
     sbenc[1].pvBuffer = tls->sendbuffer + tls->spcss.cbHeader;
 
-    while (remain > 0)
-    {
-	if (remain > tls->spcss.cbMaximumMessage) {
-	    sbenc[1].cbBuffer = tls->spcss.cbMaximumMessage;
-	} else {
-	    sbenc[1].cbBuffer = remain;
-	}
+    while (remain > 0) {
+        if (remain > tls->spcss.cbMaximumMessage) {
+            sbenc[1].cbBuffer = tls->spcss.cbMaximumMessage;
+        } else {
+            sbenc[1].cbBuffer = remain;
+        }
 
-	sbenc[2].pvBuffer = (unsigned char *)sbenc[1].pvBuffer
-			    + sbenc[1].cbBuffer;
+        sbenc[2].pvBuffer =
+            (unsigned char *)sbenc[1].pvBuffer + sbenc[1].cbBuffer;
         sbenc[2].cbBuffer = tls->spcss.cbTrailer;
 
-	memcpy(sbenc[1].pvBuffer, p, sbenc[1].cbBuffer);
-	p += tls->spcss.cbMaximumMessage;
+        memcpy(sbenc[1].pvBuffer, p, sbenc[1].cbBuffer);
+        p += tls->spcss.cbMaximumMessage;
 
-	tls->sendbufferlen = sbenc[0].cbBuffer + sbenc[1].cbBuffer
-			     + sbenc[2].cbBuffer;
+        tls->sendbufferlen =
+            sbenc[0].cbBuffer + sbenc[1].cbBuffer + sbenc[2].cbBuffer;
 
-	ret = tls->sft->EncryptMessage(&(tls->hctxt), 0, &sbdenc, 0);
+        ret = tls->sft->EncryptMessage(&(tls->hctxt), 0, &sbdenc, 0);
 
-	if (ret != SEC_E_OK) {
-	    tls->lasterror = ret;
-	    return -1;
-	}
+        if (ret != SEC_E_OK) {
+            tls->lasterror = ret;
+            return -1;
+        }
 
-	tls->sendbufferpos = 0;
+        tls->sendbufferpos = 0;
 
-	ret = tls_clear_pending_write(tls);
+        ret = tls_clear_pending_write(tls);
 
-	if (ret == -1 && !tls_is_recoverable(tls_error(tls))) {
-	    return -1;
-	}
+        if (ret == -1 && !tls_is_recoverable(tls_error(tls))) {
+            return -1;
+        }
 
-	if (remain > tls->spcss.cbMaximumMessage) {
-	    sent += tls->spcss.cbMaximumMessage;
-	    remain -= tls->spcss.cbMaximumMessage;
-	} else {
-	    sent += remain;
-	    remain = 0;
-	}
-
-	if (ret == 0 || (ret == -1 && tls_is_recoverable(tls_error(tls)))) {
-	    return sent;
-	}
+        if (remain > tls->spcss.cbMaximumMessage) {
+            sent += tls->spcss.cbMaximumMessage;
+            remain -= tls->spcss.cbMaximumMessage;
+        } else {
+            sent += remain;
+            remain = 0;
+        }
 
+        if (ret == 0 || (ret == -1 && tls_is_recoverable(tls_error(tls)))) {
+            return sent;
+        }
     }
 
     return sent;

src/util.c

@@ -1,7 +1,7 @@
 /* util.c
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -38,7 +38,7 @@
  *
  *  @return a new allocates 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 *xmpp_strdup(const xmpp_ctx_t *const ctx, const char *const s)
 {
     size_t len;
     char *copy;
@@ -86,8 +86,24 @@ char *xmpp_strtok_r(char *s, const char *delim, char **saveptr)
  */
 uint64_t time_stamp(void)
 {
-#ifdef _WIN32
-    return timeGetTime();
+#if defined(_WIN32) || defined(_XBOX_ONE)
+
+#ifndef __GNUC__
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+    FILETIME ft;
+    LARGE_INTEGER li;
+    __int64 t;
+
+    GetSystemTimeAsFileTime(&ft);
+    li.LowPart = ft.dwLowDateTime;
+    li.HighPart = ft.dwHighDateTime;
+    t = li.QuadPart;              /* In 100-nanosecond intervals */
+    t -= EPOCHFILETIME;           /* Offset to the Epoch time */
+    return (uint64_t)(t / 10000); /* Convert to milliseconds */
 #else
     struct timeval tv;
 
@@ -112,15 +128,29 @@ uint64_t time_elapsed(uint64_t t1, uint64_t t2)
     return (uint64_t)(t2 - t1);
 }
 
+/** Disconnect the stream with the error.
+ *  This is a convenience function used internally by various parts of
+ *  the Strophe library for terminating the connection because of an error.
+ *
+ *  @param conn a Strophe connection object
+ *  @param error an error code
+ */
+void disconnect_with_error(xmpp_conn_t *const conn, int error)
+{
+    xmpp_error(conn->ctx, "xmpp", "Disconnecting with error %d", error);
+    conn->error = conn->error ?: error;
+    xmpp_disconnect(conn);
+}
+
 /** Disconnect the stream with a memory error.
  *  This is a convenience function used internally by various parts of
- *  the Strophe library for terminating the connection because of a 
+ *  the Strophe library for terminating the connection because of a
  *  memory error.
  *
  *  @param conn a Strophe connection object
  */
-void disconnect_mem_error(xmpp_conn_t * const conn)
+void disconnect_mem_error(xmpp_conn_t *const conn)
 {
     xmpp_error(conn->ctx, "xmpp", "Memory allocation error");
-    xmpp_disconnect(conn);
+    disconnect_with_error(conn, XMPP_EMEM);
 }

src/util.h

@@ -1,7 +1,7 @@
 /* util.h
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -18,6 +18,10 @@
 
 #include "ostypes.h"
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#endif /* ARRAY_SIZE */
+
 /* TODO evaluate x and y only once */
 #define xmpp_min(x, y) ((x) < (y) ? (x) : (y))
 

strophe.h

@@ -16,7 +16,7 @@
 #ifndef __LIBSTROPHE_STROPHE_H__
 #define __LIBSTROPHE_STROPHE_H__
 
-#include <stddef.h>     /* size_t */
+#include <stddef.h> /* size_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,6 +39,10 @@ extern "C" {
  *  Namespace definition for 'urn:ietf:params:xml:ns:xmpp-streams'.
  */
 #define XMPP_NS_STREAMS_IETF "urn:ietf:params:xml:ns:xmpp-streams"
+/** @def XMPP_NS_STANZAS_IETF
+ *  Namespace definition for 'urn:ietf:params:xml:ns:xmpp-stanzas'.
+ */
+#define XMPP_NS_STANZAS_IETF "urn:ietf:params:xml:ns:xmpp-stanzas"
 /** @def XMPP_NS_TLS
  *  Namespace definition for 'url:ietf:params:xml:ns:xmpp-tls'.
  */
@@ -71,6 +75,10 @@ extern "C" {
  *  Namespace definition for 'jabber:iq:roster'.
  */
 #define XMPP_NS_ROSTER "jabber:iq:roster"
+/** @def XMPP_NS_REGISTER
+ *  Namespace definition for 'jabber:iq:register'.
+ */
+#define XMPP_NS_REGISTER "jabber:iq:register"
 
 /* error defines */
 /** @def XMPP_EOK
@@ -79,7 +87,7 @@ extern "C" {
 #define XMPP_EOK 0
 /** @def XMPP_EMEM
  *  Memory related failure error code.
- *  
+ *
  *  This is returned on allocation errors and signals that the host may
  *  be out of memory.
  */
@@ -95,6 +103,26 @@ extern "C" {
  *  Internal failure error code.
  */
 #define XMPP_EINT -3
+/** @def XMPP_ECERT
+ *  Certificate verification failed during TLS establishment.
+ */
+#define XMPP_ECERT -4
+/** @def XMPP_ETIMEDOUT
+ *  Operation timed out error code.
+ */
+#define XMPP_ETIMEDOUT -5
+/** @def XMPP_EIO
+ *  I/O error code.
+ */
+#define XMPP_EIO -6
+/** @def XMPP_ERESET
+ *  Error code for situation when connection closed by remote side.
+ */
+#define XMPP_ERESET -7
+/** @def XMPP_EAUTH
+ *  Authentication failed error code.
+ */
+#define XMPP_EAUTH -8
 
 /* initialization and shutdown */
 void xmpp_initialize(void);
@@ -114,18 +142,18 @@ 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);
+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);
 
 /* 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 *const 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)(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 *userdata;
 };
 
@@ -136,16 +164,12 @@ typedef enum {
     XMPP_LEVEL_ERROR
 } xmpp_log_level_t;
 
-typedef enum {
-    XMPP_UNKNOWN,
-    XMPP_CLIENT,
-    XMPP_COMPONENT
-} xmpp_conn_type_t;
+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 *const userdata,
+                                 const xmpp_log_level_t level,
+                                 const char *const area,
+                                 const char *const msg);
 
 struct _xmpp_log_t {
     xmpp_log_handler handler;
@@ -162,17 +186,17 @@ typedef struct _xmpp_conn_t xmpp_conn_t;
 typedef struct _xmpp_stanza_t xmpp_stanza_t;
 
 /* connection flags */
-#define XMPP_CONN_FLAG_DISABLE_TLS   (1UL << 0)
+#define XMPP_CONN_FLAG_DISABLE_TLS (1UL << 0)
 #define XMPP_CONN_FLAG_MANDATORY_TLS (1UL << 1)
-#define XMPP_CONN_FLAG_LEGACY_SSL    (1UL << 2)
+#define XMPP_CONN_FLAG_LEGACY_SSL (1UL << 2)
 /** @def XMPP_CONN_FLAG_TRUST_TLS
  *  Trust server's certificate even if it is invalid.
  */
-#define XMPP_CONN_FLAG_TRUST_TLS     (1UL << 3)
+#define XMPP_CONN_FLAG_TRUST_TLS (1UL << 3)
 /** @def XMPP_CONN_FLAG_LEGACY_AUTH
  *  Enable legacy authentication support.
  */
-#define XMPP_CONN_FLAG_LEGACY_AUTH   (1UL << 4)
+#define XMPP_CONN_FLAG_LEGACY_AUTH (1UL << 4)
 
 /* connect callback */
 typedef enum {
@@ -215,95 +239,112 @@ typedef struct {
     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 *const conn,
+                                  const xmpp_conn_event_t event,
+                                  const int error,
+                                  xmpp_stream_error_t *const stream_error,
+                                  void *const 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);
+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);
 
-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);
+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);
 
-int xmpp_connect_client(xmpp_conn_t * const conn, 
-			  const char * const altdomain,
-			  unsigned short altport,
-			  xmpp_conn_handler callback,
-			  void * const userdata);
+int xmpp_connect_client(xmpp_conn_t *const conn,
+                        const char *const altdomain,
+                        unsigned short altport,
+                        xmpp_conn_handler callback,
+                        void *const userdata);
 
-int xmpp_connect_component(xmpp_conn_t * const conn, const char * const server,
-                           unsigned short port, xmpp_conn_handler callback,
-                           void * const userdata);
+int xmpp_connect_component(xmpp_conn_t *const conn,
+                           const char *const server,
+                           unsigned short port,
+                           xmpp_conn_handler callback,
+                           void *const userdata);
 
-int xmpp_connect_raw(xmpp_conn_t * const conn,
-                     const char * const altdomain,
+int xmpp_connect_raw(xmpp_conn_t *const conn,
+                     const char *const 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, char **attributes,
+                     void *const userdata);
+int xmpp_conn_open_stream_default(xmpp_conn_t *const conn);
+int xmpp_conn_open_stream(xmpp_conn_t *const 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 *const conn);
 
-void xmpp_disconnect(xmpp_conn_t * const conn);
+void xmpp_disconnect(xmpp_conn_t *const conn);
 
-void xmpp_send(xmpp_conn_t * const conn,
-	       xmpp_stanza_t * const 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(xmpp_conn_t *const conn, xmpp_stanza_t *const 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);
 
 /* handlers */
 
-/* if the handle returns false it is removed */
-typedef int (*xmpp_timed_handler)(xmpp_conn_t * const conn, 
-				  void * const userdata);
-
-void xmpp_timed_handler_add(xmpp_conn_t * const 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);
+/* if the handler returns false it is removed */
+typedef int (*xmpp_timed_handler)(xmpp_conn_t *const conn,
+                                  void *const userdata);
 
+void xmpp_timed_handler_add(xmpp_conn_t *const 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);
 
 /* 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_global_timed_handler)(xmpp_ctx_t *const ctx,
+                                         void *const userdata);
 
-void xmpp_handler_add(xmpp_conn_t * const 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);
+void xmpp_global_timed_handler_add(xmpp_ctx_t *const ctx,
+                                   xmpp_global_timed_handler handler,
+                                   const unsigned long period,
+                                   void *const userdata);
+void xmpp_global_timed_handler_delete(xmpp_ctx_t *const ctx,
+                                      xmpp_global_timed_handler handler);
 
-void xmpp_id_handler_add(xmpp_conn_t * const conn,
-			 xmpp_handler handler,
-			 const char * const id,
-			 void * const userdata);
-void xmpp_id_handler_delete(xmpp_conn_t * const conn,
-			    xmpp_handler handler,
-			    const char * const id);
+/* 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);
+
+void xmpp_handler_add(xmpp_conn_t *const 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);
+
+void xmpp_id_handler_add(xmpp_conn_t *const conn,
+                         xmpp_handler handler,
+                         const char *const id,
+                         void *const userdata);
+void xmpp_id_handler_delete(xmpp_conn_t *const conn,
+                            xmpp_handler handler,
+                            const char *const id);
 
 /*
 void xmpp_register_stanza_handler(conn, stanza, xmlns, type, handler)
@@ -313,88 +354,105 @@ void xmpp_register_stanza_handler(conn, stanza, xmlns, type, handler)
 
 /* allocate and initialize a blank stanza */
 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 *const 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 *const 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 *const stanza);
 
-int xmpp_stanza_is_text(xmpp_stanza_t * const stanza);
-int xmpp_stanza_is_tag(xmpp_stanza_t * const stanza);
+xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza);
+
+int xmpp_stanza_is_text(xmpp_stanza_t *const stanza);
+int xmpp_stanza_is_tag(xmpp_stanza_t *const 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 **const buf,
+                        size_t *const 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_next(xmpp_stanza_t * const stanza);
+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);
 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 **attr, int attrlen);
+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 **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 *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);
 /* 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 *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_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 *const text,
+                                   const size_t size);
+int xmpp_stanza_del_attribute(xmpp_stanza_t *const stanza,
+                              const char *const 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 *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);
 
 /* 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(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);
 
 /* stanza subclasses */
-xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx, const char * const type,
-                                const char * const to, const char * const id);
+xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
+                                const char *const type,
+                                const char *const to,
+                                const char *const 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 *const 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 *const type, const char *const 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 const type,
+                              const char *const text);
 
 /* jid */
 
 /* these return new strings that must be xmpp_free()'d */
-char *xmpp_jid_new(xmpp_ctx_t *ctx, const char *node,
-                                    const char *domain,
-                                    const char *resource);
+char *xmpp_jid_new(xmpp_ctx_t *ctx,
+                   const char *node,
+                   const char *domain,
+                   const char *resource);
 char *xmpp_jid_bare(xmpp_ctx_t *ctx, const char *jid);
 char *xmpp_jid_node(xmpp_ctx_t *ctx, const char *jid);
 char *xmpp_jid_domain(xmpp_ctx_t *ctx, const char *jid);
@@ -402,10 +460,10 @@ 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, const 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 *const ctx, const unsigned long timeout);
 
 /* UUID */
 
@@ -421,7 +479,8 @@ char *xmpp_uuid_gen(xmpp_ctx_t *ctx);
 typedef struct _xmpp_sha1_t xmpp_sha1_t;
 
 char *xmpp_sha1(xmpp_ctx_t *ctx, const unsigned char *data, size_t len);
-void xmpp_sha1_digest(const unsigned char *data, size_t len,
+void xmpp_sha1_digest(const unsigned char *data,
+                      size_t len,
                       unsigned char *digest);
 
 xmpp_sha1_t *xmpp_sha1_new(xmpp_ctx_t *ctx);
@@ -434,10 +493,14 @@ void xmpp_sha1_to_digest(xmpp_sha1_t *sha1, unsigned char *digest);
 
 /* Base64 */
 
-char *xmpp_base64_encode(xmpp_ctx_t *ctx, const unsigned char *data, size_t len);
+char *
+xmpp_base64_encode(xmpp_ctx_t *ctx, const unsigned char *data, size_t len);
 char *xmpp_base64_decode_str(xmpp_ctx_t *ctx, const char *base64, size_t len);
-void xmpp_base64_decode_bin(xmpp_ctx_t *ctx, const char *base64, size_t len,
-                            unsigned char **out, size_t *outlen);
+void xmpp_base64_decode_bin(xmpp_ctx_t *ctx,
+                            const char *base64,
+                            size_t len,
+                            unsigned char **out,
+                            size_t *outlen);
 
 #ifdef __cplusplus
 }

strophepp.h

@@ -1,133 +0,0 @@
-/* strophepp.h
-** strophe XMPP client library C++ API
-**
-** 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.
-*/
-
-/** @file
- *  Strophe public C++ API definitions.
- */
-
-#ifndef __LIBSTROPHE_STROPHEPP_H__
-#define __LIBSTROPHE_STROPHEPP_H__
-
-#include "strophe.h"
-
-namespace XMPP {
-    class Context {
-    private:
-        xmpp_mem_t m_mem;
-        xmpp_log_t m_log;
-        xmpp_ctx_t *m_ctx;
-
-    public:
-        Context();
-        virtual ~Context();
-
-        virtual void *alloc(const size_t size);
-        virtual void *realloc(void *p, const size_t size);
-        virtual void free(void *p);
-        virtual void log(const xmpp_log_level_t level,
-                         const char * const area,
-                         const char * const msg);
-
-        xmpp_ctx_t *getContext();
-
-    private:
-        static void *callAlloc(const size_t size, void * const userdata);
-        static void *callRealloc(void *p, const size_t size,
-                                 void * const userdata);
-        static void callFree(void *p, void * const userdata);
-        static void callLog(void * const userdata,
-                            const xmpp_log_level_t level,
-                            const char * const area,
-                            const char * const msg);
-    };
-
-    class Stanza {
-    private:
-        Context *m_ctx;
-        xmpp_stanza_t *m_stanza;
-
-        void *operator new(size_t size, Context *ctx);
-        void operator delete(void *p);
-        Stanza(Context *ctx);
-        virtual ~Stanza();
-
-    public:
-        static Stanza *create(Context *ctx);
-        void release();
-        Stanza *clone();
-        Stanza *copy();
-
-        int toText(const char ** const buf, size_t * const buflen);
-        Stanza *getChildren();
-        Stanza *getChildByName(const char * const name);
-        Stanza *getNext();
-        char *getAttribute(const char * const name);
-        char *getNamespace();
-        char *getText();
-        char *getName();
-        void addChild(Stanza *child);
-        void setNamespace(const char * const ns);
-        void setAttribute(const char * const key, const char * const value);
-        void setName(const char * const name);
-        void setText(const char * const text);
-        void setText(const char * const text, const size_t size);
-        char *getType();
-        char *getId();
-        char *getTo();
-        char *getFrom();
-        void setType(const char * const type);
-        void setId(const char * const id);
-        void setTo(const char * const to);
-        void setFrom(const char * const from);
-    };
-
-    class Connection {
-    private:
-        Context *m_ctx;
-        xmpp_conn_t *conn;
-
-        void *operator new(size_t size, Context *ctx);
-        Connection(Context *ctx);
-
-    public:
-        static Connection *create(Context *ctx);
-        virtual ~Connection();
-        Connection *clone();
-        void operator delete(void *p);
-
-        const char *getJID();
-        void setJID(const char * const jid);
-        const char *getPass();
-        void setPass(const char * const pass);
-        bool connectClient(const char * const domain,
-                           xmpp_conn_handler callback,
-                           void * const userdata);
-        void disconnect();
-        void send(Stanza *stanza);
-
-        void addTimedHandler(xmpp_timed_handler handler,
-                             const unsigned long perdio,
-                             void * const userdata);
-        void deleteTimedHandler(xmpp_timed_handler handler);
-        void addHandler(xmpp_handler handler,
-                        const char * const ns,
-                        const char * const name,
-                        const char * const type,
-                        void * const userdata);
-        void deleteHandler(xmpp_handler handler);
-        void addIdHandler(xmpp_handler handler,
-                          const char * const id,
-                          void * const userdata);
-        void deleteIdHandler(xmpp_handler handler);
-    };
-}
-
-#endif /* __LIBSTROPHE_STROPHEPP_H__ */

tests/check_parser.c

@@ -1,7 +1,7 @@
 /* check_parser.h
 ** strophe XMPP client library -- parser tests
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
@@ -18,14 +18,15 @@
 
 #include "test.h"
 
-#define fail_unless(expr) do {                  \
-    int result = (expr);                        \
-    if (!result) {                              \
-        printf("%s:%d: Assertion failed: %s\n", \
-               __FILE__, __LINE__, #expr);      \
-        exit(1);                                \
-    }                                           \
-} while (0)
+#define fail_unless(expr)                                               \
+    do {                                                                \
+        int result = (expr);                                            \
+        if (!result) {                                                  \
+            printf("%s:%d: Assertion failed: %s\n", __FILE__, __LINE__, \
+                   #expr);                                              \
+            exit(1);                                                    \
+        }                                                               \
+    } while (0)
 
 static void create_destroy(void)
 {
@@ -42,6 +43,9 @@ static void create_destroy(void)
 int cbtest_got_start = 0;
 void cbtest_handle_start(char *name, char **attrs, void *userdata)
 {
+    (void)attrs;
+    (void)userdata;
+
     if (strcmp(name, "stream") == 0)
         cbtest_got_start = 1;
 }
@@ -49,6 +53,8 @@ void cbtest_handle_start(char *name, char **attrs, void *userdata)
 int cbtest_got_end = 0;
 void cbtest_handle_end(char *name, void *userdata)
 {
+    (void)userdata;
+
     if (strcmp(name, "stream") == 0)
         cbtest_got_end = 1;
 }
@@ -56,6 +62,8 @@ void cbtest_handle_end(char *name, void *userdata)
 int cbtest_got_stanza = 0;
 void cbtest_handle_stanza(xmpp_stanza_t *stanza, void *userdata)
 {
+    (void)userdata;
+
     if (strcmp(xmpp_stanza_get_name(stanza), "message") == 0)
         cbtest_got_stanza = 1;
 }
@@ -67,9 +75,7 @@ static void callbacks(void)
     int ret;
 
     ctx = xmpp_ctx_new(NULL, NULL);
-    parser = parser_new(ctx, 
-                        cbtest_handle_start, 
-                        cbtest_handle_end,
+    parser = parser_new(ctx, cbtest_handle_start, cbtest_handle_end,
                         cbtest_handle_stanza, NULL);
 
     ret = parser_feed(parser, "<stream>", 8);

tests/res_query_dump.c

@@ -55,8 +55,8 @@ int main(int argc, char **argv)
     }
 
     domain = argv[1];
-    snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s",
-             service, proto, domain);
+    snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s", service, proto,
+             domain);
     errno = 0;
     len = res_query(fulldomain, C_IN, T_SRV, buf, sizeof(buf));
 

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)

tests/test.h

@@ -17,51 +17,48 @@
 #include <string.h>
 #include "ostypes.h"
 
-#define TEST_MAIN                                           \
-int main(int argc, char **argv) {                           \
-    int num_failed;                                         \
-    Suite *s = parser_suite();                              \
-    SRunner *sr = srunner_create(s);                        \
-    srunner_run_all(sr, CK_NORMAL);                         \
-    num_failed = srunner_ntests_failed(sr);                 \
-    srunner_free(sr);                                       \
-    return (num_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; \
-}
+#define TEST_MAIN                                               \
+    int main(int argc, char **argv)                             \
+    {                                                           \
+        int num_failed;                                         \
+        Suite *s = parser_suite();                              \
+        SRunner *sr = srunner_create(s);                        \
+        srunner_run_all(sr, CK_NORMAL);                         \
+        num_failed = srunner_ntests_failed(sr);                 \
+        srunner_free(sr);                                       \
+        return (num_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; \
+    }
 
 #ifndef ARRAY_SIZE
 #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);                   \
-    }                              \
-} while (0)
+#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);                   \
+        }                              \
+    } while (0)
 
-#define COMPARE_BUF(v1, len1, v2, len2)        \
-do {                                           \
-    const uint8_t *__v1 = (uint8_t *)(v1);     \
-    const uint8_t *__v2 = (uint8_t *)(v2);     \
-    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)); \
-        exit(1);                               \
-    }                                          \
-} while (0)
+#define COMPARE_BUF(v1, len1, v2, len2)                                \
+    do {                                                               \
+        const uint8_t *__v1 = (uint8_t *)(v1);                         \
+        const uint8_t *__v2 = (uint8_t *)(v2);                         \
+        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)); \
+            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);

tests/test_base64.c

@@ -17,11 +17,11 @@
 
 #include "test.h"
 
-static const unsigned char test_2_raw[] =
-    {0x14, 0xfb, 0x9c, 0x03, 0xd9, 0x7e, 0x00};
-static const unsigned char test_4_raw[] =
-    {0xd6, 0x2f, 0x27, 0x49,  0x7e, 0xdd, 0xf3, 0xd5,
-     0x41, 0xbc, 0x1b, 0xe9,  0xdf, 0xe9, 0xb3, 0x08, 0x00};
+static const unsigned char test_2_raw[] = {0x14, 0xfb, 0x9c, 0x03,
+                                           0xd9, 0x7e, 0x00};
+static const unsigned char test_4_raw[] = {0xd6, 0x2f, 0x27, 0x49, 0x7e, 0xdd,
+                                           0xf3, 0xd5, 0x41, 0xbc, 0x1b, 0xe9,
+                                           0xdf, 0xe9, 0xb3, 0x08, 0x00};
 
 static const struct {
     char *raw;
@@ -36,30 +36,26 @@ static const struct {
         .base64 = "FPucA9l+",
     },
     {
-        .raw =
-            "From rest and sleep, which but thy pictures be, "
-            "Much pleasure; then from thee much more must flow, "
-            "And soonest our best men with thee do go, "
-            "Rest of their bones, and soul's delivery.",
-        .base64 =
-            "RnJvbSByZXN0IGFuZCBzbGVlcCwgd2hpY2ggYnV0IHRoeSBwaWN0dXJl"
-            "cyBiZSwgTXVjaCBwbGVhc3VyZTsgdGhlbiBmcm9tIHRoZWUgbXVjaCBt"
-            "b3JlIG11c3QgZmxvdywgQW5kIHNvb25lc3Qgb3VyIGJlc3QgbWVuIHdp"
-            "dGggdGhlZSBkbyBnbywgUmVzdCBvZiB0aGVpciBib25lcywgYW5kIHNv"
-            "dWwncyBkZWxpdmVyeS4=",
+        .raw = "From rest and sleep, which but thy pictures be, "
+               "Much pleasure; then from thee much more must flow, "
+               "And soonest our best men with thee do go, "
+               "Rest of their bones, and soul's delivery.",
+        .base64 = "RnJvbSByZXN0IGFuZCBzbGVlcCwgd2hpY2ggYnV0IHRoeSBwaWN0dXJl"
+                  "cyBiZSwgTXVjaCBwbGVhc3VyZTsgdGhlbiBmcm9tIHRoZWUgbXVjaCBt"
+                  "b3JlIG11c3QgZmxvdywgQW5kIHNvb25lc3Qgb3VyIGJlc3QgbWVuIHdp"
+                  "dGggdGhlZSBkbyBnbywgUmVzdCBvZiB0aGVpciBib25lcywgYW5kIHNv"
+                  "dWwncyBkZWxpdmVyeS4=",
     },
     {
         .raw = (char *)test_4_raw,
         .base64 = "1i8nSX7d89VBvBvp3+mzCA==",
     },
     {
-        .raw =
-            "realm=\"chesspark.com\",nonce=\"b243c0d663257a9149999cef2f83"
-            "a22116559e93\",qop=\"auth\",charset=utf-8,algorithm=md5-sess",
-        .base64 =
-            "cmVhbG09ImNoZXNzcGFyay5jb20iLG5vbmNlPSJiMjQzYzBkNjYzMjU3"
-            "YTkxNDk5OTljZWYyZjgzYTIyMTE2NTU5ZTkzIixxb3A9ImF1dGgiLGNo"
-            "YXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz",
+        .raw = "realm=\"chesspark.com\",nonce=\"b243c0d663257a9149999cef2f83"
+               "a22116559e93\",qop=\"auth\",charset=utf-8,algorithm=md5-sess",
+        .base64 = "cmVhbG09ImNoZXNzcGFyay5jb20iLG5vbmNlPSJiMjQzYzBkNjYzMjU3"
+                  "YTkxNDk5OTljZWYyZjgzYTIyMTE2NTU5ZTkzIixxb3A9ImF1dGgiLGNo"
+                  "YXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz",
     },
 
     /* RFC4648 test vectors */
@@ -94,41 +90,30 @@ static const struct {
 };
 
 static const unsigned char bin_data[] = {
-    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05,
-    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67,
-    0x6d, 0x61, 0x69, 0x6c, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00,
-    0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04,
-    0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67,
-    0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
-    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
-    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14,
-    0x66, 0x04, 0x61, 0x6c, 0x74, 0x34, 0x04, 0x78,
-    0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
-    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,
-    0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32,
-    0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06,
-    0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00,
-    0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x19, 0x00,
-    0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
-    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f,
-    0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
-    0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
-    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00,
-    0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x33, 0x04,
-    0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
-    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f,
-    0x6d, 0x00,
+    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67, 0x6d, 0x61, 0x69, 0x6c,
+    0x03, 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61, 0x6c,
+    0x74, 0x34, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
+    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32, 0x04, 0x78, 0x6d, 0x70,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x43, 0x00, 0x19, 0x00, 0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
+    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
+    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61,
+    0x6c, 0x74, 0x33, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
+    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
 };
 
-int main(int argc, char *argv[])
+int main()
 {
     xmpp_ctx_t *ctx;
     unsigned char *udec;

tests/test_ctx.c

@@ -1,7 +1,8 @@
 /* test_ctx.c
-** libstrophe XMPP client library -- test routines for the library run-time context
+** libstrophe XMPP client library -- test routines for the library run-time
+*context
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -21,33 +22,41 @@ 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(const size_t size, void *const userdata)
 {
+    (void)userdata;
+
     mem_alloc_called++;
     return malloc(size);
 }
 
-void my_free(void *p, void * const userdata)
+void my_free(void *p, void *const userdata)
 {
+    (void)userdata;
+
     mem_free_called++;
     return free(p);
 }
 
-void *my_realloc(void *p, const size_t size, void * const userdata)
+void *my_realloc(void *p, const size_t size, void *const userdata)
 {
+    (void)userdata;
+
     mem_realloc_called++;
     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 *const userdata,
+               const xmpp_log_level_t level,
+               const char *const area,
+               const char *const msg)
 {
-    if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG
-	&& strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)
-	log_called++;
+    if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG &&
+        strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)
+        log_called++;
 }
 
-int main(int argc, char **argv)
+int main()
 {
     xmpp_ctx_t *ctx;
     xmpp_mem_t mymem;
@@ -56,7 +65,8 @@ int main(int argc, char **argv)
     void *testptr1, *testptr2;
 
     ctx = xmpp_ctx_new(NULL, NULL);
-    if (ctx == NULL) return 1;
+    if (ctx == NULL)
+        return 1;
 
     /* destroy context */
     xmpp_ctx_free(ctx);
@@ -75,15 +85,15 @@ int main(int argc, char **argv)
 
     testptr1 = xmpp_alloc(ctx, 1024);
     if (testptr1 == NULL) {
-	xmpp_ctx_free(ctx);
-	return 1;
+        xmpp_ctx_free(ctx);
+        return 1;
     }
 
     testptr2 = xmpp_realloc(ctx, testptr1, 2048);
     if (testptr2 == NULL) {
-	xmpp_free(ctx, testptr1);
-	xmpp_ctx_free(ctx);
-	return 1;
+        xmpp_free(ctx, testptr1);
+        xmpp_ctx_free(ctx);
+        return 1;
     }
 
     xmpp_free(ctx, testptr2);
@@ -91,11 +101,11 @@ int main(int argc, char **argv)
     xmpp_ctx_free(ctx);
 
     /* check for test failure */
-    if (!(log_called && mem_alloc_called && mem_realloc_called && 
-	  mem_free_called))
-	return 1;
+    if (!(log_called && mem_alloc_called && mem_realloc_called &&
+          mem_free_called))
+        return 1;
     if (mem_alloc_called != mem_free_called)
         return 1;
-    
+
     return 0;
 }

tests/test_hash.c

@@ -1,7 +1,7 @@
 /* test_hash.c
 ** libstrophe XMPP client library -- self-test for the hash-table implementation
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -22,12 +22,8 @@
 #define TESTSIZE 500
 
 /* static test data */
-const char *keys[] = {
-  "foo", "bar", "baz", "quux", "xyzzy"
-};
-const char *values[] = {
-  "wuzzle", "mug", "canonical", "rosebud", "lottery"
-};
+const char *keys[] = {"foo", "bar", "baz", "quux", "xyzzy"};
+const char *values[] = {"wuzzle", "mug", "canonical", "rosebud", "lottery"};
 const int nkeys = ARRAY_SIZE(keys);
 
 int main(int argc, char **argv)
@@ -43,10 +39,10 @@ int main(int argc, char **argv)
 
     /* initialize random numbers */
     if (argc > 2) {
-	/* use a seed from the command line */
-	seed = (unsigned int)atoi(argv[1]);
+        /* use a seed from the command line */
+        seed = (unsigned int)atoi(argv[1]);
     } else {
-	seed = (unsigned int)clock();
+        seed = (unsigned int)clock();
     }
     /* using random seed 'seed' */
     srand(seed);
@@ -54,37 +50,42 @@ int main(int argc, char **argv)
     /* allocate a default context */
     ctx = xmpp_ctx_new(NULL, NULL);
     if (ctx == NULL) {
-	/* ctx allocation failed! */
-	return -1;
+        /* ctx allocation failed! */
+        return -1;
     }
 
     /* allocate a hash table */
     table = hash_new(ctx, TABLESIZE, xmpp_free);
     if (table == NULL) {
-	/* table allocation failed! */
-	return 1;
+        /* table allocation failed! */
+        return 1;
     }
 
     /* test insertion */
     for (i = 0; i < nkeys; i++) {
-	err = hash_add(table, keys[i], xmpp_strdup(ctx, values[i]));
-	if (err) return err;
+        err = hash_add(table, keys[i], xmpp_strdup(ctx, values[i]));
+        if (err)
+            return err;
     }
 
     /* test key count */
     if (hash_num_keys(table) != nkeys) {
-	/* wrong number of keys in table! */
-	return 1;
+        /* wrong number of keys in table! */
+        return 1;
     }
 
     /* test replacing old values */
     for (i = 0; i < nkeys; i++) {
         err = hash_add(table, keys[0], xmpp_strdup(ctx, values[i]));
-        if (err) return err;
-        if (hash_num_keys(table) != nkeys) return 1;
+        if (err)
+            return err;
+        if (hash_num_keys(table) != nkeys)
+            return 1;
         result = hash_get(table, keys[0]);
-        if (result == NULL) return 1;
-        if (strcmp(result, values[i]) != 0) return 1;
+        if (result == NULL)
+            return 1;
+        if (strcmp(result, values[i]) != 0)
+            return 1;
     }
     /* restore value for the 1st key */
     hash_add(table, keys[0], xmpp_strdup(ctx, values[0]));
@@ -94,36 +95,36 @@ int main(int argc, char **argv)
 
     /* test lookup */
     for (i = 0; i < nkeys; i++) {
-	result = hash_get(clone, keys[i]);
-	if (result == NULL) {
-	    /* lookup failed! */
-	    return 1;
-	}
-	if (strcmp(values[i], result)) {
-	    /* lookup returned incorrect value! */
-	    return 1;
-	}
+        result = hash_get(clone, keys[i]);
+        if (result == NULL) {
+            /* lookup failed! */
+            return 1;
+        }
+        if (strcmp(values[i], result)) {
+            /* lookup returned incorrect value! */
+            return 1;
+        }
     }
 
     /* test key iterator */
     iter = hash_iter_new(clone);
     if (iter == NULL) {
-	/* iterator allocation failed! */
-	return 1;
+        /* iterator allocation failed! */
+        return 1;
     }
     for (i = 0; i < nkeys; i++) {
-	key = hash_iter_next(iter);
-	printf("key: '%s'\n", key);
+        key = hash_iter_next(iter);
+        printf("key: '%s'\n", key);
     }
     key = hash_iter_next(iter);
     if (key != NULL) {
-	/* extra keys returned! */
-	return 1;
+        /* extra keys returned! */
+        return 1;
     }
     key = hash_iter_next(iter);
     if (key != NULL) {
-	/* extra keys returned! */
-	return 1;
+        /* extra keys returned! */
+        return 1;
     }
     hash_iter_release(iter);
 
@@ -132,14 +133,19 @@ int main(int argc, char **argv)
 
     /* test drops */
     hash_drop(clone, keys[2]);
-    if (hash_get(clone, keys[2]) != NULL) return 1;
+    if (hash_get(clone, keys[2]) != NULL)
+        return 1;
     hash_drop(clone, keys[1]);
     hash_drop(clone, keys[4]);
-    if (hash_get(clone, keys[4]) != NULL) return 1;
-    if (hash_get(clone, keys[1]) != NULL) return 1;
+    if (hash_get(clone, keys[4]) != NULL)
+        return 1;
+    if (hash_get(clone, keys[1]) != NULL)
+        return 1;
     /* keys 0,3 should still be available */
-    if (hash_get(clone, keys[0]) == NULL) return 1;
-    if (hash_get(clone, keys[3]) == NULL) return 1;
+    if (hash_get(clone, keys[0]) == NULL)
+        return 1;
+    if (hash_get(clone, keys[3]) == NULL)
+        return 1;
 
     /* release our clone */
     hash_release(clone);

tests/test_jid.c

@@ -36,61 +36,93 @@ int test_jid(xmpp_ctx_t *ctx)
     node = xmpp_jid_node(ctx, jid1);
     domain = xmpp_jid_domain(ctx, jid1);
     resource = xmpp_jid_resource(ctx, jid1);
-    printf("jid '%s' parsed to %s, %s, %s\n",
-           jid1, _s(node), _s(domain), _s(resource));
-    if (bare == NULL || strcmp(bare, "foo@bar.com")) return 1;
-    if (node == NULL || strcmp(node, "foo")) return 1;
-    if (domain == NULL || strcmp(domain, "bar.com")) return 1;
-    if (resource != NULL) return 1;
-    if (bare) xmpp_free(ctx, bare);
-    if (node) xmpp_free(ctx, node);
-    if (domain) xmpp_free(ctx, domain);
-    if (resource) xmpp_free(ctx, resource);
+    printf("jid '%s' parsed to %s, %s, %s\n", jid1, _s(node), _s(domain),
+           _s(resource));
+    if (bare == NULL || strcmp(bare, "foo@bar.com"))
+        return 1;
+    if (node == NULL || strcmp(node, "foo"))
+        return 1;
+    if (domain == NULL || strcmp(domain, "bar.com"))
+        return 1;
+    if (resource != NULL)
+        return 1;
+    if (bare)
+        xmpp_free(ctx, bare);
+    if (node)
+        xmpp_free(ctx, node);
+    if (domain)
+        xmpp_free(ctx, domain);
+    if (resource)
+        xmpp_free(ctx, resource);
 
     bare = xmpp_jid_bare(ctx, jid2);
     node = xmpp_jid_node(ctx, jid2);
     domain = xmpp_jid_domain(ctx, jid2);
     resource = xmpp_jid_resource(ctx, jid2);
-    printf("jid '%s' parsed to %s, %s, %s\n",
-           jid2, _s(node), _s(domain), _s(resource));
-    if (bare == NULL || strcmp(bare, "anyone@example.com")) return 1;
-    if (node == NULL || strcmp(node, "anyone")) return 1;
-    if (domain == NULL || strcmp(domain, "example.com")) return 1;
-    if (resource == NULL || strcmp(resource, "hullo")) return 1;
-    if (bare) xmpp_free(ctx, bare);
-    if (node) xmpp_free(ctx, node);
-    if (domain) xmpp_free(ctx, domain);
-    if (resource) xmpp_free(ctx, resource);
+    printf("jid '%s' parsed to %s, %s, %s\n", jid2, _s(node), _s(domain),
+           _s(resource));
+    if (bare == NULL || strcmp(bare, "anyone@example.com"))
+        return 1;
+    if (node == NULL || strcmp(node, "anyone"))
+        return 1;
+    if (domain == NULL || strcmp(domain, "example.com"))
+        return 1;
+    if (resource == NULL || strcmp(resource, "hullo"))
+        return 1;
+    if (bare)
+        xmpp_free(ctx, bare);
+    if (node)
+        xmpp_free(ctx, node);
+    if (domain)
+        xmpp_free(ctx, domain);
+    if (resource)
+        xmpp_free(ctx, resource);
 
     bare = xmpp_jid_bare(ctx, jid3);
     node = xmpp_jid_node(ctx, jid3);
     domain = xmpp_jid_domain(ctx, jid3);
     resource = xmpp_jid_resource(ctx, jid3);
-    printf("jid '%s' parsed to %s, %s, %s\n",
-           jid3, _s(node), _s(domain), _s(resource));
-    if (bare == NULL || strcmp(bare, "manic.porter@xyz.net")) return 1;
-    if (node == NULL || strcmp(node, "manic.porter")) return 1;
-    if (domain == NULL || strcmp(domain, "xyz.net")) return 1;
-    if (resource == NULL || strcmp(resource, "frob")) return 1;
-    if (bare) xmpp_free(ctx, bare);
-    if (node) xmpp_free(ctx, node);
-    if (domain) xmpp_free(ctx, domain);
-    if (resource) xmpp_free(ctx, resource);
+    printf("jid '%s' parsed to %s, %s, %s\n", jid3, _s(node), _s(domain),
+           _s(resource));
+    if (bare == NULL || strcmp(bare, "manic.porter@xyz.net"))
+        return 1;
+    if (node == NULL || strcmp(node, "manic.porter"))
+        return 1;
+    if (domain == NULL || strcmp(domain, "xyz.net"))
+        return 1;
+    if (resource == NULL || strcmp(resource, "frob"))
+        return 1;
+    if (bare)
+        xmpp_free(ctx, bare);
+    if (node)
+        xmpp_free(ctx, node);
+    if (domain)
+        xmpp_free(ctx, domain);
+    if (resource)
+        xmpp_free(ctx, resource);
 
     bare = xmpp_jid_bare(ctx, jid4);
     node = xmpp_jid_node(ctx, jid4);
     domain = xmpp_jid_domain(ctx, jid4);
     resource = xmpp_jid_resource(ctx, jid4);
-    printf("jid '%s' parsed to %s, %s, %s\n",
-           jid4, _s(node), _s(domain), _s(resource));
-    if (bare == NULL || strcmp(bare, "domain.tld")) return 1;
-    if (node != NULL) return 1;
-    if (domain == NULL || strcmp(domain, "domain.tld")) return 1;
-    if (resource != NULL) return 1;
-    if (bare) xmpp_free(ctx, bare);
-    if (node) xmpp_free(ctx, node);
-    if (domain) xmpp_free(ctx, domain);
-    if (resource) xmpp_free(ctx, resource);
+    printf("jid '%s' parsed to %s, %s, %s\n", jid4, _s(node), _s(domain),
+           _s(resource));
+    if (bare == NULL || strcmp(bare, "domain.tld"))
+        return 1;
+    if (node != NULL)
+        return 1;
+    if (domain == NULL || strcmp(domain, "domain.tld"))
+        return 1;
+    if (resource != NULL)
+        return 1;
+    if (bare)
+        xmpp_free(ctx, bare);
+    if (node)
+        xmpp_free(ctx, node);
+    if (domain)
+        xmpp_free(ctx, domain);
+    if (resource)
+        xmpp_free(ctx, resource);
 
     return 0;
 }
@@ -101,38 +133,46 @@ int test_jid_new(xmpp_ctx_t *ctx)
 
     jid = xmpp_jid_new(ctx, "node", "domain", "resource");
     printf("new jid: '%s'\n", jid);
-    if (strcmp(jid, "node@domain/resource")) return 1;
+    if (strcmp(jid, "node@domain/resource"))
+        return 1;
     xmpp_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;
+    if (strcmp(jid, "foo@bar.com"))
+        return 1;
     xmpp_free(ctx, jid);
 
     return 0;
 }
 
-int main(int argc, char *argv[])
+int main()
 {
     xmpp_ctx_t *ctx;
     int ret;
 
     printf("allocating context... ");
     ctx = xmpp_ctx_new(NULL, NULL);
-    if (ctx == NULL) printf("failed to create context\n");
-    if (ctx == NULL) return -1;
+    if (ctx == NULL)
+        printf("failed to create context\n");
+    if (ctx == NULL)
+        return -1;
     printf("ok.\n");
 
     printf("testing jid routines...\n");
     ret = test_jid(ctx);
-    if (ret) printf("testing jid routines... failed!\n");
-    if (ret) return ret;
+    if (ret)
+        printf("testing jid routines... failed!\n");
+    if (ret)
+        return ret;
     printf("testing jid routines... ok.\n");
 
     printf("testing jid new routines...\n");
     ret = test_jid_new(ctx);
-    if (ret) printf("testing jid new routines... failed!\n");
-    if (ret) return ret;
+    if (ret)
+        printf("testing jid new routines... failed!\n");
+    if (ret)
+        return ret;
     printf("testing jid new routines... ok.\n");
 
     printf("freeing context... ");

tests/test_md5.c

@@ -57,7 +57,7 @@ static const struct {
     },
 };
 
-int main(int argc, char **argv)
+int main()
 {
     struct MD5Context ctx;
     unsigned char digest[16];

tests/test_rand.c

@@ -21,14 +21,29 @@
 #include "rand.c"
 
 /* stubs to build test without whole libstrophe */
-void *xmpp_alloc(const xmpp_ctx_t * const ctx, const size_t size) {
+void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size)
+{
+    (void)ctx;
+    (void)size;
     return NULL;
 }
-void xmpp_free(const xmpp_ctx_t * const ctx, void *p) { }
-int xmpp_snprintf (char *str, size_t count, const char *fmt, ...) {
+
+void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
+{
+    (void)ctx;
+    (void)p;
+}
+
+int xmpp_snprintf(char *str, size_t count, const char *fmt, ...)
+{
+    (void)str;
+    (void)count;
+    (void)fmt;
     return 0;
 }
-uint64_t time_stamp(void) {
+
+uint64_t time_stamp(void)
+{
     return 0;
 }
 
@@ -121,8 +136,8 @@ int main()
                         &entropy_input_len);
         test_hex_to_bin(test_vectors[i].nonce, nonce, &nonce_len);
 
-        Hash_DRBG_Instantiate(&ctx, entropy_input, entropy_input_len,
-                              nonce, nonce_len);
+        Hash_DRBG_Instantiate(&ctx, entropy_input, entropy_input_len, nonce,
+                              nonce_len);
         COMPARE(test_vectors[i].V1, test_bin_to_hex(ctx.V, sizeof(ctx.V)));
         COMPARE(test_vectors[i].C1, test_bin_to_hex(ctx.C, sizeof(ctx.C)));
         assert(ctx.reseed_counter == 1);

tests/test_resolver.c

@@ -19,117 +19,94 @@
 
 /* res_query("_xmpp-client._tcp.jabber.kiev.ua", C_IN, T_SRV, ...) */
 static const unsigned char data1[] = {
-    0x95, 0xf3, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
-    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, 0x04, 0x6b, 0x69,
-    0x65, 0x76, 0x02, 0x75, 0x61, 0x00, 0x00, 0x21,
-    0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01,
-    0x00, 0x00, 0x00, 0x3b, 0x00, 0x16, 0x00, 0x01,
-    0x00, 0x00, 0x14, 0x66, 0x06, 0x6a, 0x61, 0x62,
-    0x62, 0x65, 0x72, 0x04, 0x6b, 0x69, 0x65, 0x76,
-    0x02, 0x75, 0x61, 0x00,
+    0x95, 0xf3, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01, 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, 0x04, 0x6b, 0x69, 0x65, 0x76, 0x02, 0x75, 0x61, 0x00, 0x00, 0x21,
+    0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x00, 0x3b,
+    0x00, 0x16, 0x00, 0x01, 0x00, 0x00, 0x14, 0x66, 0x06, 0x6a, 0x61, 0x62,
+    0x62, 0x65, 0x72, 0x04, 0x6b, 0x69, 0x65, 0x76, 0x02, 0x75, 0x61, 0x00,
 };
 /* 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,
+    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,
 };
 /* res_query("_xmpp-client._tcp.gmail.com", C_IN, T_SRV, ...) */
 static const unsigned char data3[] = {
-    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05,
-    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67,
-    0x6d, 0x61, 0x69, 0x6c, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00,
-    0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04,
-    0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67,
-    0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
-    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
-    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14,
-    0x66, 0x04, 0x61, 0x6c, 0x74, 0x34, 0x04, 0x78,
-    0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
-    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,
-    0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32,
-    0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06,
-    0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00,
-    0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x19, 0x00,
-    0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
-    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f,
-    0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
-    0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
-    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00,
-    0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x33, 0x04,
-    0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
-    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f,
-    0x6d, 0x00,
+    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67, 0x6d, 0x61, 0x69, 0x6c,
+    0x03, 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61, 0x6c,
+    0x74, 0x34, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
+    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32, 0x04, 0x78, 0x6d, 0x70,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x43, 0x00, 0x19, 0x00, 0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
+    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
+    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61,
+    0x6c, 0x74, 0x33, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
+    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
 };
 /* res_query("_xmpp-client._tcp.jabber.calyxinstitute.org", C_IN, T_SRV, ...) */
 static const unsigned char data4[] = {
-    0x8d, 0x58, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00,    // .X........
-    0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63,    // ..._xmpp-c
-    0x6c, 0x69, 0x65, 0x6e, 0x74, 0x04, 0x5f, 0x74, 0x63, 0x70,    // lient._tcp
-    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x0e, 0x63, 0x61,    // .jabber.ca
-    0x6c, 0x79, 0x78, 0x69, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75,    // lyxinstitu
-    0x74, 0x65, 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x21, 0x00,    // te.org..!.
-    0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03,    // ....!.....
-    0x83, 0x00, 0x1e, 0x00, 0x04, 0x00, 0x00, 0x14, 0x66, 0x10,    // ........f.
-    0x69, 0x6a, 0x65, 0x65, 0x79, 0x6e, 0x72, 0x63, 0x36, 0x78,    // ijeeynrc6x
-    0x32, 0x75, 0x79, 0x35, 0x6f, 0x62, 0x05, 0x6f, 0x6e, 0x69,    // 2uy5ob.oni
-    0x6f, 0x6e, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,    // on....!...
-    0x00, 0x03, 0x83, 0x00, 0x21, 0x00, 0x05, 0x00, 0x01, 0x14,    // ....!.....
-    0x66, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x0e, 0x63,    // f.jabber.c
-    0x61, 0x6c, 0x79, 0x78, 0x69, 0x6e, 0x73, 0x74, 0x69, 0x74,    // alyxinstit
-    0x75, 0x74, 0x65, 0x03, 0x6f, 0x72, 0x67, 0x00,                // ute.org.
+    0x8d, 0x58, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, // .X........
+    0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, // ..._xmpp-c
+    0x6c, 0x69, 0x65, 0x6e, 0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, // lient._tcp
+    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x0e, 0x63, 0x61, // .jabber.ca
+    0x6c, 0x79, 0x78, 0x69, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, // lyxinstitu
+    0x74, 0x65, 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x21, 0x00, // te.org..!.
+    0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, // ....!.....
+    0x83, 0x00, 0x1e, 0x00, 0x04, 0x00, 0x00, 0x14, 0x66, 0x10, // ........f.
+    0x69, 0x6a, 0x65, 0x65, 0x79, 0x6e, 0x72, 0x63, 0x36, 0x78, // ijeeynrc6x
+    0x32, 0x75, 0x79, 0x35, 0x6f, 0x62, 0x05, 0x6f, 0x6e, 0x69, // 2uy5ob.oni
+    0x6f, 0x6e, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, // on....!...
+    0x00, 0x03, 0x83, 0x00, 0x21, 0x00, 0x05, 0x00, 0x01, 0x14, // ....!.....
+    0x66, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x0e, 0x63, // f.jabber.c
+    0x61, 0x6c, 0x79, 0x78, 0x69, 0x6e, 0x73, 0x74, 0x69, 0x74, // alyxinstit
+    0x75, 0x74, 0x65, 0x03, 0x6f, 0x72, 0x67, 0x00,             // ute.org.
 };
 /* res_query("_xmpp-client._tcp.jabber.org", C_IN, T_SRV, ...) with pointers */
 static const unsigned char data5[] = {
-    0x00, 0x00, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00,    // ..........
-    0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63,    // ..._xmpp-c
-    0x6c, 0x69, 0x65, 0x6e, 0x74, 0x04, 0x5f, 0x74, 0x63, 0x70,    // lient._tcp
-    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72,    // .jabber.or
-    0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21,    // g..!.....!
-    0x00, 0x01, 0x00, 0x00, 0x01, 0x9e, 0x00, 0x12, 0x00, 0x1f,    // ..........
-    0x00, 0x1e, 0x14, 0x66, 0x09, 0x68, 0x65, 0x72, 0x6d, 0x65,    // ...f.herme
-    0x73, 0x32, 0x76, 0x36, 0xc0, 0x1e, 0xc0, 0x0c, 0x00, 0x21,    // s2v6.....!
-    0x00, 0x01, 0x00, 0x00, 0x01, 0x9e, 0x00, 0x10, 0x00, 0x1e,    // ..........
-    0x00, 0x1e, 0x14, 0x66, 0x07, 0x68, 0x65, 0x72, 0x6d, 0x65,    // ...f.herme
-    0x73, 0x32, 0xc0, 0x1e,                                        // s2..
+    0x00, 0x00, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, // ..........
+    0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, // ..._xmpp-c
+    0x6c, 0x69, 0x65, 0x6e, 0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, // lient._tcp
+    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72, // .jabber.or
+    0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21, // g..!.....!
+    0x00, 0x01, 0x00, 0x00, 0x01, 0x9e, 0x00, 0x12, 0x00, 0x1f, // ..........
+    0x00, 0x1e, 0x14, 0x66, 0x09, 0x68, 0x65, 0x72, 0x6d, 0x65, // ...f.herme
+    0x73, 0x32, 0x76, 0x36, 0xc0, 0x1e, 0xc0, 0x0c, 0x00, 0x21, // s2v6.....!
+    0x00, 0x01, 0x00, 0x00, 0x01, 0x9e, 0x00, 0x10, 0x00, 0x1e, // ..........
+    0x00, 0x1e, 0x14, 0x66, 0x07, 0x68, 0x65, 0x72, 0x6d, 0x65, // ...f.herme
+    0x73, 0x32, 0xc0, 0x1e,                                     // s2..
 };
 /* hacked data2 with two empty-string targets. */
 static const unsigned char data6[] = {
-    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, 0x07, 0x00, 0x1e, 0x00, 0x1e, 0x14, 0x66,
-    0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,
-    0x00, 0x03, 0x83, 0x00, 0x08, 0x00, 0x1f, 0x00,
-    0x1e, 0x14, 0x66, 0xc0, 0x40,
+    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, 0x07, 0x00, 0x1e, 0x00, 0x1e, 0x14, 0x66, 0x00, 0xc0,
+    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x08,
+    0x00, 0x1f, 0x00, 0x1e, 0x14, 0x66, 0xc0, 0x40,
 };
 
 static const struct {
@@ -187,12 +164,13 @@ static int srv_rr_list_len(resolver_srv_rr_t *list)
 {
     int nr;
 
-    for (nr = 0; list != NULL; ++nr, list = list->next);
+    for (nr = 0; list != NULL; ++nr, list = list->next)
+        ;
 
     return nr;
 }
 
-int main(int argc, char **argv)
+int main()
 {
     xmpp_ctx_t *ctx;
     xmpp_rand_t *rand;
@@ -223,8 +201,8 @@ int main(int argc, char **argv)
         port = srv_rr_list->port;
         COMPARE(tests[i].target, domain);
         if (tests[i].port != port) {
-            printf("fail! got port=%u, but should be %u\n",
-                   (unsigned)port, (unsigned)tests[i].port);
+            printf("fail! got port=%u, but should be %u\n", (unsigned)port,
+                   (unsigned)tests[i].port);
             return 1;
         }
         printf("ok\n");

tests/test_sasl.c

@@ -1,7 +1,7 @@
 /* test_sasl.c
 ** libstrophe XMPP client library -- test routines for the SASL implementation
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -20,32 +20,32 @@ static const unsigned char jid[] = "foo@bar.com";
 static const char password[] = "secret";
 static const char response_plain[] = "AGZvb0BiYXIuY29tAHNlY3JldA==";
 
-static const char challenge_md5[] = 
-  "cmVhbG09InNvbWVyZWFsbSIsbm9uY2U9Ik9BNk1HOXRFUUdtMmhoIixxb3A9ImF1dGgi"
-  "LGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNzCg==";
+static const char challenge_md5[] =
+    "cmVhbG09InNvbWVyZWFsbSIsbm9uY2U9Ik9BNk1HOXRFUUdtMmhoIixxb3A9ImF1dGgi"
+    "LGNoYXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNzCg==";
 static const char response_md5[] =
-  "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
-  "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iMDBERUFEQkVFRjAwIixuYz0wMDAw"
-  "MDAwMSxxb3A9YXV0aCxkaWdlc3QtdXJpPSJ4bXBwL3NvbWVyZWFsbSIscmVz"
-  "cG9uc2U9NGVhNmU4N2JjMDkzMzUwNzQzZGIyOGQ3MDIwOGNhZmIsY2hhcnNl"
-  "dD11dGYtOA==";
+    "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
+    "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iMDBERUFEQkVFRjAwIixuYz0wMDAw"
+    "MDAwMSxxb3A9YXV0aCxkaWdlc3QtdXJpPSJ4bXBwL3NvbWVyZWFsbSIscmVz"
+    "cG9uc2U9NGVhNmU4N2JjMDkzMzUwNzQzZGIyOGQ3MDIwOGNhZmIsY2hhcnNl"
+    "dD11dGYtOA==";
 static const char response_md5_rfc[] =
-  "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
-  "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLG5jPTAw"
-  "MDAwMDAxLHFvcD1hdXRoLGRpZ2VzdC11cmk9InhtcHAvZXhhbXBsZS5jb20i"
-  "LHJlc3BvbnNlPWQzODhkYWQ5MGQ0YmJkNzYwYTE1MjMyMWYyMTQzYWY3LGNo"
-  "YXJzZXQ9dXRmLTgK";
+    "dXNlcm5hbWU9InNvbWVub2RlIixyZWFsbT0ic29tZXJlYWxtIixub25jZT0i"
+    "T0E2TUc5dEVRR20yaGgiLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLG5jPTAw"
+    "MDAwMDAxLHFvcD1hdXRoLGRpZ2VzdC11cmk9InhtcHAvZXhhbXBsZS5jb20i"
+    "LHJlc3BvbnNlPWQzODhkYWQ5MGQ0YmJkNzYwYTE1MjMyMWYyMTQzYWY3LGNo"
+    "YXJzZXQ9dXRmLTgK";
 
 static const char challenge_md5_2[] =
-  "cmVhbG09ImVsd29vZC5pbm5vc29mdC5jb20iLG5vbmNlPSJPQTZNRzl0"
-  "RVFHbTJoaCIscW9wPSJhdXRoIixhbGdvcml0aG09bWQ1LXNlc3MsY2hh"
-  "cnNldD11dGYtOA==";
+    "cmVhbG09ImVsd29vZC5pbm5vc29mdC5jb20iLG5vbmNlPSJPQTZNRzl0"
+    "RVFHbTJoaCIscW9wPSJhdXRoIixhbGdvcml0aG09bWQ1LXNlc3MsY2hh"
+    "cnNldD11dGYtOA==";
 static const char response_md5_2[] =
-  "Y2hhcnNldD11dGYtOCx1c2VybmFtZT0iY2hyaXMiLHJlYWxtPSJlbHdvb2"
-  "QuaW5ub3NvZnQuY29tIixub25jZT0iT0E2TUc5dEVRR20yaGgiLG5jPTAw"
-  "MDAwMDAxLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLGRpZ2VzdC11cmk9Im"
-  "ltYXAvZWx3b29kLmlubm9zb2Z0LmNvbSIscmVzcG9uc2U9ZDM4OGRhZDkw"
-  "ZDRiYmQ3NjBhMTUyMzIxZjIxNDNhZjcscW9wPWF1dGg=";
+    "Y2hhcnNldD11dGYtOCx1c2VybmFtZT0iY2hyaXMiLHJlYWxtPSJlbHdvb2"
+    "QuaW5ub3NvZnQuY29tIixub25jZT0iT0E2TUc5dEVRR20yaGgiLG5jPTAw"
+    "MDAwMDAxLGNub25jZT0iT0E2TUhYaDZWcVRyUmsiLGRpZ2VzdC11cmk9Im"
+    "ltYXAvZWx3b29kLmlubm9zb2Z0LmNvbSIscmVzcG9uc2U9ZDM4OGRhZDkw"
+    "ZDRiYmQ3NjBhMTUyMzIxZjIxNDNhZjcscW9wPWF1dGg=";
 
 int test_plain(xmpp_ctx_t *ctx)
 {
@@ -53,12 +53,12 @@ int test_plain(xmpp_ctx_t *ctx)
 
     result = sasl_plain(ctx, jid, password);
     if (result == NULL) {
-	/* SASL PLAIN internal failure! */
-	return 1;
+        /* SASL PLAIN internal failure! */
+        return 1;
     }
     if (strncmp(response_plain, result, strlen(response_plain))) {
-	/* SASL PLAIN returned incorrect string! */
-	return 2;
+        /* SASL PLAIN returned incorrect string! */
+        return 2;
     }
     xmpp_free(ctx, result);
 
@@ -69,38 +69,44 @@ int test_digest_md5(xmpp_ctx_t *ctx)
 {
     char *result;
 
-    result = sasl_digest_md5(ctx, challenge_md5,
-				"somenode@somerealm", "secret");
+    result =
+        sasl_digest_md5(ctx, challenge_md5, "somenode@somerealm", "secret");
     printf("response:\n%s\n", result);
     if (strcmp(response_md5, result)) {
-	/* generated incorrect response to challenge */
-	return 1;
+        /* generated incorrect response to challenge */
+        return 1;
     }
 
     return 0;
 }
 
-int main(int argc, char *argv[])
+int main()
 {
     xmpp_ctx_t *ctx;
     int ret;
 
-    printf("allocating context... ");   
+    printf("allocating context... ");
     ctx = xmpp_ctx_new(NULL, NULL);
-    if (ctx == NULL) printf("failed to create context\n");
-    if (ctx == NULL) return -1;
+    if (ctx == NULL)
+        printf("failed to create context\n");
+    if (ctx == NULL)
+        return -1;
     printf("ok.\n");
 
-    printf("testing SASL PLAIN... ");   
+    printf("testing SASL PLAIN... ");
     ret = test_plain(ctx);
-    if (ret) printf("failed!\n");
-    if (ret) return ret;
+    if (ret)
+        printf("failed!\n");
+    if (ret)
+        return ret;
     printf("ok.\n");
 
     printf("testing SASL DIGEST-MD5... ");
     ret = test_digest_md5(ctx);
-    if (ret) printf("failed!\n");
-    if (ret) return ret;
+    if (ret)
+        printf("failed!\n");
+    if (ret)
+        return ret;
     printf("ok.\n");
 
     printf("freeing context... ");

tests/test_scram.c

@@ -25,12 +25,12 @@
  * Test vectors for derivation function (RFC6070).
  */
 static const struct {
-    char *P;      /* text */
-    char *S;      /* salt */
+    char *P; /* text */
+    char *S; /* salt */
     size_t P_len;
     size_t S_len;
-    uint32_t c;   /* i */
-    char *DK;     /* resulting digest */
+    uint32_t c; /* i */
+    char *DK;   /* resulting digest */
 } df_vectors[] = {
     {
         .P = "password",
@@ -58,19 +58,19 @@ static const struct {
     },
 };
 
-static void test_df(void)
+static void test_df(const struct hash_alg *alg)
 {
     size_t i;
     const char *s;
-    uint8_t dk[SHA1_DIGEST_SIZE];
+    uint8_t dk[SCRAM_DIGEST_SIZE];
 
-    printf("Derivation function tests (SCRAM_SHA1_Hi).\n");
+    printf("Derivation function SCRAM_Hi tests for %s.\n", alg->scram_name);
     for (i = 0; i < ARRAY_SIZE(df_vectors); ++i) {
         printf("Test #%d: ", (int)i + 1);
-        SCRAM_SHA1_Hi((uint8_t *)df_vectors[i].P, df_vectors[i].P_len,
-                      (uint8_t *)df_vectors[i].S, df_vectors[i].S_len,
-                      df_vectors[i].c, dk);
-        s = test_bin_to_hex(dk, sizeof(dk));
+        SCRAM_Hi(alg, (uint8_t *)df_vectors[i].P, df_vectors[i].P_len,
+                 (uint8_t *)df_vectors[i].S, df_vectors[i].S_len,
+                 df_vectors[i].c, dk);
+        s = test_bin_to_hex(dk, alg->digest_size);
         COMPARE(df_vectors[i].DK, s);
         printf("ok\n");
     }
@@ -101,42 +101,115 @@ static const struct {
     },
 };
 
-static void test_scram(void)
+static void test_scram(const struct hash_alg *alg)
 {
-    uint8_t key[SHA1_DIGEST_SIZE];
-    uint8_t sign[SHA1_DIGEST_SIZE];
+    uint8_t key[SCRAM_DIGEST_SIZE];
+    uint8_t sign[SCRAM_DIGEST_SIZE];
     uint8_t salt[256];
     size_t salt_len;
     char auth[512];
     const char *s;
     size_t i;
-    int j;
+    size_t j;
 
-    printf("SCRAM_SHA1_ClientKey and SCRAM_SHA1_ClientSignature tests.\n");
+    printf("SCRAM_ClientKey and SCRAM_ClientSignature tests for %s.\n",
+           alg->scram_name);
     for (i = 0; i < ARRAY_SIZE(scram_vectors); ++i) {
         printf("Test #%d: ", (int)i + 1);
-        snprintf(auth, sizeof(auth), "%s,%s,%s",
-                 scram_vectors[i].initial + 3, scram_vectors[i].challenge,
-                 scram_vectors[i].response);
+        snprintf(auth, sizeof(auth), "%s,%s,%s", scram_vectors[i].initial + 3,
+                 scram_vectors[i].challenge, scram_vectors[i].response);
         test_hex_to_bin(scram_vectors[i].salt, salt, &salt_len);
 
-        SCRAM_SHA1_ClientKey((uint8_t *)scram_vectors[i].password,
-                             strlen(scram_vectors[i].password),
-                             salt, salt_len, scram_vectors[i].i, key);
-        SCRAM_SHA1_ClientSignature(key, (uint8_t *)auth, strlen(auth), sign);
-        for (j = 0; j < SHA1_DIGEST_SIZE; j++) {
+        SCRAM_ClientKey(alg, (uint8_t *)scram_vectors[i].password,
+                        strlen(scram_vectors[i].password), salt, salt_len,
+                        scram_vectors[i].i, key);
+        SCRAM_ClientSignature(alg, key, (uint8_t *)auth, strlen(auth), sign);
+        for (j = 0; j < alg->digest_size; j++) {
             sign[j] ^= key[j];
         }
-        s = test_bin_to_hex(sign, SHA1_DIGEST_SIZE);
+        s = test_bin_to_hex(sign, alg->digest_size);
         COMPARE(scram_vectors[i].sign, s);
         printf("ok\n");
     }
 }
 
-int main(int argc, char **argv)
+/*
+ * Test vectors for HMAC (RFC2202, RFC4231).
+ */
+static const uint8_t hmac_key1[] = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+                                    0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
+static const uint8_t hmac_data1[] = {0x48, 0x69, 0x20, 0x54,
+                                     0x68, 0x65, 0x72, 0x65};
+static const struct {
+    const uint8_t *key;
+    size_t key_len;
+    const uint8_t *data;
+    size_t data_len;
+    const uint8_t sha1[SHA1_DIGEST_SIZE];
+    const uint8_t sha256[SHA256_DIGEST_SIZE];
+    const uint8_t sha512[SHA512_DIGEST_SIZE];
+} hmac_vectors[] = {
+    {
+        .key = hmac_key1,
+        .key_len = sizeof(hmac_key1),
+        .data = hmac_data1,
+        .data_len = sizeof(hmac_data1),
+        .sha1 = {0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xe2, 0x8b,
+                 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e, 0xf1, 0x46, 0xbe, 0x00},
+        .sha256 = {0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53,
+                   0x5c, 0xa8, 0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b,
+                   0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83, 0x3d, 0xa7,
+                   0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32, 0xcf, 0xf7},
+        .sha512 = {0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d, 0x4f, 0xf0,
+                   0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0, 0x23, 0x79, 0xf4, 0xe2,
+                   0xce, 0x4e, 0xc2, 0x78, 0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1,
+                   0x7c, 0xde, 0xda, 0xa8, 0x33, 0xb7, 0xd6, 0xb8, 0xa7, 0x02,
+                   0x03, 0x8b, 0x27, 0x4e, 0xae, 0xa3, 0xf4, 0xe4, 0xbe, 0x9d,
+                   0x91, 0x4e, 0xeb, 0x61, 0xf1, 0x70, 0x2e, 0x69, 0x6c, 0x20,
+                   0x3a, 0x12, 0x68, 0x54},
+    },
+};
+
+static void test_hmac(const struct hash_alg *alg)
 {
-    test_df();
-    test_scram();
+    size_t i;
+    uint8_t digest[SCRAM_DIGEST_SIZE];
+
+    printf("HMAC tests for %s.\n", alg->scram_name);
+    for (i = 0; i < ARRAY_SIZE(hmac_vectors); ++i) {
+        printf("Test #%d: ", (int)i + 1);
+        memset(digest, 0, sizeof(digest));
+        crypto_HMAC(alg, hmac_vectors[i].key, hmac_vectors[i].key_len,
+                    hmac_vectors[i].data, hmac_vectors[i].data_len, digest);
+        switch (alg->digest_size) {
+        case SHA1_DIGEST_SIZE:
+            COMPARE_BUF(hmac_vectors[i].sha1, alg->digest_size, digest,
+                        alg->digest_size);
+            break;
+        case SHA256_DIGEST_SIZE:
+            COMPARE_BUF(hmac_vectors[i].sha256, alg->digest_size, digest,
+                        alg->digest_size);
+            break;
+        case SHA512_DIGEST_SIZE:
+            COMPARE_BUF(hmac_vectors[i].sha512, alg->digest_size, digest,
+                        alg->digest_size);
+            break;
+        default:
+            printf("Unknown digest size: %zu\n", alg->digest_size);
+            exit(1);
+        }
+        printf("ok\n");
+    }
+}
+
+int main()
+{
+    test_df(&scram_sha1);
+    test_scram(&scram_sha1);
+    test_hmac(&scram_sha1);
+    test_hmac(&scram_sha256);
+    test_hmac(&scram_sha512);
 
     return 0;
 }

tests/test_sha1.c

@@ -12,25 +12,23 @@
 
 /* Test Vectors (from FIPS PUB 180-1) */
 static char *test_data[] = {
-    "abc",
-    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+    "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
     "A million repetitions of 'a'",
     "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-                    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"};
-static char *test_results[] = {
-    "A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
-    "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
-    "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F",
-    "AD5B3FDB CB526778 C2839D2F 151EA753 995E26A0"};
+    "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"};
+static char *test_results[] = {"A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
+                               "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
+                               "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F",
+                               "AD5B3FDB CB526778 C2839D2F 151EA753 995E26A0"};
 
 static void digest_to_hex(const uint8_t *digest, char *output)
 {
-    int i,j;
+    int i, j;
     char *c = output;
 
-    for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
+    for (i = 0; i < SHA1_DIGEST_SIZE / 4; i++) {
         for (j = 0; j < 4; j++) {
-            sprintf(c,"%02X", digest[i*4+j]);
+            sprintf(c, "%02X", digest[i * 4 + j]);
             c += 2;
         }
         sprintf(c, " ");
@@ -39,9 +37,9 @@ static void digest_to_hex(const uint8_t *digest, char *output)
     *(c - 1) = '\0';
 }
 
-int main(int argc, char** argv)
+int main()
 {
-    int k;
+    size_t k;
     SHA1_CTX context;
     uint8_t digest[20];
     char output[80];
@@ -49,23 +47,23 @@ int main(int argc, char** argv)
 
     fprintf(stdout, "verifying SHA-1 implementation... ");
 
-    for (k = 0; k < ARRAY_SIZE(test_data); k++){
+    for (k = 0; k < ARRAY_SIZE(test_data); k++) {
         if (k == 2) {
             /* this case will be checked below */
             continue;
         }
         copy = strdup(test_data[k]);
         crypto_SHA1_Init(&context);
-        crypto_SHA1_Update(&context, (uint8_t*)test_data[k],
+        crypto_SHA1_Update(&context, (uint8_t *)test_data[k],
                            strlen(test_data[k]));
         crypto_SHA1_Final(&context, digest);
         digest_to_hex(digest, output);
 
         if (strcmp(output, test_results[k])) {
             fprintf(stdout, "FAIL\n");
-            fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[k]);
-            fprintf(stderr,"\t%s returned\n", output);
-            fprintf(stderr,"\t%s is correct\n", test_results[k]);
+            fprintf(stderr, "* hash of \"%s\" incorrect:\n", test_data[k]);
+            fprintf(stderr, "\t%s returned\n", output);
+            fprintf(stderr, "\t%s is correct\n", test_results[k]);
             return (1);
         }
         if (strcmp(copy, test_data[k])) {
@@ -78,18 +76,18 @@ int main(int argc, char** argv)
     /* million 'a' vector we feed separately */
     crypto_SHA1_Init(&context);
     for (k = 0; k < 1000000; k++)
-        crypto_SHA1_Update(&context, (uint8_t*)"a", 1);
+        crypto_SHA1_Update(&context, (uint8_t *)"a", 1);
     crypto_SHA1_Final(&context, digest);
     digest_to_hex(digest, output);
     if (strcmp(output, test_results[2])) {
         fprintf(stdout, "FAIL\n");
-        fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[2]);
-        fprintf(stderr,"\t%s returned\n", output);
-        fprintf(stderr,"\t%s is correct\n", test_results[2]);
+        fprintf(stderr, "* hash of \"%s\" incorrect:\n", test_data[2]);
+        fprintf(stderr, "\t%s returned\n", output);
+        fprintf(stderr, "\t%s is correct\n", test_results[2]);
         return (1);
     }
 
     /* success */
     fprintf(stdout, "ok\n");
-    return(0);
+    return (0);
 }

tests/test_sha256.c

@@ -0,0 +1,44 @@
+/* Tests for SHA-256 from LibTomCrypt */
+/* This file is in the public domain */
+
+/* gcc -o test_sha256 -I./src tests/test_sha256.c tests/test.c src/sha256.c */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha256.h"
+#include "test.h"
+
+int main()
+{
+    static const struct {
+        const char *msg;
+        unsigned char hash[SHA256_DIGEST_SIZE];
+    } tests[] = {
+        {"abc",
+         {0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40,
+          0xde, 0x5d, 0xae, 0x22, 0x23, 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17,
+          0x7a, 0x9c, 0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad}},
+        {"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+         {0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8, 0xe5, 0xc0, 0x26,
+          0x93, 0x0c, 0x3e, 0x60, 0x39, 0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff,
+          0x21, 0x67, 0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1}},
+    };
+
+    int i;
+    unsigned char tmp[SHA256_DIGEST_SIZE];
+    sha256_context md;
+
+    for (i = 0; i < (int)(sizeof(tests) / sizeof(tests[0])); i++) {
+        sha256_init(&md);
+        sha256_process(&md, (unsigned char *)tests[i].msg,
+                       (unsigned long)strlen(tests[i].msg));
+        sha256_done(&md, tmp);
+        COMPARE_BUF(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash));
+    }
+
+    /* success */
+    fprintf(stdout, "ok\n");
+    return (0);
+}

tests/test_sha512.c

@@ -0,0 +1,65 @@
+/* Tests for SHA-512 from LibTomCrypt */
+/* This file is in the public domain */
+
+/* gcc -o test_sha512 -I./src tests/test_sha512.c tests/test.c src/sha512.c */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sha512.h"
+#include "test.h"
+
+static const uint8_t hash_1m_a[SHA512_DIGEST_SIZE] = {
+    0xe7, 0x18, 0x48, 0x3d, 0x0c, 0xe7, 0x69, 0x64, 0x4e, 0x2e, 0x42,
+    0xc7, 0xbc, 0x15, 0xb4, 0x63, 0x8e, 0x1f, 0x98, 0xb1, 0x3b, 0x20,
+    0x44, 0x28, 0x56, 0x32, 0xa8, 0x03, 0xaf, 0xa9, 0x73, 0xeb, 0xde,
+    0x0f, 0xf2, 0x44, 0x87, 0x7e, 0xa6, 0x0a, 0x4c, 0xb0, 0x43, 0x2c,
+    0xe5, 0x77, 0xc3, 0x1b, 0xeb, 0x00, 0x9c, 0x5c, 0x2c, 0x49, 0xaa,
+    0x2e, 0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b};
+
+int main()
+{
+    static const struct {
+        const char *msg;
+        uint8_t hash[SHA512_DIGEST_SIZE];
+    } tests[] = {
+        {"abc",
+         {0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73,
+          0x49, 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9,
+          0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a, 0x21,
+          0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23,
+          0xa3, 0xfe, 0xeb, 0xbd, 0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8,
+          0x0e, 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f}},
+        {"abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklm"
+         "nopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+         {0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda, 0x8c, 0xf4, 0xf7,
+          0x28, 0x14, 0xfc, 0x14, 0x3f, 0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f,
+          0x7f, 0xa1, 0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18, 0x50,
+          0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4, 0x33, 0x1b, 0x99, 0xde,
+          0xc4, 0xb5, 0x43, 0x3a, 0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26,
+          0x54, 0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09}},
+    };
+
+    size_t i;
+    uint8_t tmp[SHA512_DIGEST_SIZE];
+    sha512_context md;
+
+    for (i = 0; i < ARRAY_SIZE(tests); i++) {
+        sha512_init(&md);
+        sha512_process(&md, (uint8_t *)tests[i].msg, strlen(tests[i].msg));
+        sha512_done(&md, tmp);
+        COMPARE_BUF(tests[i].hash, sizeof(tests[i].hash), tmp, sizeof(tmp));
+    }
+
+    /* special case: one million repetitions of the character 'a' */
+    sha512_init(&md);
+    for (i = 0; i < 1000000U; ++i)
+        sha512_process(&md, (uint8_t *)"a", 1);
+    sha512_done(&md, tmp);
+    COMPARE_BUF(hash_1m_a, sizeof(hash_1m_a), tmp, sizeof(tmp));
+
+    /* success */
+    fprintf(stdout, "ok\n");
+    return 0;
+}

tests/test_snprintf.c

@@ -16,76 +16,50 @@
 #define LONG_STRING 1024
 #endif
 
-int main (void)
+int main(void)
 {
-  char buf1[LONG_STRING];
-  char buf2[LONG_STRING];
-  char *fp_fmt[] = {
-    "%-1.5f",
-    "%1.5f",
-    "%123.9f",
-    "%10.5f",
-    "% 10.5f",
-    "%+22.9f",
-    "%+4.9f",
-    "%01.3f",
-    "%4f",
-    "%3.1f",
-    "%3.2f",
-    "%.0f",
-    "%.1f",
-    NULL
-  };
-  double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996,
-    0.9996, 1.996, 4.136, 0};
-  char *int_fmt[] = {
-    "%-1.5d",
-    "%1.5d",
-    "%123.9d",
-    "%5.5d",
-    "%10.5d",
-    "% 10.5d",
-    "%+22.33d",
-    "%01.3d",
-    "%4d",
-    "0x%x",
-    "0x%04x",
-    NULL
-  };
-  long int_nums[] = { -1, 134, 91340, 341, 0203, 0x76543210, 0};
-  int x, y;
-  int fail = 0;
-  int num = 0;
+    char buf1[LONG_STRING];
+    char buf2[LONG_STRING];
+    char *fp_fmt[] = {"%-1.5f",  "%1.5f",  "%123.9f", "%10.5f", "% 10.5f",
+                      "%+22.9f", "%+4.9f", "%01.3f",  "%4f",    "%3.1f",
+                      "%3.2f",   "%.0f",   "%.1f",    NULL};
+    double fp_nums[] = {-1.5,  134.21, 91340.2, 341.1234, 0203.9, 0.96,
+                        0.996, 0.9996, 1.996,   4.136,    0};
+    char *int_fmt[] = {"%-1.5d", "%1.5d",   "%123.9d",  "%5.5d",
+                       "%10.5d", "% 10.5d", "%+22.33d", "%01.3d",
+                       "%4d",    "0x%x",    "0x%04x",   NULL};
+    long int_nums[] = {-1, 134, 91340, 341, 0203, 0x76543210, 0};
+    int x, y;
+    int fail = 0;
+    int num = 0;
 
-  printf ("Testing xmpp_snprintf format codes against system sprintf...\n");
+    printf("Testing xmpp_snprintf format codes against system sprintf...\n");
 
-  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]);
-      sprintf (buf2, fp_fmt[x], fp_nums[y]);
-      if (strcmp (buf1, buf2))
-      {
-	printf("xmpp_snprintf doesn't match Format: %s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
-	    fp_fmt[x], buf1, buf2);
-	fail++;
-      }
-      num++;
-    }
+    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]);
+            sprintf(buf2, fp_fmt[x], fp_nums[y]);
+            if (strcmp(buf1, buf2)) {
+                printf("xmpp_snprintf doesn't match Format: "
+                       "%s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
+                       fp_fmt[x], buf1, buf2);
+                fail++;
+            }
+            num++;
+        }
 
-  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]);
-      sprintf (buf2, int_fmt[x], int_nums[y]);
-      if (strcmp (buf1, buf2))
-      {
-	printf("xmpp_snprintf doesn't match Format: %s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
-	    int_fmt[x], buf1, buf2);
-	fail++;
-      }
-      num++;
-    }
-  printf ("%d tests failed out of %d.\n", fail, num);
-  return fail != 0 ? 1 : 0;
+    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]);
+            sprintf(buf2, int_fmt[x], int_nums[y]);
+            if (strcmp(buf1, buf2)) {
+                printf("xmpp_snprintf doesn't match Format: "
+                       "%s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
+                       int_fmt[x], buf1, buf2);
+                fail++;
+            }
+            num++;
+        }
+    printf("%d tests failed out of %d.\n", fail, num);
+    return fail != 0 ? 1 : 0;
 }

tests/test_sock.c

@@ -1,7 +1,7 @@
 /* test_sock.c
 ** libstrophe XMPP client library -- test routines for the socket abstraction
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -23,19 +23,24 @@ int wait_for_connect(sock_t sock)
     fd_set wfds, efds;
     int ret;
 
-    FD_ZERO(&wfds); FD_SET(sock, &wfds);
-    FD_ZERO(&efds); FD_SET(sock, &efds);
+    FD_ZERO(&wfds);
+    FD_SET(sock, &wfds);
+    FD_ZERO(&efds);
+    FD_SET(sock, &efds);
 
     ret = select(sock + 1, NULL, &wfds, &efds, NULL);
-    if (ret <= 0) return -1;
+    if (ret <= 0)
+        return -1;
 
-    if (FD_ISSET(sock, &efds)) return 0;
-    if (FD_ISSET(sock, &wfds)) return 1;
+    if (FD_ISSET(sock, &efds))
+        return 0;
+    if (FD_ISSET(sock, &wfds))
+        return 1;
 
     return -1;
 }
 
-int main(int argc, char **argv)
+int main()
 {
     sock_t sock;
     int err;
@@ -45,15 +50,15 @@ int main(int argc, char **argv)
     sock = sock_connect("www.google.com", 80);
 
     if (sock < 0) {
-	sock_shutdown();
-	return 1;
+        sock_shutdown();
+        return 1;
     }
 
     err = wait_for_connect(sock);
     if (err < 0) {
-	sock_close(sock);
-	sock_shutdown();
-	return 1;
+        sock_close(sock);
+        sock_shutdown();
+        return 1;
     }
 
     sock_close(sock);

tests/test_stanza.c

@@ -0,0 +1,131 @@
+/* test_stanza.c
+ * libstrophe XMPP client library -- test routines for stanza functions
+ *
+ * Copyright (C) 2020 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.
+ */
+
+/* gcc -o test_stanza -I./src tests/test_stanza.c -lstrophe */
+
+#include <strophe.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MAGICPTR ((void *)0xfeedbeef)
+static unsigned long used_blocks = 0;
+
+static void *stanza_alloc(size_t size, void *userdata)
+{
+    assert(userdata == MAGICPTR);
+
+    ++used_blocks;
+    return malloc(size);
+}
+
+static void stanza_free(void *ptr, void *userdata)
+{
+    assert(userdata == MAGICPTR);
+
+    if (ptr != NULL) {
+        assert(used_blocks > 0);
+        --used_blocks;
+    }
+    free(ptr);
+}
+
+static void *stanza_realloc(void *ptr, size_t size, void *userdata)
+{
+    assert(userdata == MAGICPTR);
+
+    if (ptr != NULL && size == 0) {
+        /* equivalent to free(ptr) */
+        assert(used_blocks > 0);
+        --used_blocks;
+    } else if (ptr == NULL) {
+        /* equivalent to malloc(size) */
+        ++used_blocks;
+    }
+    return realloc(ptr, size);
+}
+
+static const xmpp_mem_t stanza_mem = {
+    .alloc = &stanza_alloc,
+    .free = &stanza_free,
+    .realloc = &stanza_realloc,
+    .userdata = MAGICPTR,
+};
+
+static void test_stanza_add_child(xmpp_ctx_t *ctx)
+{
+    xmpp_stanza_t *stanza;
+    xmpp_stanza_t *child;
+    unsigned long baseline = used_blocks;
+
+    /* xmpp_stanza_add_child */
+
+    stanza = xmpp_stanza_new(ctx);
+    child = xmpp_stanza_new(ctx);
+    assert(stanza != NULL);
+    assert(child != NULL);
+    xmpp_stanza_add_child(stanza, child);
+    xmpp_stanza_release(stanza);
+    assert(used_blocks > baseline);
+    xmpp_stanza_release(child);
+    assert(used_blocks == baseline);
+
+    /* xmpp_stanza_add_child_ex */
+
+    stanza = xmpp_stanza_new(ctx);
+    child = xmpp_stanza_new(ctx);
+    assert(stanza != NULL);
+    assert(child != NULL);
+    xmpp_stanza_add_child_ex(stanza, child, 0);
+    xmpp_stanza_release(stanza);
+    assert(used_blocks == baseline);
+}
+
+static void test_stanza_from_string(xmpp_ctx_t *ctx)
+{
+    xmpp_stanza_t *stanza;
+    char *buf;
+    size_t buflen;
+    int ret;
+
+    static 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 "
+        "xmlns=\"jabber:client\">Hello World!</body></payload></signcrypt>";
+
+    stanza = xmpp_stanza_new_from_string(ctx, str);
+    assert(stanza != NULL);
+    ret = xmpp_stanza_to_text(stanza, &buf, &buflen);
+    assert(ret == XMPP_EOK);
+    assert(strcmp(buf, str) == 0);
+    xmpp_free(ctx, buf);
+    xmpp_stanza_release(stanza);
+}
+
+int main()
+{
+    xmpp_ctx_t *ctx;
+
+    xmpp_initialize();
+    ctx = xmpp_ctx_new(&stanza_mem, NULL);
+    assert(ctx != NULL);
+
+    test_stanza_add_child(ctx);
+    test_stanza_from_string(ctx);
+
+    xmpp_ctx_free(ctx);
+    xmpp_shutdown();
+
+    /* All allocated blocks must be freed. */
+    assert(used_blocks == 0);
+}

tests/test_string.c

@@ -23,11 +23,11 @@
 /* strtok_s() has appeared in visual studio 2005.
    Use own implementation for older versions. */
 #ifdef _MSC_VER
-# if (_MSC_VER >= 1400)
-# define strtok_r strtok_s
-# else
-# define strtok_r xmpp_strtok_r
-# endif
+#if (_MSC_VER >= 1400)
+#define strtok_r strtok_s
+#else
+#define strtok_r xmpp_strtok_r
+#endif
 #endif /* _MSC_VER */
 
 static int test_strtok_r(void)
@@ -75,8 +75,8 @@ static int test_strdup_one(xmpp_ctx_t *ctx, const char *s)
 
     if (!s1 || !s2 || strcmp(s1, s2) != 0) {
         rc = -1;
-        printf("strdup: '%s', xmpp_strdup: '%s'\n",
-               s1 ? s1 : "<NULL>", s2 ? s2 : "<NULL>");
+        printf("strdup: '%s', xmpp_strdup: '%s'\n", s1 ? s1 : "<NULL>",
+               s2 ? s2 : "<NULL>");
     }
 
     free(s1);
@@ -92,7 +92,7 @@ static int test_strdup(void)
     size_t i;
     int rc = 0;
 
-    static const char *tests[] = { "", "\0", "test", "s p a c e", "\n\r" };
+    static const char *tests[] = {"", "\0", "test", "s p a c e", "\n\r"};
 
     ctx = xmpp_ctx_new(NULL, NULL);
     assert(ctx != NULL);