WIP Initial server support

.gitignore

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

.travis.yml

@@ -1,26 +1,15 @@
 language: c
 install:
     - sudo apt-get update
-  - sudo apt-get -y install libtool pkg-config libexpat1-dev libxml2-dev libssl-dev libc-ares-dev dos2unix
+    - sudo apt-get -y install libtool pkg-config libexpat1-dev libxml2-dev libssl-dev check
-stages:
-  - style
-  - test
 before_script:
-  - ./travis/before_script.sh
+    - ./bootstrap.sh
+script:
+    - ./configure ${CONFIGURE_OPT} && make && make check-TESTS
 env:
     - CONFIGURE_OPT="--without-libxml2"
     - CONFIGURE_OPT="--with-libxml2"
-  - CONFIGURE_OPT="--disable-tls"
+    - CONFIGURE_OPT="--disable-tls --without-libxml2"
-  - CONFIGURE_OPT="--enable-cares"
+    - CONFIGURE_OPT="--disable-tls --with-libxml2"
-  - CONFIGURE_OPT="PKG_CONFIG_PATH=${HOME}/libressl/lib/pkgconfig" LIBRESSL=yes LIBRESSL_COMMIT="v3.1.4"
-  - CONFIGURE_OPT="PKG_CONFIG_PATH=${HOME}/libressl/lib/pkgconfig" LIBRESSL=yes LIBRESSL_COMMIT="v2.1.7"
-script: ./bootstrap.sh && ./configure ${CONFIGURE_OPT} CFLAGS="-Werror" && make && make check
-jobs:
-  include:
-    - stage: style
-      name: "Check code style"
-      script: ./bootstrap.sh && ./configure && make format && git diff --exit-code
-      env:
-        - CONFIGURE_OPT=""
 matrix:
     fast_finish: true

ChangeLog

@@ -1,38 +1,3 @@
-0.10.1
-	- Fixed compilation error when LibreSSL is used
-
-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
-	  connection flag XMPP_CONN_FLAG_LEGACY_AUTH
-	- Session is not established if it is optional
-	- Fixed a bug causing a reused connection not to cleanup properly
-	- Improved debug logging in OpenSSL module
-	- Few memory leaks fixed
-
 0.9.2
 	- OpenSSL tls module verifies certificate by default. Set flag
 	  XMPP_CONN_FLAG_TRUST_TLS to ignore result of the verification
@@ -43,12 +8,7 @@
 	  userdata
 	- System handlers are deleted on xmpp_conn_t reconnection. Old system
 	  handlers could cause problems
-	- Default timeout for xmpp_run() is increased from 1 millisecond to 1
-	  second in order to reduce CPU consumption
-	- Reduced memory usage in expat module
 	- New functions:
-		- xmpp_error_new()
-		- xmpp_send_error()
 		- xmpp_ctx_set_timeout()
 		- xmpp_sha1_digest()
 

Makefile.am

@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = -g -Wall
 
 PARSER_CFLAGS=@PARSER_CFLAGS@
 PARSER_LIBS=@PARSER_LIBS@
@@ -8,17 +9,15 @@ PARSER_LIBS=@PARSER_LIBS@
 SSL_CFLAGS = @openssl_CFLAGS@
 SSL_LIBS = @openssl_LIBS@
 
-RESOLV_CFLAGS = @RESOLV_CFLAGS@
 RESOLV_LIBS = @RESOLV_LIBS@
 
-WARNING_FLAGS = @WARNING_FLAGS@
+STROPHE_FLAGS = -I$(top_srcdir) -Wall -Wextra -Werror -Wno-unused-parameter
-STROPHE_FLAGS = -I$(top_srcdir) $(WARNING_FLAGS)
 STROPHE_LIBS = libstrophe.la
 
 ## Main build targets
 lib_LTLIBRARIES = libstrophe.la
 
-libstrophe_la_CFLAGS = $(SSL_CFLAGS) $(STROPHE_FLAGS) $(PARSER_CFLAGS) $(RESOLV_CFLAGS)
+libstrophe_la_CFLAGS = $(SSL_CFLAGS) $(STROPHE_FLAGS) $(PARSER_CFLAGS)
 libstrophe_la_LDFLAGS = $(SSL_LIBS) $(PARSER_LIBS) $(RESOLV_LIBS) -no-undefined
 # Export only public API
 libstrophe_la_LDFLAGS += -export-symbols-regex '^xmpp_'
@@ -37,9 +36,8 @@ libstrophe_la_SOURCES = \
 	src/resolver.c \
 	src/sasl.c \
 	src/scram.c \
+	src/server.c \
 	src/sha1.c \
-	src/sha256.c \
-	src/sha512.c \
 	src/snprintf.c \
 	src/sock.c \
 	src/stanza.c \
@@ -55,10 +53,7 @@ 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 \
@@ -77,11 +72,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 \
@@ -92,6 +87,8 @@ 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
@@ -103,9 +100,9 @@ noinst_PROGRAMS = \
 	examples/bot \
 	examples/component \
 	examples/roster \
+	examples/server \
 	examples/uuid \
-	examples/vcard \
+	examples/vcard
-	examples/register
 
 examples_active_SOURCES = examples/active.c
 examples_active_CFLAGS = $(STROPHE_FLAGS)
@@ -122,23 +119,21 @@ examples_component_LDADD = $(STROPHE_LIBS)
 examples_roster_SOURCES = examples/roster.c
 examples_roster_CFLAGS = $(STROPHE_FLAGS)
 examples_roster_LDADD = $(STROPHE_LIBS)
+examples_server_SOURCES = examples/server.c
+examples_server_CFLAGS = $(STROPHE_FLAGS)
+examples_server_LDADD = $(STROPHE_LIBS)
 examples_uuid_SOURCES = examples/uuid.c
 examples_uuid_CFLAGS = $(STROPHE_FLAGS)
 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 \
@@ -148,7 +143,6 @@ TESTS = \
 	tests/test_jid \
 	tests/test_snprintf \
 	tests/test_string \
-	tests/test_stanza \
 	tests/test_resolver
 
 check_PROGRAMS = $(TESTS)
@@ -187,19 +181,12 @@ 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
 
@@ -210,13 +197,3 @@ 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,7 +5,11 @@ 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.
 
-libstrophe is dual licensed under MIT and GPLv3.
+Its goals are:
+
+- usable quickly
+- well documented
+- reliable
 
 Build Instructions
 ------------------

_clang-format

@@ -1,17 +0,0 @@
----
-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.10.0], [jack@metajack.im])
+AC_INIT([libstrophe], [0.9.1], [jack@metajack.im])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT([dlopen])
@@ -15,25 +15,12 @@ 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],
     [AS_HELP_STRING([--disable-tls], [disable TLS support])])
-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],
@@ -75,7 +62,7 @@ if test "x$with_libxml2" != xno -a "x$with_parser" = x; then
                 [
                     with_parser="libxml2"
                     libxml2_CFLAGS="-I${includedir}/libxml2"
-                    libxml2_LIBS="-lxml2 -lm"
+                    libxml2_LIBS="-lxml2"
                     PC_LIBS="${libxml2_LIBS} ${PC_LIBS}"
                     PC_CFLAGS="${libxml2_CFLAGS} ${PC_CFLAGS}"
                 ])
@@ -95,24 +82,13 @@ fi
 
 AC_MSG_NOTICE([libstrophe will use the $with_parser XML parser])
 
-if test "x$enable_cares" = xyes; then
+AC_SEARCH_LIBS([socket], [socket])
-    PKG_CHECK_MODULES([libcares], [libcares >= 1.7.0],
-        [
-            PC_REQUIRES="libcares ${PC_REQUIRES}"
-            RESOLV_CFLAGS=$libcares_CFLAGS
-            RESOLV_LIBS=$libcares_LIBS
-            AC_DEFINE([HAVE_CARES])
-        ],
-        [AC_MSG_ERROR([libcares not found])])
-        # TODO: if pkg-config doesn't find, check the library manually
-else
 
 AS_CASE([$PLATFORM],
     [bsd],     [RESOLV_LIBS=""],
     [qnx],     [RESOLV_LIBS="-lsocket"],
     [solaris], [RESOLV_LIBS="-lresolv -lsocket -lnsl"],
     [android], [RESOLV_LIBS=""],
-    [haiku],   [RESOLV_LIBS="-lnetwork"],
                [RESOLV_LIBS="-lresolv"])
 
 LIBS_TMP="${LIBS}"
@@ -134,8 +110,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
 LIBS="${LIBS_TMP}"
 PC_LIBS="${RESOLV_LIBS} ${PC_LIBS}"
 
-fi
-
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
     [AC_ARG_WITH([pkgconfigdir],
         [AS_HELP_STRING([--with-pkgconfigdir],
@@ -152,8 +126,6 @@ AC_SUBST([PC_LIBS], [${PC_LIBS}])
 
 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

@@ -26,8 +26,6 @@ int handle_reply(xmpp_conn_t *const conn,
     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");
@@ -46,18 +44,13 @@ int handle_reply(xmpp_conn_t *const conn,
     return 0;
 }
 
-void conn_handler(xmpp_conn_t *const conn,
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status, 
-                  const xmpp_conn_event_t status,
+		  const int error, xmpp_stream_error_t * const stream_error,
-                  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");
 	

examples/basic.c

@@ -19,25 +19,21 @@
 #define KA_INTERVAL 1
 
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-                  const xmpp_conn_event_t status,
+                  const int error, xmpp_stream_error_t * const stream_error,
-                  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 {
+    }
+    else {
         fprintf(stderr, "DEBUG: disconnected\n");
         xmpp_stop(ctx);
     }
@@ -49,7 +45,6 @@ int main(int argc, char **argv)
     xmpp_conn_t *conn;
     xmpp_log_t *log;
     char *jid, *pass, *host = NULL;
-    const char *cafile = NULL;
     long flags = 0;
     int tcp_keepalive = 0;
     int i;
@@ -60,28 +55,19 @@ 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 if (strncmp(argv[i], "--cafile=", strlen("--cafile=")) == 0)
-            cafile = argv[i] + strlen("--cafile=");
         else
             break;
     }
     if ((argc - i) < 2 || (argc - i) > 3) {
         fprintf(stderr, "Usage: basic [options] <jid> <pass> [<host>]\n\n"
                         "Options:\n"
-                        "  --cafile=<PATH>      CAfile for cert verification.\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");
@@ -101,9 +87,8 @@ 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 */
@@ -112,12 +97,7 @@ int main(int argc, char **argv)
     /* configure connection properties (optional) */
     xmpp_conn_set_flags(conn, flags);
     /* configure TCP keepalive (optional) */
-    if (tcp_keepalive)
+    if (tcp_keepalive) xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);
-        xmpp_conn_set_keepalive(conn, KA_TIMEOUT, KA_INTERVAL);
-
-    /* add external CAfile if needed */
-    if (cafile)
-        xmpp_conn_tls_cafile(conn, cafile);
 
     /* setup authentication information */
     xmpp_conn_set_jid(conn, jid);

examples/bot.c

@@ -22,9 +22,8 @@
 
 #include <strophe.h>
 
-int version_handler(xmpp_conn_t *const conn,
+
-                    xmpp_stanza_t *const stanza,
+int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
-                    void *const userdata)
 {
     xmpp_stanza_t *reply, *query, *name, *version, *text;
     const char *ns;
@@ -70,9 +69,8 @@ int version_handler(xmpp_conn_t *const conn,
     return 1;
 }
 
-int message_handler(xmpp_conn_t *const conn,
+
-                    xmpp_stanza_t *const stanza,
+int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
-                    void *const userdata)
 {
     xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
     xmpp_stanza_t *body, *reply;
@@ -89,8 +87,7 @@ int message_handler(xmpp_conn_t *const conn,
 
     intext = xmpp_stanza_get_text(body);
 
-    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza),
+    printf("Incoming message from %s: %s\n", xmpp_stanza_get_from(stanza), intext);
-           intext);
 
     reply = xmpp_stanza_reply(stanza);
     if (xmpp_stanza_get_type(reply) == NULL)
@@ -118,29 +115,24 @@ int message_handler(xmpp_conn_t *const conn,
 }
 
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status, 
-                  const xmpp_conn_event_t status,
+                  const int error, xmpp_stream_error_t * const stream_error,
-                  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;
         fprintf(stderr, "DEBUG: connected\n");
-        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL,
+        xmpp_handler_add(conn, version_handler, "jabber:iq:version", "iq", NULL, ctx);
-                         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);
     }
@@ -165,9 +157,8 @@ 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 */

examples/component.c

@@ -19,22 +19,19 @@
 
 #include <strophe.h>
 
+
 /* define a handler for connection events */
-void conn_handler(xmpp_conn_t *const conn,
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
-                  const xmpp_conn_event_t status,
+                  const int error, xmpp_stream_error_t * const stream_error,
-                  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);
     }
@@ -70,9 +67,8 @@ 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 */
@@ -98,3 +94,4 @@ int main(int argc, char **argv)
 
     return 0;
 }
+

examples/register.c

@@ -1,370 +0,0 @@
-/* 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

@@ -25,8 +25,6 @@ int handle_reply(xmpp_conn_t *const conn,
     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");
@@ -36,11 +34,13 @@ int handle_reply(xmpp_conn_t *const conn,
 	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,
+		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"),
+		printf("\t %s sub=%s\n",
+		       xmpp_stanza_get_attribute(item, "jid"),
 		       xmpp_stanza_get_attribute(item, "subscription"));
 	printf("END OF LIST\n");
     }
@@ -51,18 +51,13 @@ int handle_reply(xmpp_conn_t *const conn,
     return 0;
 }
 
-void conn_handler(xmpp_conn_t *const conn,
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status, 
-                  const xmpp_conn_event_t status,
+		  const int error, xmpp_stream_error_t * const stream_error,
-                  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");
 	

examples/server.c

@@ -0,0 +1,83 @@
+
+#include <stdio.h>
+#include <string.h>
+#include <strophe.h>
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#endif
+
+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_stanza_t *success;
+
+    if (strcmp(xmpp_stanza_get_name(stanza), "auth") == 0) {
+        success = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(success, "success");
+        xmpp_stanza_set_ns(success, XMPP_NS_SASL);
+        xmpp_send(conn, success);
+        xmpp_stanza_release(success);
+    } else
+        xmpp_disconnect(conn);
+
+    return 1;
+}
+
+void server_handler(xmpp_server_t * const srv, xmpp_conn_t * const conn,
+                    const xmpp_server_event_t event, const int error,
+                    void * const userdata)
+{
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
+
+    static char *attrs[] = {
+        "xmlns", XMPP_NS_CLIENT, "xmlns:stream", XMPP_NS_STREAMS,
+        "id", "0123456789", "from", "127.0.0.1", "version", "1.0",
+        "xml:lang", "en",
+    };
+
+    switch (event) {
+    case XMPP_SERVER_ACCEPT:
+        printf("Event XMPP_SERVER_ACCEPT\n");
+        break;
+    case XMPP_SERVER_OPEN_STREAM:
+        printf("Event XMPP_SERVER_OPEN_STREAM\n");
+        xmpp_handler_add(conn, message_handler, NULL, NULL, NULL, ctx);
+        xmpp_conn_open_stream(conn, attrs, ARRAY_SIZE(attrs));
+        xmpp_send_raw_string(conn,
+                "<stream:features>"
+                "<mechanisms xmlns=\"%s\"><mechanism>PLAIN</mechanism>"
+                "</mechanisms></stream:features>", XMPP_NS_SASL);
+        break;
+    case XMPP_SERVER_DISCONNECT:
+        printf("Event XMPP_SERVER_DISCONNECT\n");
+        xmpp_stop(ctx);
+        break;
+    default:
+        printf("Unknown event\n");
+        break;
+    }
+}
+
+int main()
+{
+    xmpp_ctx_t *ctx;
+    xmpp_log_t *log;
+    xmpp_server_t *srv;
+
+    xmpp_initialize();
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);
+    ctx = xmpp_ctx_new(NULL, log);
+    srv = xmpp_server_new(ctx);
+    xmpp_server_listen(srv, 0, server_handler, ctx);
+
+    xmpp_run(ctx);
+
+    xmpp_server_stop(srv);
+    xmpp_server_free(srv);
+    xmpp_ctx_free(ctx);
+    xmpp_shutdown();
+
+    return 0;
+}

examples/uuid.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <strophe.h>
 
-int main()
+int main(int argc, char **argv)
 {
     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
+static void vcard_print_string(vcard_t *vc, xmpp_stanza_t *stanza,
-vcard_print_string(vcard_t *vc, xmpp_stanza_t *stanza, const char *info)
+                               const char *info)
 {
     char *s = xmpp_stanza_get_text(stanza);
 
@@ -140,9 +140,14 @@ 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},
+        { "PHOTO", vcard_photo },
-        {"EMAIL", vcard_email},   {"FN", vcard_fn},     {"N", vcard_name},
+        { "BDAY", vcard_bday },
-        {"NICKNAME", vcard_nick}, {"URL", vcard_url},
+        { "DESC", vcard_desc },
+        { "EMAIL", vcard_email },
+        { "FN", vcard_fn },
+        { "N", vcard_name },
+        { "NICKNAME", vcard_nick },
+        { "URL", vcard_url },
     };
 
     tag = xmpp_stanza_get_name(stanza);
@@ -162,16 +167,13 @@ exit:
 
 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,
+static int recv_vcard(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
-                      xmpp_stanza_t *const stanza,
                       void * const userdata)
 {
     vcard_t *vc = userdata;
@@ -211,8 +213,7 @@ 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,
+    xmpp_send_raw_string(conn, "<iq from='%s' to='%s' type='get' id='%s'>"
-                         "<iq from='%s' to='%s' type='get' id='%s'>"
                                "<vCard xmlns='vcard-temp'/></iq>",
                                xmpp_conn_get_bound_jid(conn), to, id);
 }
@@ -252,8 +253,7 @@ int main(int argc, char **argv)
     if (argc < 4 || argc > 5) {
         prog = argc > 0 ? strdup(argv[0]) : NULL;
         printf("Usage: %s <login-jid> <password> <recipient-jid> "
-               "[image-file]\n\n",
+               "[image-file]\n\n", prog == NULL ? "vcard" : basename(prog));
-               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,3 +281,4 @@ 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 := -DHAVE_DECL_VA_COPY
+LOCAL_CFLAGS :=
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/.. \
 	$(LOCAL_PATH)/../src \
@@ -44,9 +44,8 @@ LOCAL_SRC_FILES := \
 	../src/resolver.c \
 	../src/sasl.c \
 	../src/scram.c \
+	../src/server.c \
 	../src/sha1.c \
-	../src/sha256.c \
-	../src/sha512.c \
 	../src/snprintf.c \
 	../src/sock.c \
 	../src/stanza.c \
@@ -64,7 +63,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libexpat
-LOCAL_CFLAGS := -DHAVE_MEMMOVE -DXML_DEV_URANDOM
+LOCAL_CFLAGS := -DHAVE_MEMMOVE
 #LOCAL_C_INCLUDES := \
 #	$(LOCAL_PATH)/expat
 

jni/Application.mk

@@ -1,2 +1,2 @@
-APP_ABI := armeabi-v7a arm64-v8a
+APP_ABI := armeabi armeabi-v7a mips x86
 APP_PLATFORM := android-19

rpm/README

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,59 @@
+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/auth.c

@@ -24,7 +24,7 @@
 #include "rand.h"
 
 #ifdef _MSC_VER
-#define strcasecmp _stricmp
+#define strcasecmp stricmp
 #endif
 
 /* TODO: these should configurable at runtime on a per connection basis  */
@@ -61,7 +61,6 @@
 #endif
 
 static void _auth(xmpp_conn_t * const conn);
-static void _auth_legacy(xmpp_conn_t *conn);
 static void _handle_open_sasl(xmpp_conn_t * const conn);
 static void _handle_open_tls(xmpp_conn_t * const conn);
 
@@ -70,6 +69,11 @@ static int _handle_component_hs_response(xmpp_conn_t *const conn,
             xmpp_stanza_t * const stanza,
             void * const userdata);
 
+static int _handle_missing_legacy(xmpp_conn_t * const conn,
+				  void * const userdata);
+static int _handle_legacy(xmpp_conn_t * const conn,
+			  xmpp_stanza_t * const stanza,
+			  void * const userdata);
 static int _handle_features_sasl(xmpp_conn_t * const conn,
 				 xmpp_stanza_t * const stanza,
 				 void * const userdata);
@@ -82,14 +86,15 @@ static int _handle_digestmd5_challenge(xmpp_conn_t *const conn,
 static int _handle_digestmd5_rspauth(xmpp_conn_t * const conn,
 			xmpp_stanza_t * const stanza,
 			void * const userdata);
-static int _handle_scram_challenge(xmpp_conn_t *const conn,
+static int _handle_scram_sha1_challenge(xmpp_conn_t * const conn,
 			xmpp_stanza_t * const stanza,
 			void * const userdata);
-static char *_make_scram_init_msg(xmpp_conn_t *const conn);
+static char *_make_scram_sha1_init_msg(xmpp_conn_t * const conn);
 
 static int _handle_missing_features_sasl(xmpp_conn_t * const conn,
 					 void * const userdata);
-static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata);
+static int _handle_missing_bind(xmpp_conn_t * const conn,
+				void * const userdata);
 static int _handle_bind(xmpp_conn_t * const conn,
 			xmpp_stanza_t * const stanza,
 			void * const userdata);
@@ -109,8 +114,6 @@ static int _handle_error(xmpp_conn_t *const conn,
     xmpp_stanza_t *child;
     const char *name;
 
-    UNUSED(userdata);
-
     /* free old stream error if it's still there */
     if (conn->stream_error) {
 	xmpp_stanza_release(conn->stream_error->stanza);
@@ -120,8 +123,7 @@ static int _handle_error(xmpp_conn_t *const conn,
     }
 
     /* create stream error structure */
-    conn->stream_error = (xmpp_stream_error_t *)xmpp_alloc(
+    conn->stream_error = (xmpp_stream_error_t *)xmpp_alloc(conn->ctx, sizeof(xmpp_stream_error_t));
-        conn->ctx, sizeof(xmpp_stream_error_t));
 
 	conn->stream_error->text = NULL;
 	conn->stream_error->type = XMPP_SE_UNDEFINED_CONDITION;
@@ -202,8 +204,6 @@ static int _handle_error(xmpp_conn_t *const conn,
 static int _handle_missing_features(xmpp_conn_t * const conn,
 				    void * const userdata)
 {
-    UNUSED(userdata);
-
     xmpp_debug(conn->ctx, "xmpp", "didn't get stream features");
 
     /* legacy auth will be attempted */
@@ -212,16 +212,15 @@ static int _handle_missing_features(xmpp_conn_t *const conn,
     return 0;
 }
 
+
+
 static int _handle_features(xmpp_conn_t * const conn,
 			    xmpp_stanza_t * const stanza,
 			    void * const userdata)
 {
     xmpp_stanza_t *child, *mech;
-    const char *ns;
     char *text;
 
-    UNUSED(userdata);
-
     /* remove the handler that detects missing stream:features */
     xmpp_timed_handler_delete(conn, _handle_missing_features);
 
@@ -229,10 +228,8 @@ static int _handle_features(xmpp_conn_t *const conn,
     if (!conn->secured) {
         if (!conn->tls_disabled) {
             child = xmpp_stanza_get_child_by_name(stanza, "starttls");
-            if (child) {
+            if (child && (strcmp(xmpp_stanza_get_ns(child), XMPP_NS_TLS) == 0))
-                ns = xmpp_stanza_get_ns(child);
+                conn->tls_support = 1;
-                conn->tls_support = ns != NULL && strcmp(ns, XMPP_NS_TLS) == 0;
-            }
         } else {
             conn->tls_support = 0;
         }
@@ -240,26 +237,17 @@ static int _handle_features(xmpp_conn_t *const conn,
 
     /* check for SASL */
     child = xmpp_stanza_get_child_by_name(stanza, "mechanisms");
-    ns = child ? xmpp_stanza_get_ns(child) : NULL;
+    if (child && (strcmp(xmpp_stanza_get_ns(child), XMPP_NS_SASL) == 0)) {
-    if (child && ns && strcmp(ns, XMPP_NS_SASL) == 0) {
 	for (mech = xmpp_stanza_get_children(child); mech;
 	     mech = xmpp_stanza_get_next(mech)) {
-            if (xmpp_stanza_get_name(mech) &&
+	    if (xmpp_stanza_get_name(mech) && strcmp(xmpp_stanza_get_name(mech), "mechanism") == 0) {
-                strcmp(xmpp_stanza_get_name(mech), "mechanism") == 0) {
 		text = xmpp_stanza_get_text(mech);
-                if (text == NULL)
-                    continue;
-
 		if (strcasecmp(text, "PLAIN") == 0)
 		    conn->sasl_support |= SASL_MASK_PLAIN;
 		else if (strcasecmp(text, "DIGEST-MD5") == 0)
 		    conn->sasl_support |= SASL_MASK_DIGESTMD5;
                 else if (strcasecmp(text, "SCRAM-SHA-1") == 0)
                     conn->sasl_support |= SASL_MASK_SCRAMSHA1;
-                else if (strcasecmp(text, "SCRAM-SHA-256") == 0)
-                    conn->sasl_support |= SASL_MASK_SCRAMSHA256;
-                else if (strcasecmp(text, "SCRAM-SHA-512") == 0)
-                    conn->sasl_support |= SASL_MASK_SCRAMSHA512;
 		else if (strcasecmp(text, "ANONYMOUS") == 0)
 		    conn->sasl_support |= SASL_MASK_ANONYMOUS;
 
@@ -268,10 +256,6 @@ static int _handle_features(xmpp_conn_t *const conn,
 	}
     }
 
-    /* Disable PLAIN when other secure mechanisms are supported */
-    if (conn->sasl_support & ~(SASL_MASK_PLAIN | SASL_MASK_ANONYMOUS))
-        conn->sasl_support &= ~SASL_MASK_PLAIN;
-
     _auth(conn);
 
     return 0;
@@ -285,8 +269,7 @@ static char *_get_authid(xmpp_conn_t *const conn)
 
     if (conn->type == XMPP_CLIENT) {
 	/* authid is the node portion of jid */
-        if (!conn->jid)
+	if (!conn->jid) return NULL;
-            return NULL;
 	authid = xmpp_jid_node(conn->ctx, conn->jid);
     }
 
@@ -299,8 +282,6 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn,
 {
     const char *name;
 
-    UNUSED(userdata);
-
     name = xmpp_stanza_get_name(stanza);
     xmpp_debug(conn->ctx, "xmpp", "handle proceedtls called for %s", name);
 
@@ -329,7 +310,8 @@ static int _handle_sasl_result(xmpp_conn_t *const conn,
 
     /* the server should send a <success> or <failure> stanza */
     if (strcmp(name, "failure") == 0) {
-        xmpp_debug(conn->ctx, "xmpp", "SASL %s auth failed", (char *)userdata);
+	xmpp_debug(conn->ctx, "xmpp", "SASL %s auth failed",
+		   (char *)userdata);
 
 	/* fall back to next auth method */
 	_auth(conn);
@@ -345,9 +327,8 @@ static int _handle_sasl_result(xmpp_conn_t *const conn,
 	conn_open_stream(conn);
     } else {
 	/* got unexpected reply */
-        xmpp_error(conn->ctx, "xmpp",
+	xmpp_error(conn->ctx, "xmpp", "Got unexpected reply to SASL %s"\
-                   "Got unexpected reply to SASL %s authentication.",
+		   "authentication.", (char *)userdata);
-                   (char *)userdata);
 	xmpp_disconnect(conn);
     }
 
@@ -364,11 +345,9 @@ static int _handle_digestmd5_challenge(xmpp_conn_t *const conn,
     xmpp_stanza_t *auth, *authdata;
     const char *name;
 
-    UNUSED(userdata);
-
     name = xmpp_stanza_get_name(stanza);
-    xmpp_debug(conn->ctx, "xmpp", "handle digest-md5 (challenge) called for %s",
+    xmpp_debug(conn->ctx, "xmpp",\
-               name);
+	"handle digest-md5 (challenge) called for %s", name);
 
     if (strcmp(name, "challenge") == 0) {
 	text = xmpp_stanza_get_text(stanza);
@@ -399,8 +378,8 @@ static int _handle_digestmd5_challenge(xmpp_conn_t *const conn,
 	xmpp_stanza_add_child(auth, authdata);
 	xmpp_stanza_release(authdata);
 
-        handler_add(conn, _handle_digestmd5_rspauth, XMPP_NS_SASL, NULL, NULL,
+	handler_add(conn, _handle_digestmd5_rspauth,
-                    NULL);
+		    XMPP_NS_SASL, NULL, NULL, NULL);
 
 	xmpp_send(conn, auth);
 	xmpp_stanza_release(auth);
@@ -421,11 +400,10 @@ static int _handle_digestmd5_rspauth(xmpp_conn_t *const conn,
     xmpp_stanza_t *auth;
     const char *name;
 
-    UNUSED(userdata);
-
     name = xmpp_stanza_get_name(stanza);
-    xmpp_debug(conn->ctx, "xmpp", "handle digest-md5 (rspauth) called for %s",
+    xmpp_debug(conn->ctx, "xmpp",
-               name);
+	"handle digest-md5 (rspauth) called for %s", name);
+
 
     if (strcmp(name, "challenge") == 0) {
 	/* assume it's an rspauth response */
@@ -445,28 +423,21 @@ static int _handle_digestmd5_rspauth(xmpp_conn_t *const conn,
     return 1;
 }
 
-struct scram_user_data {
-    char *scram_init;
-    const struct hash_alg *alg;
-};
-
 /* handle the challenge phase of SCRAM-SHA-1 auth */
-static int _handle_scram_challenge(xmpp_conn_t *const conn,
+static int _handle_scram_sha1_challenge(xmpp_conn_t * const conn,
 					xmpp_stanza_t * const stanza,
 					void * const userdata)
 {
     char *text;
     char *response;
-    xmpp_stanza_t *auth;
+    xmpp_stanza_t *auth, *authdata;
-    xmpp_stanza_t *authdata;
     const char *name;
     char *challenge;
-    struct scram_user_data *scram_ctx = (struct scram_user_data *)userdata;
+    char *scram_init = (char *)userdata;
-    int rc;
 
     name = xmpp_stanza_get_name(stanza);
-    xmpp_debug(conn->ctx, "xmpp", "handle %s (challenge) called for %s",
+    xmpp_debug(conn->ctx, "xmpp",
-               scram_ctx->alg->scram_name, name);
+               "handle SCRAM-SHA-1 (challenge) called for %s", name);
 
     if (strcmp(name, "challenge") == 0) {
         text = xmpp_stanza_get_text(stanza);
@@ -478,8 +449,8 @@ static int _handle_scram_challenge(xmpp_conn_t *const conn,
         if (!challenge)
             goto err;
 
-        response = sasl_scram(conn->ctx, scram_ctx->alg, challenge,
+        response = sasl_scram_sha1(conn->ctx, challenge, scram_init,
-                              scram_ctx->scram_init, conn->jid, conn->pass);
+                                   conn->jid, conn->pass);
         xmpp_free(conn->ctx, challenge);
         if (!response)
             goto err;
@@ -502,37 +473,24 @@ static int _handle_scram_challenge(xmpp_conn_t *const conn,
         xmpp_send(conn, auth);
         xmpp_stanza_release(auth);
 
-        rc = 1; /* Keep handler */
     } else {
-        /*
+        xmpp_free(conn->ctx, scram_init);
-         * Free scram_ctx after calling _handle_sasl_result(). If authentication
+        return _handle_sasl_result(conn, stanza, "SCRAM-SHA-1");
-         * fails, we want to try other mechanism which may be different SCRAM
-         * mechanism. If we freed scram_ctx before the function, _auth() would
-         * be able to allocate new scram_ctx object with the same address and
-         * handler_add() would consider new SCRAM handler as duplicate, because
-         * current handler is not removed yet. As result, libstrophe wouldn't
-         * handle incoming challenge stanza.
-         */
-        rc = _handle_sasl_result(conn, stanza,
-                                 (void *)scram_ctx->alg->scram_name);
-        xmpp_free(conn->ctx, scram_ctx->scram_init);
-        xmpp_free(conn->ctx, scram_ctx);
     }
 
-    return rc;
+    return 1;
 
 err_release_auth:
     xmpp_stanza_release(auth);
 err_free_response:
     xmpp_free(conn->ctx, response);
 err:
-    xmpp_free(conn->ctx, scram_ctx->scram_init);
+    xmpp_free(conn->ctx, scram_init);
-    xmpp_free(conn->ctx, scram_ctx);
     disconnect_mem_error(conn);
     return 0;
 }
 
-static char *_make_scram_init_msg(xmpp_conn_t *const conn)
+static char *_make_scram_sha1_init_msg(xmpp_conn_t * const conn)
 {
     xmpp_ctx_t *ctx = conn->ctx;
     size_t message_len;
@@ -592,11 +550,9 @@ static xmpp_stanza_t *_make_sasl_auth(xmpp_conn_t *const conn,
  */
 static void _auth(xmpp_conn_t * const conn)
 {
-    xmpp_stanza_t *auth;
+    xmpp_stanza_t *auth, *authdata, *query, *child, *iq;
-    xmpp_stanza_t *authdata;
+    char *str, *authid;
-    struct scram_user_data *scram_ctx;
+    char *scram_init;
-    char *authid;
-    char *str;
     int anonjid;
 
     /* if there is no node in conn->jid, we assume anonymous connect */
@@ -627,8 +583,8 @@ static void _auth(xmpp_conn_t *const conn)
 	    return;
 	}
 
-        handler_add(conn, _handle_proceedtls_default, XMPP_NS_TLS, NULL, NULL,
+	handler_add(conn, _handle_proceedtls_default,
-                    NULL);
+		    XMPP_NS_TLS, NULL, NULL, NULL);
 
 	xmpp_send(conn, auth);
 	xmpp_stanza_release(auth);
@@ -640,8 +596,7 @@ static void _auth(xmpp_conn_t *const conn)
     }
 
     if (conn->tls_mandatory && !xmpp_conn_is_secured(conn)) {
-        xmpp_error(conn->ctx, "xmpp",
+        xmpp_error(conn->ctx, "xmpp", "TLS is not supported, but set as "
-                   "TLS is not supported, but set as "
                                       "mandatory for this connection");
         conn_disconnect(conn);
         return;
@@ -655,8 +610,8 @@ static void _auth(xmpp_conn_t *const conn)
 	    return;
 	}
 
-        handler_add(conn, _handle_sasl_result, XMPP_NS_SASL, NULL, NULL,
+	handler_add(conn, _handle_sasl_result, XMPP_NS_SASL,
-                    "ANONYMOUS");
+	            NULL, NULL, "ANONYMOUS");
 
 	xmpp_send(conn, auth);
 	xmpp_stanza_release(auth);
@@ -667,39 +622,25 @@ static void _auth(xmpp_conn_t *const conn)
 	xmpp_error(conn->ctx, "auth",
 		   "No node in JID, and SASL ANONYMOUS unsupported.");
 	xmpp_disconnect(conn);
-    } else if (conn->pass == NULL) {
+    } else if (conn->sasl_support & SASL_MASK_SCRAMSHA1) {
-        xmpp_error(conn->ctx, "auth",
+        auth = _make_sasl_auth(conn, "SCRAM-SHA-1");
-                   "Password hasn't been set, and SASL ANONYMOUS unsupported.");
-        xmpp_disconnect(conn);
-    } else if (conn->sasl_support & SASL_MASK_SCRAM) {
-        scram_ctx = xmpp_alloc(conn->ctx, sizeof(*scram_ctx));
-        if (conn->sasl_support & SASL_MASK_SCRAMSHA512)
-            scram_ctx->alg = &scram_sha512;
-        else if (conn->sasl_support & SASL_MASK_SCRAMSHA256)
-            scram_ctx->alg = &scram_sha256;
-        else if (conn->sasl_support & SASL_MASK_SCRAMSHA1)
-            scram_ctx->alg = &scram_sha1;
-        auth = _make_sasl_auth(conn, scram_ctx->alg->scram_name);
         if (!auth) {
             disconnect_mem_error(conn);
             return;
         }
 
         /* don't free scram_init on success */
-        scram_ctx->scram_init = _make_scram_init_msg(conn);
+        scram_init = _make_scram_sha1_init_msg(conn);
-        if (!scram_ctx->scram_init) {
+        if (!scram_init) {
-            xmpp_free(conn->ctx, scram_ctx);
             xmpp_stanza_release(auth);
             disconnect_mem_error(conn);
             return;
         }
 
-        str = xmpp_base64_encode(conn->ctx,
+        str = xmpp_base64_encode(conn->ctx, (unsigned char *)scram_init,
-                                 (unsigned char *)scram_ctx->scram_init,
+                                 strlen(scram_init));
-                                 strlen(scram_ctx->scram_init));
         if (!str) {
-            xmpp_free(conn->ctx, scram_ctx->scram_init);
+            xmpp_free(conn->ctx, scram_init);
-            xmpp_free(conn->ctx, scram_ctx);
             xmpp_stanza_release(auth);
             disconnect_mem_error(conn);
             return;
@@ -708,8 +649,7 @@ static void _auth(xmpp_conn_t *const conn)
         authdata = xmpp_stanza_new(conn->ctx);
         if (!authdata) {
             xmpp_free(conn->ctx, str);
-            xmpp_free(conn->ctx, scram_ctx->scram_init);
+            xmpp_free(conn->ctx, scram_init);
-            xmpp_free(conn->ctx, scram_ctx);
             xmpp_stanza_release(auth);
             disconnect_mem_error(conn);
             return;
@@ -719,23 +659,24 @@ static void _auth(xmpp_conn_t *const conn)
         xmpp_stanza_add_child(auth, authdata);
         xmpp_stanza_release(authdata);
 
-        handler_add(conn, _handle_scram_challenge, XMPP_NS_SASL, NULL, NULL,
+        handler_add(conn, _handle_scram_sha1_challenge,
-                    (void *)scram_ctx);
+                    XMPP_NS_SASL, NULL, NULL, (void *)scram_init);
 
         xmpp_send(conn, auth);
         xmpp_stanza_release(auth);
 
         /* SASL SCRAM-SHA-1 was tried, unset flag */
-        conn->sasl_support &= ~scram_ctx->alg->mask;
+        conn->sasl_support &= ~SASL_MASK_SCRAMSHA1;
     } else if (conn->sasl_support & SASL_MASK_DIGESTMD5) {
 	auth = _make_sasl_auth(conn, "DIGEST-MD5");
 	if (!auth) {
 	    disconnect_mem_error(conn);
 	    return;
+
 	}
 
-        handler_add(conn, _handle_digestmd5_challenge, XMPP_NS_SASL, NULL, NULL,
+	handler_add(conn, _handle_digestmd5_challenge,
-                    NULL);
+		    XMPP_NS_SASL, NULL, NULL, NULL);
 
 	xmpp_send(conn, auth);
 	xmpp_stanza_release(auth);
@@ -770,23 +711,117 @@ static void _auth(xmpp_conn_t *const conn)
 	xmpp_stanza_add_child(auth, authdata);
 	xmpp_stanza_release(authdata);
 
-        handler_add(conn, _handle_sasl_result, XMPP_NS_SASL, NULL, NULL,
+	handler_add(conn, _handle_sasl_result,
-                    "PLAIN");
+		    XMPP_NS_SASL, NULL, NULL, "PLAIN");
 
 	xmpp_send(conn, auth);
 	xmpp_stanza_release(auth);
 
 	/* SASL PLAIN was tried */
 	conn->sasl_support &= ~SASL_MASK_PLAIN;
-    } else if (conn->type == XMPP_CLIENT && conn->auth_legacy_enabled) {
+    } else if (conn->type == XMPP_CLIENT) {
 	/* legacy client authentication */
-        _auth_legacy(conn);
+
+	iq = xmpp_iq_new(conn->ctx, "set", "_xmpp_auth1");
+	if (!iq) {
+	    disconnect_mem_error(conn);
+	    return;
+	}
+
+	query = xmpp_stanza_new(conn->ctx);
+	if (!query) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	xmpp_stanza_set_name(query, "query");
+	xmpp_stanza_set_ns(query, XMPP_NS_AUTH);
+	xmpp_stanza_add_child(iq, query);
+	xmpp_stanza_release(query);
+
+	child = xmpp_stanza_new(conn->ctx);
+	if (!child) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	xmpp_stanza_set_name(child, "username");
+	xmpp_stanza_add_child(query, child);
+	xmpp_stanza_release(child);
+
+	authdata = xmpp_stanza_new(conn->ctx);
+	if (!authdata) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	str = xmpp_jid_node(conn->ctx, conn->jid);
+	xmpp_stanza_set_text(authdata, str);
+	xmpp_free(conn->ctx, str);
+	xmpp_stanza_add_child(child, authdata);
+	xmpp_stanza_release(authdata);
+
+	child = xmpp_stanza_new(conn->ctx);
+	if (!child) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	xmpp_stanza_set_name(child, "password");
+	xmpp_stanza_add_child(query, child);
+	xmpp_stanza_release(child);
+
+	authdata = xmpp_stanza_new(conn->ctx);
+	if (!authdata) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	xmpp_stanza_set_text(authdata, conn->pass);
+	xmpp_stanza_add_child(child, authdata);
+	xmpp_stanza_release(authdata);
+
+	child = xmpp_stanza_new(conn->ctx);
+	if (!child) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	xmpp_stanza_set_name(child, "resource");
+	xmpp_stanza_add_child(query, child);
+	xmpp_stanza_release(child);
+
+	authdata = xmpp_stanza_new(conn->ctx);
+	if (!authdata) {
+	    xmpp_stanza_release(iq);
+	    disconnect_mem_error(conn);
+	    return;
+	}
+	str = xmpp_jid_resource(conn->ctx, conn->jid);
+	if (str) {
+	    xmpp_stanza_set_text(authdata, str);
+	    xmpp_free(conn->ctx, str);
 	} else {
-        xmpp_error(conn->ctx, "auth", "Cannot authenticate with known methods");
+	    xmpp_stanza_release(authdata);
+	    xmpp_stanza_release(iq);
+	    xmpp_error(conn->ctx, "auth",
+		       "Cannot authenticate without resource");
 	    xmpp_disconnect(conn);
+	    return;
+	}
+	xmpp_stanza_add_child(child, authdata);
+	xmpp_stanza_release(authdata);
+
+	handler_add_id(conn, _handle_legacy, "_xmpp_auth1", NULL);
+	handler_add_timed(conn, _handle_missing_legacy,
+			  LEGACY_TIMEOUT, NULL);
+
+	xmpp_send(conn, iq);
+	xmpp_stanza_release(iq);
     }
 }
 
+
 /** Set up handlers at stream start.
  *  This function is called internally to Strophe for handling the opening
  *  of an XMPP stream.  It's called by the parser when a stream is opened
@@ -806,8 +841,8 @@ void auth_handle_open(xmpp_conn_t *const conn)
     handler_add(conn, _handle_error, XMPP_NS_STREAMS, "error", NULL, NULL);
 
     /* setup handlers for incoming <stream:features> */
-    handler_add(conn, _handle_features, XMPP_NS_STREAMS, "features", NULL,
+    handler_add(conn, _handle_features,
-                NULL);
+		XMPP_NS_STREAMS, "features", NULL, NULL);
     handler_add_timed(conn, _handle_missing_features, FEATURES_TIMEOUT, NULL);
 }
 
@@ -815,8 +850,8 @@ void auth_handle_open(xmpp_conn_t *const conn)
 static void _handle_open_tls(xmpp_conn_t * const conn)
 {
     /* setup handlers for incoming <stream:features> */
-    handler_add(conn, _handle_features, XMPP_NS_STREAMS, "features", NULL,
+    handler_add(conn, _handle_features,
-                NULL);
+		XMPP_NS_STREAMS, "features", NULL, NULL);
     handler_add_timed(conn, _handle_missing_features, FEATURES_TIMEOUT, NULL);
 }
 
@@ -826,43 +861,35 @@ static void _handle_open_sasl(xmpp_conn_t *const conn)
     xmpp_debug(conn->ctx, "xmpp", "Reopened stream successfully.");
 
     /* setup stream:features handlers */
-    handler_add(conn, _handle_features_sasl, XMPP_NS_STREAMS, "features", NULL,
+    handler_add(conn, _handle_features_sasl,
-                NULL);
+		XMPP_NS_STREAMS, "features", NULL, NULL);
-    handler_add_timed(conn, _handle_missing_features_sasl, FEATURES_TIMEOUT,
+    handler_add_timed(conn, _handle_missing_features_sasl,
-                      NULL);
+		      FEATURES_TIMEOUT, NULL);
 }
 
 static int _handle_features_sasl(xmpp_conn_t * const conn,
 				 xmpp_stanza_t * const stanza,
 				 void * const userdata)
 {
-    xmpp_stanza_t *bind, *session, *iq, *res, *text, *opt;
+    xmpp_stanza_t *bind, *session, *iq, *res, *text;
-    const char *ns;
     char *resource;
 
-    UNUSED(userdata);
-
     /* remove missing features handler */
     xmpp_timed_handler_delete(conn, _handle_missing_features_sasl);
 
     /* we are expecting <bind/> and <session/> since this is a
        XMPP style connection */
 
-    /* check whether resource binding is required */
     bind = xmpp_stanza_get_child_by_name(stanza, "bind");
-    if (bind) {
+    if (bind && strcmp(xmpp_stanza_get_ns(bind), XMPP_NS_BIND) == 0) {
-        ns = xmpp_stanza_get_ns(bind);
+	/* resource binding is required */
-        conn->bind_required = ns != NULL && strcmp(ns, XMPP_NS_BIND) == 0;
+	conn->bind_required = 1;
     }
 
-    /* check whether session establishment is required */
     session = xmpp_stanza_get_child_by_name(stanza, "session");
-    if (session) {
+    if (session && strcmp(xmpp_stanza_get_ns(session), XMPP_NS_SESSION) == 0) {
-        ns = xmpp_stanza_get_ns(session);
+	/* session establishment required */
-        opt = xmpp_stanza_get_child_by_name(session, "optional");
+	conn->session_required = 1;
-        if (!opt)
-            conn->session_required =
-                ns != NULL && strcmp(ns, XMPP_NS_SESSION) == 0;
     }
 
     /* if bind is required, go ahead and start it */
@@ -871,7 +898,8 @@ static int _handle_features_sasl(xmpp_conn_t *const conn,
 
 	/* setup response handlers */
 	handler_add_id(conn, _handle_bind, "_xmpp_bind1", NULL);
-        handler_add_timed(conn, _handle_missing_bind, BIND_TIMEOUT, NULL);
+	handler_add_timed(conn, _handle_missing_bind,
+			  BIND_TIMEOUT, NULL);
 
 	/* send bind request */
 	iq = xmpp_iq_new(conn->ctx, "set", "_xmpp_bind1");
@@ -930,8 +958,7 @@ static int _handle_features_sasl(xmpp_conn_t *const conn,
 	xmpp_stanza_release(iq);
     } else {
 	/* can't bind, disconnect */
-        xmpp_error(conn->ctx, "xmpp",
+	xmpp_error(conn->ctx, "xmpp", "Stream features does not allow "\
-                   "Stream features does not allow "
 		   "resource bind.");
 	xmpp_disconnect(conn);
     }
@@ -942,10 +969,7 @@ static int _handle_features_sasl(xmpp_conn_t *const conn,
 static int _handle_missing_features_sasl(xmpp_conn_t * const conn,
 					 void * const userdata)
 {
-    UNUSED(userdata);
+    xmpp_error(conn->ctx, "xmpp", "Did not receive stream features "\
-
-    xmpp_error(conn->ctx, "xmpp",
-               "Did not receive stream features "
 	       "after SASL authentication.");
     xmpp_disconnect(conn);
     return 0;
@@ -958,8 +982,6 @@ static int _handle_bind(xmpp_conn_t *const conn,
     const char *type;
     xmpp_stanza_t *iq, *session;
 
-    UNUSED(userdata);
-
     /* delete missing bind handler */
     xmpp_timed_handler_delete(conn, _handle_missing_bind);
 
@@ -973,8 +995,8 @@ static int _handle_bind(xmpp_conn_t *const conn,
 	xmpp_debug(conn->ctx, "xmpp", "Bind successful.");
 
         if (binding) {
-            xmpp_stanza_t *jid_stanza =
+            xmpp_stanza_t *jid_stanza = xmpp_stanza_get_child_by_name(binding,
-                xmpp_stanza_get_child_by_name(binding, "jid");
+                                                                      "jid");
             if (jid_stanza) {
                 conn->bound_jid = xmpp_stanza_get_text(jid_stanza);
             }
@@ -984,8 +1006,8 @@ static int _handle_bind(xmpp_conn_t *const conn,
 	if (conn->session_required) {
 	    /* setup response handlers */
 	    handler_add_id(conn, _handle_session, "_xmpp_session1", NULL);
-            handler_add_timed(conn, _handle_missing_session, SESSION_TIMEOUT,
+	    handler_add_timed(conn, _handle_missing_session,
-                              NULL);
+			      SESSION_TIMEOUT, NULL);
 
 	    /* send session request */
             iq = xmpp_iq_new(conn->ctx, "set", "_xmpp_session1");
@@ -1025,10 +1047,9 @@ static int _handle_bind(xmpp_conn_t *const conn,
     return 0;
 }
 
-static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata)
+static int _handle_missing_bind(xmpp_conn_t * const conn,
+				void * const userdata)
 {
-    UNUSED(userdata);
-
     xmpp_error(conn->ctx, "xmpp", "Server did not reply to bind request.");
     xmpp_disconnect(conn);
     return 0;
@@ -1040,8 +1061,6 @@ static int _handle_session(xmpp_conn_t *const conn,
 {
     const char *type;
 
-    UNUSED(userdata);
-
     /* delete missing session handler */
     xmpp_timed_handler_delete(conn, _handle_missing_session);
 
@@ -1068,24 +1087,11 @@ static int _handle_session(xmpp_conn_t *const conn,
 static int _handle_missing_session(xmpp_conn_t * const conn,
 				   void * const userdata)
 {
-    UNUSED(userdata);
-
     xmpp_error(conn->ctx, "xmpp", "Server did not reply to session request.");
     xmpp_disconnect(conn);
     return 0;
 }
 
-static int _handle_missing_legacy(xmpp_conn_t *const conn, void *const userdata)
-{
-    UNUSED(userdata);
-
-    xmpp_error(conn->ctx, "xmpp",
-               "Server did not reply to legacy "
-               "authentication request.");
-    xmpp_disconnect(conn);
-    return 0;
-}
-
 static int _handle_legacy(xmpp_conn_t * const conn,
 			  xmpp_stanza_t * const stanza,
 			  void * const userdata)
@@ -1093,8 +1099,6 @@ static int _handle_legacy(xmpp_conn_t *const conn,
     const char *type;
     const char *name;
 
-    UNUSED(userdata);
-
     /* delete missing handler */
     xmpp_timed_handler_delete(conn, _handle_missing_legacy);
 
@@ -1102,8 +1106,7 @@ static int _handle_legacy(xmpp_conn_t *const conn,
     type = xmpp_stanza_get_type(stanza);
     name = xmpp_stanza_get_name(stanza);
     if (!type || strcmp(name, "iq") != 0) {
-        xmpp_error(conn->ctx, "xmpp",
+	xmpp_error(conn->ctx, "xmpp", "Server sent us an unexpected response "\
-                   "Server sent us an unexpected response "
 		   "to legacy authentication request.");
 	xmpp_disconnect(conn);
     } else if (strcmp(type, "error") == 0) {
@@ -1117,8 +1120,7 @@ static int _handle_legacy(xmpp_conn_t *const conn,
 	conn->authenticated = 1;
 	conn->conn_handler(conn, XMPP_CONN_CONNECT, 0, NULL, conn->userdata);
     } else {
-        xmpp_error(conn->ctx, "xmpp",
+	xmpp_error(conn->ctx, "xmpp", "Server sent us a legacy authentication "\
-                   "Server sent us a legacy authentication "
 		   "response with a bad type.");
 	xmpp_disconnect(conn);
     }
@@ -1126,97 +1128,13 @@ static int _handle_legacy(xmpp_conn_t *const conn,
     return 0;
 }
 
-static void _auth_legacy(xmpp_conn_t *conn)
+static int _handle_missing_legacy(xmpp_conn_t * const conn,
+				  void * const userdata)
 {
-    xmpp_stanza_t *iq;
+    xmpp_error(conn->ctx, "xmpp", "Server did not reply to legacy "\
-    xmpp_stanza_t *authdata;
+	       "authentication request.");
-    xmpp_stanza_t *query;
-    xmpp_stanza_t *child;
-    char *str;
-
-    xmpp_debug(conn->ctx, "auth", "Legacy authentication request");
-
-    iq = xmpp_iq_new(conn->ctx, "set", "_xmpp_auth1");
-    if (!iq)
-        goto err;
-
-    query = xmpp_stanza_new(conn->ctx);
-    if (!query)
-        goto err_free;
-    xmpp_stanza_set_name(query, "query");
-    xmpp_stanza_set_ns(query, XMPP_NS_AUTH);
-    xmpp_stanza_add_child(iq, query);
-    xmpp_stanza_release(query);
-
-    child = xmpp_stanza_new(conn->ctx);
-    if (!child)
-        goto err_free;
-    xmpp_stanza_set_name(child, "username");
-    xmpp_stanza_add_child(query, child);
-    xmpp_stanza_release(child);
-
-    authdata = xmpp_stanza_new(conn->ctx);
-    if (!authdata)
-        goto err_free;
-    str = xmpp_jid_node(conn->ctx, conn->jid);
-    if (!str) {
-        xmpp_stanza_release(authdata);
-        goto err_free;
-    }
-    xmpp_stanza_set_text(authdata, str);
-    xmpp_free(conn->ctx, str);
-    xmpp_stanza_add_child(child, authdata);
-    xmpp_stanza_release(authdata);
-
-    child = xmpp_stanza_new(conn->ctx);
-    if (!child)
-        goto err_free;
-    xmpp_stanza_set_name(child, "password");
-    xmpp_stanza_add_child(query, child);
-    xmpp_stanza_release(child);
-
-    authdata = xmpp_stanza_new(conn->ctx);
-    if (!authdata)
-        goto err_free;
-    xmpp_stanza_set_text(authdata, conn->pass);
-    xmpp_stanza_add_child(child, authdata);
-    xmpp_stanza_release(authdata);
-
-    child = xmpp_stanza_new(conn->ctx);
-    if (!child)
-        goto err_free;
-    xmpp_stanza_set_name(child, "resource");
-    xmpp_stanza_add_child(query, child);
-    xmpp_stanza_release(child);
-
-    authdata = xmpp_stanza_new(conn->ctx);
-    if (!authdata)
-        goto err_free;
-    str = xmpp_jid_resource(conn->ctx, conn->jid);
-    if (str) {
-        xmpp_stanza_set_text(authdata, str);
-        xmpp_free(conn->ctx, str);
-    } else {
-        xmpp_stanza_release(authdata);
-        xmpp_stanza_release(iq);
-        xmpp_error(conn->ctx, "auth", "Cannot authenticate without resource");
     xmpp_disconnect(conn);
-        return;
+    return 0;
-    }
-    xmpp_stanza_add_child(child, authdata);
-    xmpp_stanza_release(authdata);
-
-    handler_add_id(conn, _handle_legacy, "_xmpp_auth1", NULL);
-    handler_add_timed(conn, _handle_missing_legacy, LEGACY_TIMEOUT, NULL);
-
-    xmpp_send(conn, iq);
-    xmpp_stanza_release(iq);
-    return;
-
-err_free:
-    xmpp_stanza_release(iq);
-err:
-    disconnect_mem_error(conn);
 }
 
 void auth_handle_component_open(xmpp_conn_t * const conn)
@@ -1227,8 +1145,8 @@ void auth_handle_component_open(xmpp_conn_t *const conn)
     handler_reset_timed(conn, 0);
 
     handler_add(conn, _handle_error, XMPP_NS_STREAMS, "error", NULL, NULL);
-    handler_add(conn, _handle_component_hs_response, NULL, "handshake", NULL,
+    handler_add(conn, _handle_component_hs_response, NULL,
-                NULL);
+                "handshake", NULL, NULL);
     handler_add_timed(conn, _handle_missing_handshake, HANDSHAKE_TIMEOUT, NULL);
 
     rc = _handle_component_auth(conn);
@@ -1267,18 +1185,16 @@ int _handle_component_auth(xmpp_conn_t *const conn)
             xmpp_snprintf(digest+i*2, 3, "%02x", md_value[i]);
         digest[2*sizeof(md_value)] = '\0';
 
-        xmpp_debug(conn->ctx, "auth", "Digest: %s, len: %d", digest,
+        xmpp_debug(conn->ctx, "auth", "Digest: %s, len: %d",
-                   strlen(digest));
+                   digest, strlen(digest));
 
         /* Send the digest to the server */
         xmpp_send_raw_string(conn, "<handshake xmlns='%s'>%s</handshake>",
                              XMPP_NS_COMPONENT, digest);
-        xmpp_debug(conn->ctx, "auth",
+        xmpp_debug(conn->ctx, "auth", "Sent component handshake to the server.");
-                   "Sent component handshake to the server.");
         xmpp_free(conn->ctx, digest);
     } else {
-        xmpp_debug(conn->ctx, "auth",
+        xmpp_debug(conn->ctx, "auth", "Couldn't allocate memory for component "\
-                   "Couldn't allocate memory for component "
                                       "handshake digest.");
         return XMPP_EMEM;
     }
@@ -1295,8 +1211,6 @@ int _handle_component_hs_response(xmpp_conn_t *const conn,
 {
     const char *name;
 
-    UNUSED(userdata);
-
     xmpp_timed_handler_delete(conn, _handle_missing_handshake);
 
     name = xmpp_stanza_get_name(stanza);
@@ -1323,8 +1237,6 @@ int _handle_component_hs_response(xmpp_conn_t *const conn,
 
 int _handle_missing_handshake(xmpp_conn_t * const conn, void * const userdata)
 {
-    UNUSED(userdata);
-
     xmpp_error(conn->ctx, "xmpp", "Server did not reply to handshake request.");
     xmpp_disconnect(conn);
     return 0;

src/common.h

@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+
 #include "strophe.h"
 #include "ostypes.h"
 #include "sock.h"
@@ -29,38 +30,6 @@
 #include "rand.h"
 #include "snprintf.h"
 
-/** handlers **/
-
-typedef struct _xmpp_handlist_t xmpp_handlist_t;
-struct _xmpp_handlist_t {
-    /* common members */
-    int user_handler;
-    int (*handler)();
-    void *userdata;
-    int enabled; /* handlers are added disabled and enabled after the
-                  * handler chain is processed to prevent stanzas from
-                  * getting processed by newly added handlers */
-    xmpp_handlist_t *next;
-
-    union {
-        /* timed handlers */
-        struct {
-            unsigned long period;
-            uint64_t last_stamp;
-        };
-        /* id handlers */
-        struct {
-            char *id;
-        };
-        /* normal handlers */
-        struct {
-            char *ns;
-            char *name;
-            char *type;
-        };
-    } u;
-};
-
 /** run-time context **/
 
 typedef enum {
@@ -74,6 +43,11 @@ typedef struct _xmpp_connlist_t {
     struct _xmpp_connlist_t *next;
 } xmpp_connlist_t;
 
+typedef struct _xmpp_serverlist_t {
+    xmpp_server_t *server;
+    struct _xmpp_serverlist_t *next;
+} xmpp_serverlist_t;
+
 struct _xmpp_ctx_t {
     const xmpp_mem_t *mem;
     const xmpp_log_t *log;
@@ -81,14 +55,16 @@ struct _xmpp_ctx_t {
     xmpp_rand_t *rand;
     xmpp_loop_status_t loop_status;
     xmpp_connlist_t *connlist;
-    xmpp_handlist_t *timed_handlers;
+    xmpp_serverlist_t *serverlist;
 
     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);
+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,
@@ -133,7 +109,35 @@ struct _xmpp_send_queue_t {
     xmpp_send_queue_t *next;
 };
 
-#define UNUSED(x) ((void)(x))
+typedef struct _xmpp_handlist_t xmpp_handlist_t;
+struct _xmpp_handlist_t {
+    /* common members */
+    int user_handler;
+    int (*handler)();
+    void *userdata;
+    int enabled; /* handlers are added disabled and enabled after the
+                  * handler chain is processed to prevent stanzas from
+                  * getting processed by newly added handlers */
+    xmpp_handlist_t *next;
+
+    union {
+        /* timed handlers */
+        struct {
+            unsigned long period;
+            uint64_t last_stamp;
+        };
+        /* id handlers */
+        struct {
+            char *id;
+        };
+        /* normal handlers */
+        struct {
+            char *ns;
+            char *name;
+            char *type;
+        };
+    };
+};
 
 #define MAX_DOMAIN_LEN 256
 
@@ -141,11 +145,6 @@ struct _xmpp_send_queue_t {
 #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,
@@ -171,7 +170,6 @@ struct _xmpp_conn_t {
     int ka_interval; /* TCP keepalive interval */
 
     tls_t *tls;
-    char *tls_cafile;
     int tls_support;
     int tls_disabled;
     int tls_mandatory;
@@ -180,7 +178,6 @@ struct _xmpp_conn_t {
     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 */
 
     /* if server returns <bind/> or <session/> we must do them */
@@ -234,6 +231,25 @@ 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_STATE_STOPPED,
+    XMPP_STATE_LISTENING
+} xmpp_server_state_t;
+
+struct _xmpp_server_t {
+    xmpp_ctx_t *ctx;
+    xmpp_server_state_t state;
+
+    sock_t sock;
+    unsigned short port;
+    xmpp_server_handler callback;
+    void *userdata;
+    /* incomming connections list */
+};
+
+void server_accept(xmpp_server_t * const srv);
+void server_handle_open(xmpp_conn_t * const conn);
+
 typedef enum {
     XMPP_STANZA_UNKNOWN,
     XMPP_STANZA_TEXT,
@@ -257,7 +273,8 @@ struct _xmpp_stanza_t {
 };
 
 /* handler management */
-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);
 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,

src/conn.c

@@ -48,21 +48,20 @@
 #define CONNECT_TIMEOUT 5000 /* 5 seconds */
 #endif
 
-static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata);
+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,
+                                    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 _conn_attributes_new(xmpp_conn_t *conn,
+static void _handle_stream_start(char *name, char **attrs,
-                                 char **attrs,
+                                 void * const userdata);
-                                 char ***attributes,
+static void _handle_stream_end(char *name,
-                                 size_t *attributes_len);
+                               void * const userdata);
-static void _conn_attributes_destroy(xmpp_conn_t *conn,
+static void _handle_stream_stanza(xmpp_stanza_t *stanza,
-                                     char **attributes,
+                                  void * const userdata);
-                                     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,
                                          xmpp_conn_type_t type);
 static void _conn_reset(xmpp_conn_t * const conn);
@@ -74,17 +73,6 @@ static int _conn_connect(xmpp_conn_t *const conn,
                          xmpp_conn_handler callback,
                          void * const userdata);
 
-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);
-
-    xmpp_send(conn, error);
-
-    xmpp_stanza_release(error);
-}
-
 /** Create a new Strophe connection object.
  *
  *  @param ctx a Strophe context object
@@ -98,8 +86,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
     xmpp_conn_t *conn = NULL;
     xmpp_connlist_t *tail, *item;
 
-    if (ctx == NULL)
+    if (ctx == NULL) return NULL;
-        return NULL;
 
     conn = xmpp_alloc(ctx, sizeof(xmpp_conn_t));
     if (conn != NULL) {
@@ -137,7 +124,6 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
         conn->bound_jid = NULL;
 
         conn->is_raw = 0;
-        conn->tls_cafile = NULL;
         conn->tls_support = 0;
         conn->tls_disabled = 0;
         conn->tls_mandatory = 0;
@@ -145,15 +131,16 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
         conn->tls_trust = 0;
         conn->tls_failed = 0;
         conn->sasl_support = 0;
-        conn->auth_legacy_enabled = 0;
         conn->secured = 0;
 
         conn->bind_required = 0;
         conn->session_required = 0;
 
-        conn->parser =
+        conn->parser = parser_new(conn->ctx,
-            parser_new(conn->ctx, _handle_stream_start, _handle_stream_end,
+                                  _handle_stream_start,
-                       _handle_stream_stanza, conn);
+                                  _handle_stream_end,
+                                  _handle_stream_stanza,
+                                  conn);
         conn->reset_parser = 0;
 
         conn->authenticated = 0;
@@ -169,8 +156,7 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
 
         /* add connection to ctx->connlist */
         tail = conn->ctx->connlist;
-        while (tail && tail->next)
+        while (tail && tail->next) tail = tail->next;
-            tail = tail->next;
 
         item = xmpp_alloc(conn->ctx, sizeof(xmpp_connlist_t));
         if (!item) {
@@ -183,10 +169,8 @@ xmpp_conn_t *xmpp_conn_new(xmpp_ctx_t *const ctx)
             item->conn = conn;
             item->next = NULL;
 
-            if (tail)
+            if (tail) tail->next = item;
-                tail->next = item;
+            else conn->ctx->connlist = item;
-            else
-                conn->ctx->connlist = item;
         }
     }
     
@@ -260,11 +244,6 @@ 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;
@@ -310,7 +289,7 @@ int xmpp_conn_release(xmpp_conn_t *const conn)
             while (hlitem) {
                 thli = hlitem;
                 hlitem = hlitem->next;
-                xmpp_free(conn->ctx, thli->u.id);
+                xmpp_free(conn->ctx, thli->id);
                 xmpp_free(conn->ctx, thli);
             }
         }
@@ -322,25 +301,17 @@ int xmpp_conn_release(xmpp_conn_t *const conn)
             thli = hlitem;
             hlitem = hlitem->next;
 
-            if (thli->u.ns)
+            if (thli->ns) xmpp_free(ctx, thli->ns);
-                xmpp_free(ctx, thli->u.ns);
+            if (thli->name) xmpp_free(ctx, thli->name);
-            if (thli->u.name)
+            if (thli->type) xmpp_free(ctx, thli->type);
-                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)
+        if (conn->jid) xmpp_free(ctx, conn->jid);
-            xmpp_free(ctx, conn->jid);
+        if (conn->pass) xmpp_free(ctx, conn->pass);
-        if (conn->pass)
+        if (conn->lang) xmpp_free(ctx, conn->lang);
-            xmpp_free(ctx, conn->pass);
-        if (conn->lang)
-            xmpp_free(ctx, conn->lang);
-        if (conn->tls_cafile)
-            xmpp_free(ctx, conn->tls_cafile);
         xmpp_free(ctx, conn);
         released = 1;
     }
@@ -392,8 +363,7 @@ 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)
 {
-    if (conn->jid)
+    if (conn->jid) xmpp_free(conn->ctx, conn->jid);
-        xmpp_free(conn->ctx, conn->jid);
     conn->jid = xmpp_strdup(conn->ctx, jid);
 }
 
@@ -421,9 +391,8 @@ 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)
 {
-    if (conn->pass)
+    if (conn->pass) xmpp_free(conn->ctx, conn->pass);
-        xmpp_free(conn->ctx, conn->pass);
+    conn->pass = xmpp_strdup(conn->ctx, pass);
-    conn->pass = pass ? xmpp_strdup(conn->ctx, pass) : NULL;
 }
 
 /** Get the strophe context that the connection is associated with.
@@ -474,8 +443,7 @@ int xmpp_connect_client(xmpp_conn_t *const conn,
     int rc;
 
     domain = xmpp_jid_domain(conn->ctx, conn->jid);
-    if (!domain)
+    if (!domain) return XMPP_EMEM;
-        return XMPP_EMEM;
 
     if (altdomain != NULL) {
         xmpp_debug(conn->ctx, "xmpp", "Connecting via altdomain.");
@@ -491,8 +459,7 @@ int xmpp_connect_client(xmpp_conn_t *const conn,
     }
 
     if (XMPP_DOMAIN_NOT_FOUND == found) {
-        xmpp_debug(conn->ctx, "xmpp",
+        xmpp_debug(conn->ctx, "xmpp", "SRV lookup failed, "
-                   "SRV lookup failed, "
                                       "connecting via domain.");
         host = domain;
         port = altport ? altport : _conn_default_port(conn, XMPP_CLIENT);
@@ -506,8 +473,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,
+        rc = _conn_connect(conn, domain, host, port, XMPP_CLIENT,
-                           userdata);
+                           callback, userdata);
     } while (rc != 0 && rr != NULL);
 
     xmpp_free(conn->ctx, domain);
@@ -539,21 +506,17 @@ int xmpp_connect_client(xmpp_conn_t *const conn,
  *
  *  @ingroup Connections
  */
-int xmpp_connect_component(xmpp_conn_t *const conn,
+int xmpp_connect_component(xmpp_conn_t * const conn, const char * const server,
-                           const char *const server,
+                           unsigned short port, xmpp_conn_handler callback,
-                           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))
+    if (!(server && conn->jid && conn->pass)) return XMPP_EINVOP;
-        return XMPP_EINVOP;
 
     /* XEP-0114 does not support TLS */
     xmpp_conn_disable_tls(conn);
     if (!conn->tls_disabled) {
-        xmpp_error(conn->ctx, "conn",
+        xmpp_error(conn->ctx, "conn", "Failed to disable TLS. "
-                   "Failed to disable TLS. "
                                       "XEP-0114 does not support TLS");
         return XMPP_EINT;
     }
@@ -612,8 +575,7 @@ 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->conn_handler(conn, XMPP_CONN_RAW_CONNECT, 0, NULL, conn->userdata);
-                           conn->userdata);
     } else {
         /* send stream init */
         conn_open_stream(conn);
@@ -658,19 +620,19 @@ int xmpp_conn_open_stream_default(xmpp_conn_t *const conn)
  *
  *  @ingroup Connections
  */
-int xmpp_conn_open_stream(xmpp_conn_t *const conn,
+int xmpp_conn_open_stream(xmpp_conn_t * const conn, char **attributes,
-                          char **attributes,
                           size_t attributes_len)
 {
     char *tag;
 
-    if (!conn->is_raw)
+    if (!conn->is_raw && conn->type != XMPP_INCOMING)
         return XMPP_EINVOP;
 
     tag = _conn_build_stream_tag(conn, attributes, attributes_len);
     if (!tag)
         return XMPP_EMEM;
 
+    if (conn->type != XMPP_INCOMING)
         conn_prepare_reset(conn, auth_handle_open_raw);
     xmpp_send_raw_string(conn, "<?xml version=\"1.0\"?>%s", tag);
     xmpp_free(conn->ctx, tag);
@@ -689,28 +651,6 @@ int xmpp_conn_tls_start(xmpp_conn_t *const conn)
     return conn_tls_start(conn);
 }
 
-/** Set external CAfile which will be used for TLS cert verification.
- *
- *  @return XMPP_EOK (0) on success a number less than 0 on failure
- *
- *  @ingroup Connections
- */
-int xmpp_conn_tls_cafile(xmpp_conn_t *const conn, const char *cafile)
-{
-    FILE *f;
-
-    f = fopen(cafile, "r");
-    if (f == NULL) {
-        xmpp_debug(conn->ctx, "conn", "CAfile '%s' is not readable. errno=%d",
-                   cafile, errno);
-        return XMPP_EINVOP;
-    }
-    fclose(f);
-    conn->tls_cafile = xmpp_strdup(conn->ctx, cafile);
-
-    return conn->tls_cafile == NULL ? XMPP_EMEM : XMPP_EOK;
-}
-
 /** Cleanly disconnect the connection.
  *  This function is only called by the stream parser when </stream:stream>
  *  is received, and it not intended to be called by code outside of Strophe.
@@ -765,7 +705,7 @@ void conn_parser_reset(xmpp_conn_t *const conn)
 /** Initiate termination of the connection to the XMPP server.
  *  This function starts the disconnection sequence by sending
  *  </stream:stream> to the XMPP server.  This function will do nothing
- *  if the connection state is different from CONNECTING or CONNECTED.
+ *  if the connection state is CONNECTING or CONNECTED.
  *
  *  @param conn a Strophe connection object
  *
@@ -781,7 +721,8 @@ 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.
@@ -797,7 +738,8 @@ 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;
@@ -805,17 +747,16 @@ void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...)
     char *bigbuf;
 
     va_start(ap, fmt);
-    len = xmpp_vsnprintf(buf, sizeof(buf), fmt, ap);
+    len = xmpp_vsnprintf(buf, 1024, fmt, ap);
     va_end(ap);
 
-    if (len >= sizeof(buf)) {
+    if (len >= 1024) {
         /* we need more space for this data, so we allocate a big
          * enough buffer and print to that */
         len++; /* account for trailing \0 */
         bigbuf = xmpp_alloc(conn->ctx, len);
         if (!bigbuf) {
-            xmpp_debug(conn->ctx, "xmpp",
+            xmpp_debug(conn->ctx, "xmpp", "Could not allocate memory for send_raw_string");
-                       "Could not allocate memory for send_raw_string");
             return;
         }
         va_start(ap, fmt);
@@ -830,6 +771,7 @@ void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...)
         xmpp_free(conn->ctx, bigbuf);
     } else {
         xmpp_debug(conn->ctx, "conn", "SENT: %s", buf);
+
         xmpp_send_raw(conn, buf, len);
     }
 }
@@ -847,18 +789,15 @@ void xmpp_send_raw_string(xmpp_conn_t *const conn, const char *const fmt, ...)
  *  @ingroup Connections
  */
 void xmpp_send_raw(xmpp_conn_t * const conn,
-                   const char *const data,
+                   const char * const data, const size_t len)
-                   const size_t len)
 {
     xmpp_send_queue_t *item;
 
-    if (conn->state != XMPP_STATE_CONNECTED)
+    if (conn->state != XMPP_STATE_CONNECTED) return;
-        return;
 
     /* create send queue item for queue */
     item = xmpp_alloc(conn->ctx, sizeof(xmpp_send_queue_t));
-    if (!item)
+    if (!item) return;
-        return;
 
     item->data = xmpp_alloc(conn->ctx, len);
     if (!item->data) {
@@ -892,13 +831,15 @@ 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;
+    int ret;
 
     if (conn->state == XMPP_STATE_CONNECTED) {
-        if (xmpp_stanza_to_text(stanza, &buf, &len) == 0) {
+        if ((ret = xmpp_stanza_to_text(stanza, &buf, &len)) == 0) {
             xmpp_send_raw(conn, buf, len);
             xmpp_debug(conn->ctx, "conn", "SENT: %s", buf);
             xmpp_free(conn->ctx, buf);
@@ -915,15 +856,16 @@ void xmpp_send(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
 void conn_open_stream(xmpp_conn_t * const conn)
 {
     xmpp_send_raw_string(conn,
-                         "<?xml version=\"1.0\"?>"
+                         "<?xml version=\"1.0\"?>"                     \
-                         "<stream:stream to=\"%s\" "
+                         "<stream:stream to=\"%s\" "                   \
-                         "xml:lang=\"%s\" "
+                         "xml:lang=\"%s\" "                            \
-                         "version=\"1.0\" "
+                         "version=\"1.0\" "                            \
-                         "xmlns=\"%s\" "
+                         "xmlns=\"%s\" "                               \
                          "xmlns:stream=\"%s\">",
-                         conn->domain, conn->lang,
+                         conn->domain,
-                         conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT
+                         conn->lang,
-                                                   : XMPP_NS_COMPONENT,
+                         conn->type == XMPP_CLIENT ? XMPP_NS_CLIENT :
+                                                     XMPP_NS_COMPONENT,
                          XMPP_NS_STREAMS);
 }
 
@@ -940,10 +882,6 @@ int conn_tls_start(xmpp_conn_t *const conn)
     }
 
     if (conn->tls != NULL) {
-        if (conn->tls_cafile != NULL) {
-            (void)tls_set_credentials(conn->tls, conn->tls_cafile);
-        }
-
         if (tls_start(conn->tls)) {
             conn->secured = 1;
         } else {
@@ -955,10 +893,8 @@ int conn_tls_start(xmpp_conn_t *const conn)
         }
     }
     if (rc != 0) {
-        xmpp_debug(conn->ctx, "conn",
+        xmpp_debug(conn->ctx, "conn", "Couldn't start TLS! "
-                   "Couldn't start TLS! "
+                   "error %d tls_error %d", rc, conn->error);
-                   "error %d tls_error %d",
-                   rc, conn->error);
     }
     return rc;
 }
@@ -978,9 +914,7 @@ long xmpp_conn_get_flags(const xmpp_conn_t *const conn)
     flags = XMPP_CONN_FLAG_DISABLE_TLS * conn->tls_disabled |
             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_TRUST_TLS * conn->tls_trust;
-            XMPP_CONN_FLAG_LEGACY_AUTH * conn->auth_legacy_enabled;
-    ;
 
     return flags;
 }
@@ -998,7 +932,6 @@ long xmpp_conn_get_flags(const xmpp_conn_t *const conn)
  *    - XMPP_CONN_FLAG_MANDATORY_TLS
  *    - XMPP_CONN_FLAG_LEGACY_SSL
  *    - XMPP_CONN_FLAG_TRUST_TLS
- *    - XMPP_CONN_FLAG_LEGACY_AUTH
  *
  *  @param conn a Strophe connection object
  *  @param flags ORed connection flags
@@ -1010,8 +943,7 @@ long xmpp_conn_get_flags(const xmpp_conn_t *const conn)
 int xmpp_conn_set_flags(xmpp_conn_t * const conn, long flags)
 {
     if (conn->state != XMPP_STATE_DISCONNECTED) {
-        xmpp_error(conn->ctx, "conn",
+        xmpp_error(conn->ctx, "conn", "Flags can be set only "
-                   "Flags can be set only "
                                       "for disconnected connection");
         return XMPP_EINVOP;
     }
@@ -1026,7 +958,6 @@ int xmpp_conn_set_flags(xmpp_conn_t *const conn, long flags)
     conn->tls_mandatory = (flags & XMPP_CONN_FLAG_MANDATORY_TLS) ? 1 : 0;
     conn->tls_legacy_ssl = (flags & XMPP_CONN_FLAG_LEGACY_SSL) ? 1 : 0;
     conn->tls_trust = (flags & XMPP_CONN_FLAG_TRUST_TLS) ? 1 : 0;
-    conn->auth_legacy_enabled = (flags & XMPP_CONN_FLAG_LEGACY_AUTH) ? 1 : 0;
 
     return 0;
 }
@@ -1058,45 +989,15 @@ void xmpp_conn_disable_tls(xmpp_conn_t *const conn)
  */
 int xmpp_conn_is_secured(xmpp_conn_t * const conn)
 {
-    return conn->secured && !conn->tls_failed && conn->tls != NULL;
+    return conn->secured && !conn->tls_failed && conn->tls != NULL ? 1 : 0;
-}
-
-/**
- *  @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)
 {
-    UNUSED(userdata);
+    xmpp_debug(conn->ctx, "xmpp",
-
+               "disconnection forced by cleanup timeout");
-    xmpp_debug(conn->ctx, "xmpp", "disconnection forced by cleanup timeout");
 
     conn_disconnect(conn);
 
@@ -1104,8 +1005,7 @@ 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,
+                                    char **attributes, size_t attributes_len)
-                                    size_t attributes_len)
 {
     char *tag;
     size_t len;
@@ -1121,8 +1021,7 @@ 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)
+    if (!tag) return NULL;
-        return NULL;
 
     strcpy(tag, tag_head);
     for (i = 0; i < attributes_len; ++i) {
@@ -1138,8 +1037,7 @@ static char *_conn_build_stream_tag(xmpp_conn_t *const conn,
     strcat(tag, tag_tail);
 
     if (strlen(tag) != len) {
-        xmpp_error(conn->ctx, "xmpp",
+        xmpp_error(conn->ctx, "xmpp", "Internal error in "
-                   "Internal error in "
                               "_conn_build_stream_tag().");
         xmpp_free(conn->ctx, tag);
         tag = NULL;
@@ -1148,24 +1046,20 @@ static char *_conn_build_stream_tag(xmpp_conn_t *const conn,
     return tag;
 }
 
-static void _conn_attributes_new(xmpp_conn_t *conn,
+static void _conn_attributes_new(xmpp_conn_t *conn, char **attrs,
-                                 char **attrs,
+                                 char ***attributes, size_t *attributes_len)
-                                 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)
+            if (array[i] == NULL) break;
-                break;
         }
         if (!array || i < nr) {
             xmpp_error(conn->ctx, "xmpp", "Memory allocation error.");
@@ -1178,8 +1072,7 @@ static void _conn_attributes_new(xmpp_conn_t *conn,
     *attributes_len = nr;
 }
 
-static void _conn_attributes_destroy(xmpp_conn_t *conn,
+static void _conn_attributes_destroy(xmpp_conn_t *conn, char **attributes,
-                                     char **attributes,
                                      size_t attributes_len)
 {
     size_t i;
@@ -1210,8 +1103,7 @@ static char *_get_stream_attribute(char **attrs, char *name)
 {
     int i;
 
-    if (!attrs)
+    if (!attrs) return NULL;
-        return NULL;
 
     for (i = 0; attrs[i]; i += 2)
         if (strcmp(name, attrs[i]) == 0)
@@ -1220,14 +1112,14 @@ static char *_get_stream_attribute(char **attrs, char *name)
     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;
 
-    if (conn->stream_id)
+    if (conn->stream_id) xmpp_free(conn->ctx, conn->stream_id);
-        xmpp_free(conn->ctx, conn->stream_id);
     conn->stream_id = NULL;
 
     if (strcmp(name, "stream") == 0) {
@@ -1241,10 +1133,8 @@ static void _handle_stream_start(char *name, char **attrs, void *const userdata)
             failed = 1;
         }
     } else {
-        xmpp_error(conn->ctx, "conn",
+        xmpp_error(conn->ctx, "conn", "Server did not open valid stream."
-                   "Server did not open valid stream."
+                                      " name = %s.", name);
-                   " name = %s.",
-                   name);
         failed = 1;
     }
 
@@ -1256,18 +1146,18 @@ 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_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;
@@ -1286,8 +1176,8 @@ static unsigned short _conn_default_port(xmpp_conn_t *const conn,
 {
     switch (type) {
     case XMPP_CLIENT:
-        return conn->tls_legacy_ssl ? XMPP_PORT_CLIENT_LEGACY_SSL
+        return conn->tls_legacy_ssl ? XMPP_PORT_CLIENT_LEGACY_SSL :
-                                    : XMPP_PORT_CLIENT;
+                                      XMPP_PORT_CLIENT;
     case XMPP_COMPONENT:
         return XMPP_PORT_COMPONENT;
     default:
@@ -1313,9 +1203,6 @@ static void _conn_reset(xmpp_conn_t *const conn)
         xmpp_free(ctx, tsq->data);
         xmpp_free(ctx, tsq);
     }
-    conn->send_queue_head = NULL;
-    conn->send_queue_tail = NULL;
-    conn->send_queue_len = 0;
 
     if (conn->stream_error) {
         xmpp_stanza_release(conn->stream_error->stanza);
@@ -1325,12 +1212,9 @@ static void _conn_reset(xmpp_conn_t *const conn)
         conn->stream_error = NULL;
     }
 
-    if (conn->domain)
+    if (conn->domain) xmpp_free(ctx, conn->domain);
-        xmpp_free(ctx, conn->domain);
+    if (conn->bound_jid) xmpp_free(ctx, conn->bound_jid);
-    if (conn->bound_jid)
+    if (conn->stream_id) xmpp_free(ctx, conn->stream_id);
-        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;
@@ -1356,25 +1240,20 @@ static int _conn_connect(xmpp_conn_t *const conn,
 {
     xmpp_open_handler open_handler;
 
-    if (conn->state != XMPP_STATE_DISCONNECTED)
+    if (conn->state != XMPP_STATE_DISCONNECTED) return XMPP_EINVOP;
-        return XMPP_EINVOP;
+    if (type != XMPP_CLIENT && type != XMPP_COMPONENT) return XMPP_EINVOP;
-    if (type != XMPP_CLIENT && type != XMPP_COMPONENT)
+    if (host == NULL || port == 0) return XMPP_EINT;
-        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)
+    if (!conn->domain) return XMPP_EMEM;
-        return XMPP_EMEM;
 
     conn->sock = sock_connect(host, port);
-    xmpp_debug(conn->ctx, "xmpp", "sock_connect() to %s:%u returned %d", host,
+    xmpp_debug(conn->ctx, "xmpp", "sock_connect() to %s:%u returned %d",
-               port, conn->sock);
+               host, port, conn->sock);
-    if (conn->sock == -1)
+    if (conn->sock == -1) return XMPP_EINT;
-        return XMPP_EINT;
     if (conn->ka_timeout || conn->ka_interval)
         sock_set_keepalive(conn->sock, conn->ka_timeout, conn->ka_interval);
 
@@ -1382,10 +1261,9 @@ static int _conn_connect(xmpp_conn_t *const conn,
     conn->conn_handler = callback;
     conn->userdata = userdata;
 
-    open_handler = conn->is_raw
+    open_handler = conn->is_raw ? auth_handle_open_stub :
-                       ? auth_handle_open_stub
+                   type == XMPP_CLIENT ? auth_handle_open :
-                       : type == XMPP_CLIENT ? auth_handle_open
+                                         auth_handle_component_open;
-                                             : auth_handle_component_open;
     conn_prepare_reset(conn, open_handler);
 
     /* FIXME: it could happen that the connect returns immediately as

src/crypto.c

@@ -61,7 +61,7 @@ static char *digest_to_string_alloc(xmpp_ctx_t *ctx, const uint8_t *digest)
     return s;
 }
 
-/** Compute SHA1 message digest.
+/** Compute SHA1 message digest
  *  Returns an allocated string which represents SHA1 message digest in
  *  hexadecimal notation. The string must be freed with xmpp_free().
  *
@@ -81,7 +81,7 @@ char *xmpp_sha1(xmpp_ctx_t *ctx, const unsigned char *data, size_t len)
     return digest_to_string_alloc(ctx, digest);
 }
 
-/** Compute SHA1 message digest.
+/** Compute SHA1 message digest
  *  Stores digest in user's buffer which must be at least XMPP_SHA1_DIGEST_SIZE
  *  bytes long.
  *
@@ -91,14 +91,13 @@ char *xmpp_sha1(xmpp_ctx_t *ctx, const unsigned char *data, size_t len)
  *
  *  @ingroup Digests
  */
-void xmpp_sha1_digest(const unsigned char *data,
+void xmpp_sha1_digest(const unsigned char *data, size_t len,
-                      size_t len,
                       unsigned char *digest)
 {
     crypto_SHA1((const uint8_t *)data, len, digest);
 }
 
-/** Create new SHA1 object.
+/** Create new SHA1 object
  *  SHA1 object is used to compute SHA1 digest of a buffer that is split
  *  in multiple chunks or provided in stream mode. A single buffer can be
  *  processed by short functions xmpp_sha1() and xmpp_sha1_digest().
@@ -112,7 +111,7 @@ void xmpp_sha1_digest(const unsigned char *data,
  *      xmpp_sha1_free(sha1);
  *  @endcode
  *
- *  @param ctx a Strophe context object
+ *  @param ctx a Strophe context onject
  *
  *  @return new SHA1 object
  *
@@ -131,7 +130,7 @@ xmpp_sha1_t *xmpp_sha1_new(xmpp_ctx_t *ctx)
     return sha1;
 }
 
-/** Destroy SHA1 object.
+/** Destroy SHA1 object
  *
  *  @param sha1 a SHA1 object
  *
@@ -142,7 +141,7 @@ void xmpp_sha1_free(xmpp_sha1_t *sha1)
     xmpp_free(sha1->xmpp_ctx, sha1);
 }
 
-/** Update SHA1 context with the next portion of data.
+/** Update SHA1 context with the next portion of data
  *  Can be called repeatedly.
  *
  *  @param sha1 a SHA1 object
@@ -156,7 +155,7 @@ void xmpp_sha1_update(xmpp_sha1_t *sha1, const unsigned char *data, size_t len)
     crypto_SHA1_Update(&sha1->ctx, data, len);
 }
 
-/** Finish SHA1 computation.
+/** Finish SHA1 computation
  *  Don't call xmpp_sha1_update() after this function. Retrieve resulting
  *  message digest with xmpp_sha1_to_string() or xmpp_sha1_to_digest().
  *
@@ -169,7 +168,7 @@ void xmpp_sha1_final(xmpp_sha1_t *sha1)
     crypto_SHA1_Final(&sha1->ctx, sha1->digest);
 }
 
-/** Return message digest rendered as a string.
+/** Return message digest rendered as a string
  *  Stores the string to a user's buffer and returns the buffer. Call this
  *  function after xmpp_sha1_final().
  *
@@ -186,7 +185,7 @@ char *xmpp_sha1_to_string(xmpp_sha1_t *sha1, char *s, size_t slen)
     return digest_to_string(sha1->digest, s, slen);
 }
 
-/** Return message digest rendered as a string.
+/** Return message digest rendered as a string
  *  Returns an allocated string. Free the string using the Strophe context
  *  which is passed to xmpp_sha1_new(). Call this function after
  *  xmpp_sha1_final().
@@ -202,7 +201,7 @@ char *xmpp_sha1_to_string_alloc(xmpp_sha1_t *sha1)
     return digest_to_string_alloc(sha1->xmpp_ctx, sha1->digest);
 }
 
-/** Stores message digest to a user's buffer.
+/** Stores message digest to a user's buffer
  *
  *  @param sha1 a SHA1 object
  *  @param digest output buffer of XMPP_SHA1_DIGEST_SIZE bytes
@@ -215,34 +214,43 @@ 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, 65, 65, 65, 65, 65, 65, 65, 65, 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,
+    65,65,65,65, 65,65,65,65, 65,65,65,62, 65,65,65,63,
-    61, 65, 65, 65, 64, 65, 65, 65, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10,
+    52,53,54,55, 56,57,58,59, 60,61,65,65, 65,64,65,65,
-    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 65, 65, 65, 65,
+    65, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-    65, 65, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+    15,16,17,18, 19,20,21,22, 23,24,25,65, 65,65,65,65,
-    43, 44, 45, 46, 47, 48, 49, 50, 51, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    65,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-    65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+    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, 65,65,65,65,
-    65, 65, 65, 65, 65, 65, 65, 65, 65};
+    65,65,65,65, 65,65,65,65, 65,65,65,65, 65,65,65,65,
+    65,65,65,65, 65,65,65,65, 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',
+    'A','B','C','D', 'E','F','G','H',
-    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'I','J','K','L', 'M','N','O','P',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+    'Q','R','S','T', 'U','V','W','X',
-    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    'Y','Z','a','b', 'c','d','e','f',
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '='};
+    '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)
 {
@@ -251,8 +259,7 @@ static size_t base64_encoded_len(const size_t len)
 }
 
 static char *base64_encode(xmpp_ctx_t *ctx,
-                           const unsigned char *const buffer,
+                           const unsigned char * const buffer, const size_t len)
-                           const size_t len)
 {
     size_t clen;
     char *cbuf, *c;
@@ -310,31 +317,24 @@ static size_t base64_decoded_len(const char *const buffer, const size_t len)
     unsigned char c;
     size_t i;
 
-    if (len < 4)
+    if (len < 4) return 0;
-        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)
+        if (c < 64) break;
-            break;
+        if (c == 64) ++nudge;
-        if (c == 64)
+        if (c > 64) return 0;
-            ++nudge;
-        if (c > 64)
-            return 0;
     }
-    if (nudge > 2)
+    if (nudge > 2) return 0;
-        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 char * const buffer, const size_t len,
-                          const size_t len,
+                          unsigned char **out, size_t *outlen)
-                          unsigned char **out,
-                          size_t *outlen)
 {
     size_t dlen;
     unsigned char *dbuf, *d;
@@ -342,12 +342,10 @@ static void base64_decode(xmpp_ctx_t *ctx,
     size_t i;
 
     /* len must be a multiple of 4 */
-    if (len & 0x03)
+    if (len & 0x03) goto _base64_error;
-        goto _base64_error;
 
     dlen = base64_decoded_len(buffer, len);
-    if (dlen == 0)
+    if (dlen == 0) goto _base64_error;
-        goto _base64_error;
 
     dbuf = xmpp_alloc(ctx, dlen + 1);
     if (dbuf != NULL) {
@@ -355,27 +353,22 @@ 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)
+            if (hextet & 0xC0) break;
-                break;
             word = hextet << 18;
             hextet = _base64_invcharmap[(unsigned char)buffer[i+1]];
-            if (hextet & 0xC0)
+            if (hextet & 0xC0) break;
-                break;
             word |= hextet << 12;
             hextet = _base64_invcharmap[(unsigned char)buffer[i+2]];
-            if (hextet & 0xC0)
+            if (hextet & 0xC0) break;
-                break;
             word |= hextet << 6;
             hextet = _base64_invcharmap[(unsigned char)buffer[i+3]];
-            if (hextet & 0xC0)
+            if (hextet & 0xC0) break;
-                break;
             word |= hextet;
             *d++ = (word & 0x00FF0000) >> 16;
             *d++ = (word & 0x0000FF00) >> 8;
             *d++ = (word & 0x000000FF);
         }
-        if (hextet > 64)
+        if (hextet > 64) goto _base64_decode_error;
-            goto _base64_decode_error;
         /* handle the remainder */
         switch (dlen % 3) {
             case 0:
@@ -384,40 +377,32 @@ static void base64_decode(xmpp_ctx_t *ctx,
             case 1:
                 /* redo the last quartet, checking for correctness */
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-4]];
-            if (hextet & 0xC0)
+                if (hextet & 0xC0) goto _base64_decode_error;
-                goto _base64_decode_error;
                 word = hextet << 2;
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-3]];
-            if (hextet & 0xC0)
+                if (hextet & 0xC0) goto _base64_decode_error;
-                goto _base64_decode_error;
                 word |= hextet >> 4;
                 *d++ = word & 0xFF;
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-2]];
-            if (hextet != 64)
+                if (hextet != 64) goto _base64_decode_error;
-                goto _base64_decode_error;
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-1]];
-            if (hextet != 64)
+                if (hextet != 64) goto _base64_decode_error;
-                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)
+                if (hextet & 0xC0) goto _base64_decode_error;
-                goto _base64_decode_error;
                 word = hextet << 10;
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-3]];
-            if (hextet & 0xC0)
+                if (hextet & 0xC0) goto _base64_decode_error;
-                goto _base64_decode_error;
                 word |= hextet << 4;
                 hextet = _base64_invcharmap[(unsigned char)buffer[len-2]];
-            if (hextet & 0xC0)
+                if (hextet & 0xC0) goto _base64_decode_error;
-                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)
+                if (hextet != 64) goto _base64_decode_error;
-                goto _base64_decode_error;
                 break;
         }
         *d = '\0';
@@ -434,7 +419,7 @@ _base64_error:
     *outlen = 0;
 }
 
-/** Base64 encoding routine.
+/** Base64 encoding routine
  *  Returns an allocated string which must be freed with xmpp_free().
  *
  *  @param ctx a Strophe context
@@ -450,7 +435,7 @@ char *xmpp_base64_encode(xmpp_ctx_t *ctx, const unsigned char *data, size_t len)
     return base64_encode(ctx, data, len);
 }
 
-/** Base64 decoding routine.
+/** Base64 decoding routine
  *  Returns an allocated string which must be freed with xmpp_free(). User
  *  calls this function when the result must be a string. When decoded buffer
  *  contains '\0' NULL is returned.
@@ -486,7 +471,7 @@ char *xmpp_base64_decode_str(xmpp_ctx_t *ctx, const char *base64, size_t len)
     return (char *)buf;
 }
 
-/** Base64 decoding routine.
+/** Base64 decoding routine
  *  Returns an allocated buffer which must be freed with xmpp_free().
  *
  *  @param ctx a Strophe context
@@ -499,11 +484,8 @@ 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,
+void xmpp_base64_decode_bin(xmpp_ctx_t *ctx, const char *base64, size_t len,
-                            const char *base64,
+                            unsigned char **out, size_t *outlen)
-                            size_t len,
-                            unsigned char **out,
-                            size_t *outlen)
 {
     base64_decode(ctx, base64, len, out, outlen);
 }

src/ctx.c

@@ -47,13 +47,11 @@
 
 #include "strophe.h"
 #include "common.h"
-#include "resolver.h"
 #include "util.h"
 
-/* Workaround for systems without va_copy support. */
+/* Workaround for visual studio without va_copy support. */
-#if defined(_MSC_VER) && _MSC_VER < 1800 || \
+#if defined(_MSC_VER) && _MSC_VER < 1800
-    !defined(_MSC_VER) && !defined(HAVE_DECL_VA_COPY)
+#define va_copy(d,s) ((d) = (s))
-#define va_copy(d, s) (memcpy(&d, &s, sizeof(va_list)))
 #endif
 
 /** Initialize the Strophe library.
@@ -65,7 +63,6 @@
  void xmpp_initialize(void)
 {
     sock_initialize();
-    resolver_initialize();
     tls_initialize();
 }
 
@@ -76,7 +73,6 @@ void xmpp_initialize(void)
 void xmpp_shutdown(void)
 {
     tls_shutdown();
-    resolver_shutdown();
     sock_shutdown();
 }
 
@@ -114,7 +110,8 @@ 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. */
@@ -124,32 +121,33 @@ int xmpp_version_check(int major, int minor)
  */
 static void *_malloc(const size_t size, void * const userdata)
 {
-    UNUSED(userdata);
     return malloc(size);
 }
 
 static void _free(void *p, void * const userdata)
 {
-    UNUSED(userdata);
     free(p);
 }
 
 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",
+static const char * const _xmpp_log_level_name[4] = {"DEBUG", "INFO", "WARN", "ERROR"};
-                                                    "ERROR"};
+static const xmpp_log_level_t _xmpp_default_logger_levels[] = {XMPP_LEVEL_DEBUG,
-static const xmpp_log_level_t _xmpp_default_logger_levels[] = {
+                                                               XMPP_LEVEL_INFO,
-    XMPP_LEVEL_DEBUG, XMPP_LEVEL_INFO, XMPP_LEVEL_WARN, XMPP_LEVEL_ERROR};
+                                                               XMPP_LEVEL_WARN,
+                                                               XMPP_LEVEL_ERROR};
 
 /** Log a message.
  *  The default logger writes to stderr.
@@ -171,14 +169,11 @@ static void xmpp_default_logger(void *const userdata,
 }
 
 static const xmpp_log_t _xmpp_default_loggers[] = {
-    {&xmpp_default_logger,
+        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_DEBUG]},
-     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_DEBUG]},
+        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_INFO]},
-    {&xmpp_default_logger,
+        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_WARN]},
-     (void *)&_xmpp_default_logger_levels[XMPP_LEVEL_INFO]},
+        {&xmpp_default_logger, (void*)&_xmpp_default_logger_levels[XMPP_LEVEL_ERROR]}
-    {&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
@@ -194,8 +189,7 @@ 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)
+    if (level > XMPP_LEVEL_ERROR) level = XMPP_LEVEL_ERROR;
-        level = XMPP_LEVEL_ERROR;
 
     return (xmpp_log_t*)&_xmpp_default_loggers[level];
 }
@@ -237,7 +231,8 @@ 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);
 }
@@ -420,7 +415,7 @@ xmpp_ctx_t *xmpp_ctx_new(const xmpp_mem_t *const mem,
             ctx->log = log;
 
         ctx->connlist = NULL;
-        ctx->timed_handlers = NULL;
+        ctx->serverlist = NULL;
         ctx->loop_status = XMPP_LOOP_NOTSTARTED;
         ctx->rand = xmpp_rand_new(ctx);
         ctx->timeout = EVENT_LOOP_DEFAULT_TIMEOUT;

src/event.c

@@ -41,25 +41,16 @@
 #define _sleep(x) usleep((x) * 1000)
 #else
 #include <winsock2.h>
-#ifndef ETIMEDOUT
 #define ETIMEDOUT WSAETIMEDOUT
-#endif
-#ifndef ECONNRESET
 #define ECONNRESET WSAECONNRESET
-#endif
-#ifndef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
-#endif
 #define _sleep(x) Sleep(x)
 #endif
 
-#include "strophe.h"
+#include <strophe.h>
 #include "common.h"
 #include "parser.h"
 
-/** 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
  *  xmpp_send and related functions and run through the Strophe even
@@ -76,20 +67,21 @@
 void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 {
     xmpp_connlist_t *connitem;
+    xmpp_serverlist_t *serveritem;
     xmpp_conn_t *conn;
+    xmpp_server_t *srv;
     fd_set rfds, wfds;
     sock_t max = 0;
     int ret;
     struct timeval tv;
     xmpp_send_queue_t *sq, *tsq;
     int towrite;
-    char buf[STROPE_MESSAGE_BUFFER_SIZE];
+    char buf[4096];
     uint64_t next;
     uint64_t usec;
     int tls_read_bytes = 0;
 
-    if (ctx->loop_status == XMPP_LOOP_QUIT)
+    if (ctx->loop_status == XMPP_LOOP_QUIT) return;
-        return;
 
     /* send queued data */
     connitem = ctx->connlist;
@@ -142,8 +134,7 @@ 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)
+            if (!sq) conn->send_queue_tail = NULL;
-                conn->send_queue_tail = NULL;
         }
 
         /* tear down connection on error */
@@ -164,6 +155,7 @@ 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);
@@ -216,6 +208,23 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
         connitem = connitem->next;
     }
 
+    serveritem = ctx->serverlist;
+    while (serveritem) {
+        srv = serveritem->server;
+
+        switch (srv->state) {
+        case XMPP_STATE_LISTENING:
+            FD_SET(srv->sock, &rfds);
+            if (srv->sock > max) max = srv->sock;
+            break;
+        case XMPP_STATE_STOPPED:
+            /* do nothing */
+        default:
+            break;
+        }
+        serveritem = serveritem->next;
+    }
+
     /* check for events */
     if (max > 0)
         ret = select(max + 1, &rfds,  &wfds, NULL, &tv);
@@ -234,8 +243,7 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     }
 
     /* no events happened */
-    if (ret == 0 && tls_read_bytes == 0)
+    if (ret == 0 && tls_read_bytes == 0) return;
-        return;
 
     /* process events */
     connitem = ctx->connlist;
@@ -263,35 +271,31 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
             break;
         case XMPP_STATE_CONNECTED:
-            if (FD_ISSET(conn->sock, &rfds) ||
+            if (FD_ISSET(conn->sock, &rfds) || (conn->tls && tls_pending(conn->tls))) {
-                (conn->tls && tls_pending(conn->tls))) {
                 if (conn->tls) {
-                    ret = tls_read(conn->tls, buf, STROPE_MESSAGE_BUFFER_SIZE);
+                    ret = tls_read(conn->tls, buf, 4096);
                 } else {
-                    ret =
+                    ret = sock_read(conn->sock, buf, 4096);
-                        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);
+                        /* parse error, we need to shut down */
-                        xmpp_send_error(conn, XMPP_SE_INVALID_XML,
+                        /* FIXME */
-                                        "parse error");
+                        xmpp_debug(ctx, "xmpp", "parse error, disconnecting");
+                        conn_disconnect(conn);
                     }
                 } else {
                     if (conn->tls) {
                         if (!tls_is_recoverable(tls_error(conn->tls))) {
-                            xmpp_debug(ctx, "xmpp",
+                            xmpp_debug(ctx, "xmpp", "Unrecoverable TLS error, %d.", tls_error(conn->tls));
-                                       "Unrecoverable TLS error, %d.",
-                                       tls_error(conn->tls));
                             conn->error = tls_error(conn->tls);
                             conn_disconnect(conn);
                         }
                     } else {
                         /* return of 0 means socket closed by server */
-                        xmpp_debug(ctx, "xmpp",
+                        xmpp_debug(ctx, "xmpp", "Socket closed by remote host.");
-                                   "Socket closed by remote host.");
                         conn->error = ECONNRESET;
                         conn_disconnect(conn);
                     }
@@ -308,6 +312,24 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
         connitem = connitem->next;
     }
 
+    serveritem = ctx->serverlist;
+    while (serveritem) {
+        srv = serveritem->server;
+
+        switch (srv->state) {
+        case XMPP_STATE_LISTENING:
+            if (FD_ISSET(srv->sock, &rfds)) {
+                server_accept(srv);
+            }
+            break;
+        case XMPP_STATE_STOPPED:
+            /* do nothing */
+        default:
+            break;
+        }
+        serveritem = serveritem->next;
+    }
+
     /* fire any ready handlers */
     handler_fire_timed(ctx);
 }
@@ -322,8 +344,7 @@ 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)
+    if (ctx->loop_status != XMPP_LOOP_NOTSTARTED) return;
-        return;
 
     ctx->loop_status = XMPP_LOOP_RUNNING;
     while (ctx->loop_status == XMPP_LOOP_RUNNING) {

src/handler.c

@@ -24,8 +24,6 @@
 #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()
@@ -35,14 +33,19 @@ typedef int (*xmpp_void_handler)();
  * 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)
 {
-    while (*head) {
+    xmpp_handlist_t *i = *head;
-        if (*head == item) {
+
+    if (i == item)
         *head = item->next;
-            break;
+    else if (i != NULL) {
+        while (i->next != NULL && i->next != item)
+            i = i->next;
+        if (i->next == item) {
+            i->next = item->next;
         }
-        head = &(*head)->next;
     }
 }
 
@@ -53,7 +56,8 @@ static void _handler_item_remove(xmpp_handlist_t **head, xmpp_handlist_t *item)
  *  @param conn a Strophe connection object
  *  @param stanza a Strophe stanza object
  */
-void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
+void handler_fire_stanza(xmpp_conn_t * const conn,
+                         xmpp_stanza_t * const stanza)
 {
     xmpp_handlist_t *item, *next, *head, *head_old;
     const char *id, *ns, *name, *type;
@@ -71,8 +75,7 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
         while (item) {
             /* don't fire user handlers until authentication succeeds and
                and skip newly added handlers */
-            if ((item->user_handler && !conn->authenticated) ||
+            if ((item->user_handler && !conn->authenticated) || !item->enabled) {
-                !item->enabled) {
                 item = item->next;
                 continue;
             }
@@ -87,7 +90,7 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
                     /* replace old value */
                     hash_add(conn->id_handlers, id, head);
                 }
-                xmpp_free(conn->ctx, item->u.id);
+                xmpp_free(conn->ctx, item->id);
                 xmpp_free(conn->ctx, item);
             }
             item = next;
@@ -113,10 +116,10 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
         }
 
         next = item->next;
-        if ((!item->u.ns || (ns && strcmp(ns, item->u.ns) == 0) ||
+        if ((!item->ns || (ns && strcmp(ns, item->ns) == 0) ||
-             xmpp_stanza_get_child_by_ns(stanza, item->u.ns)) &&
+             xmpp_stanza_get_child_by_ns(stanza, item->ns)) &&
-            (!item->u.name || (name && strcmp(name, item->u.name) == 0)) &&
+            (!item->name || (name && strcmp(name, item->name) == 0)) &&
-            (!item->u.type || (type && strcmp(type, item->u.type) == 0))) {
+            (!item->type || (type && strcmp(type, item->type) == 0))) {
 
             ret = ((xmpp_handler)(item->handler))(conn, stanza, item->userdata);
             /* list may be changed during execution of a handler */
@@ -124,12 +127,9 @@ void handler_fire_stanza(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza)
             if (!ret) {
                 /* handler is one-shot, so delete it */
                 _handler_item_remove(&conn->handlers, item);
-                if (item->u.ns)
+                if (item->ns) xmpp_free(conn->ctx, item->ns);
-                    xmpp_free(conn->ctx, item->u.ns);
+                if (item->name) xmpp_free(conn->ctx, item->name);
-                if (item->u.name)
+                if (item->type) xmpp_free(conn->ctx, item->type);
-                    xmpp_free(conn->ctx, item->u.name);
-                if (item->u.type)
-                    xmpp_free(conn->ctx, item->u.type);
                 xmpp_free(conn->ctx, item);
             }
         }
@@ -171,28 +171,27 @@ 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) ||
+            if ((item->user_handler && !conn->authenticated) || !item->enabled) {
-                !item->enabled) {
                 item = item->next;
                 continue;
             }
 
             next = item->next;
             timestamp = time_stamp();
-            elapsed = time_elapsed(item->u.last_stamp, timestamp);
+            elapsed = time_elapsed(item->last_stamp, timestamp);
-            if (elapsed >= item->u.period) {
+            if (elapsed >= item->period) {
                 /* fire! */
-                item->u.last_stamp = timestamp;
+                item->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(ctx, item);
+                    xmpp_free(conn->ctx, item);
                 }
-            } else if (min > (item->u.period - elapsed))
+            } else if (min > (item->period - elapsed))
-                min = item->u.period - elapsed;
+                min = item->period - elapsed;
 
             item = next;
         }
@@ -200,34 +199,6 @@ 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;
 }
 
@@ -244,63 +215,50 @@ 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->u.last_stamp = time_stamp();
+            handitem->last_stamp = time_stamp();
 
         handitem = handitem->next;
     }
 }
 
-static void _timed_handler_add(xmpp_ctx_t *ctx,
+static void _timed_handler_add(xmpp_conn_t * const conn,
-                               xmpp_handlist_t **handlers_list,
+                               xmpp_timed_handler handler,
-                               xmpp_void_handler handler,
                                const unsigned long period,
                                void * const userdata,
                                const int user_handler)
 {
-    xmpp_handlist_t *item;
+    xmpp_handlist_t *item, *tail;
 
     /* check if handler is already in the list */
-    for (item = *handlers_list; item; item = item->next) {
+    for (item = conn->timed_handlers; item; item = item->next) {
         if (item->handler == handler && item->userdata == userdata) {
-            xmpp_warn(ctx, "xmpp", "Timed handler already exists.");
+            xmpp_warn(conn->ctx, "xmpp", "Timed handler already exists.");
             break;
         }
     }
-    if (item)
+    if (item) return;
-        return;
 
     /* build new item */
-    item = xmpp_alloc(ctx, sizeof(xmpp_handlist_t));
+    item = xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item)
+    if (!item) return;
-        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
     item->userdata = userdata;
     item->enabled = 0;
+    item->next = NULL;
 
-    item->u.period = period;
+    item->period = period;
-    item->u.last_stamp = time_stamp();
+    item->last_stamp = time_stamp();
 
     /* append item to list */
-    item->next = *handlers_list;
+    if (!conn->timed_handlers)
-    *handlers_list = item;
+        conn->timed_handlers = item;
-}
+    else {
-
+        tail = conn->timed_handlers;
-static void _timed_handler_delete(xmpp_ctx_t *ctx,
+        while (tail->next)
-                                  xmpp_handlist_t **handlers_list,
+            tail = tail->next;
-                                  xmpp_void_handler handler)
+        tail->next = item;
-{
-    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;
-        }
     }
 }
 
@@ -314,14 +272,32 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,
 void xmpp_timed_handler_delete(xmpp_conn_t * const conn,
                                xmpp_timed_handler handler)
 {
-    _timed_handler_delete(conn->ctx, &conn->timed_handlers, 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;
+        }
+    }
 }
 
 static void _id_handler_add(xmpp_conn_t * const conn,
                          xmpp_handler handler,
                          const char * const id,
-                            void *const userdata,
+                         void * const userdata, int user_handler)
-                            int user_handler)
 {
     xmpp_handlist_t *item, *tail;
 
@@ -334,13 +310,11 @@ static void _id_handler_add(xmpp_conn_t *const conn,
         }
         item = item->next;
     }
-    if (item)
+    if (item) return;
-        return;
 
     /* build new item */
     item = xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item)
+    if (!item) return;
-        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
@@ -348,8 +322,8 @@ static void _id_handler_add(xmpp_conn_t *const conn,
     item->enabled = 0;
     item->next = NULL;
 
-    item->u.id = xmpp_strdup(conn->ctx, id);
+    item->id = xmpp_strdup(conn->ctx, id);
-    if (!item->u.id) {
+    if (!item->id) {
         xmpp_free(conn->ctx, item);
         return;
     }
@@ -381,8 +355,7 @@ void xmpp_id_handler_delete(xmpp_conn_t *const conn,
 
     prev = NULL;
     item = (xmpp_handlist_t *)hash_get(conn->id_handlers, id);
-    if (!item)
+    if (!item) return;
-        return;
 
     while (item) {
         next = item->next;
@@ -395,7 +368,7 @@ void xmpp_id_handler_delete(xmpp_conn_t *const conn,
                 hash_add(conn->id_handlers, id, next);
             }
 
-            xmpp_free(conn->ctx, item->u.id);
+            xmpp_free(conn->ctx, item->id);
             xmpp_free(conn->ctx, item);
             item = next;
         } else {
@@ -411,8 +384,7 @@ static void _handler_add(xmpp_conn_t *const conn,
                          const char * const ns,
                          const char * const name,
                          const char * const type,
-                         void *const userdata,
+                         void * const userdata, int user_handler)
-                         int user_handler)
 {
     xmpp_handlist_t *item, *tail;
 
@@ -425,13 +397,11 @@ static void _handler_add(xmpp_conn_t *const conn,
             break;
         }
     }
-    if (item)
+    if (item) return;
-        return;
 
     /* build new item */
     item = (xmpp_handlist_t *)xmpp_alloc(conn->ctx, sizeof(xmpp_handlist_t));
-    if (!item)
+    if (!item) return;
-        return;
 
     item->user_handler = user_handler;
     item->handler = handler;
@@ -440,36 +410,31 @@ static void _handler_add(xmpp_conn_t *const conn,
     item->next = NULL;
 
     if (ns) {
-        item->u.ns = xmpp_strdup(conn->ctx, ns);
+        item->ns = xmpp_strdup(conn->ctx, ns);
-        if (!item->u.ns) {
+        if (!item->ns) {
             xmpp_free(conn->ctx, item);
             return;
         }
     } else
-        item->u.ns = NULL;
+        item->ns = NULL;
-
     if (name) {
-        item->u.name = xmpp_strdup(conn->ctx, name);
+        item->name = xmpp_strdup(conn->ctx, name);
-        if (!item->u.name) {
+        if (!item->name) {
-            if (item->u.ns)
+            if (item->ns) xmpp_free(conn->ctx, item->ns);
-                xmpp_free(conn->ctx, item->u.ns);
             xmpp_free(conn->ctx, item);
             return;
         }
     } else
-        item->u.name = NULL;
+        item->name = NULL;
-
     if (type) {
-        item->u.type = xmpp_strdup(conn->ctx, type);
+        item->type = xmpp_strdup(conn->ctx, type);
-        if (!item->u.type) {
+        if (!item->type) {
-            if (item->u.ns)
+            if (item->ns) xmpp_free(conn->ctx, item->ns);
-                xmpp_free(conn->ctx, item->u.ns);
+            if (item->name) xmpp_free(conn->ctx, item->name);
-            if (item->u.name)
-                xmpp_free(conn->ctx, item->u.name);
             xmpp_free(conn->ctx, item);
         }
     } else
-        item->u.type = NULL;
+        item->type = NULL;
 
     /* append to list */
     if (!conn->handlers)
@@ -489,12 +454,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)
+    if (!conn->handlers) return;
-        return;
 
     prev = NULL;
     item = conn->handlers;
@@ -505,12 +470,9 @@ void xmpp_handler_delete(xmpp_conn_t *const conn, xmpp_handler handler)
             else
                 conn->handlers = item->next;
 
-            if (item->u.ns)
+            if (item->ns) xmpp_free(conn->ctx, item->ns);
-                xmpp_free(conn->ctx, item->u.ns);
+            if (item->name) xmpp_free(conn->ctx, item->name);
-            if (item->u.name)
+            if (item->type) xmpp_free(conn->ctx, item->type);
-                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 {
@@ -541,8 +503,7 @@ void xmpp_timed_handler_add(xmpp_conn_t *const conn,
                             const unsigned long period,
                             void * const userdata)
 {
-    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
+    _timed_handler_add(conn, handler, period, userdata, 1);
-                       userdata, 1);
 }
 
 /** Add a timed system handler.
@@ -559,8 +520,7 @@ void handler_add_timed(xmpp_conn_t *const conn,
                        const unsigned long period,
                        void * const userdata)
 {
-    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,
+    _timed_handler_add(conn, handler, period, userdata, 0);
-                       userdata, 0);
 }
 
 /** Add an id based stanza handler.
@@ -676,12 +636,9 @@ void handler_system_delete_all(xmpp_conn_t *conn)
         if (!item->user_handler) {
             next = item->next;
             _handler_item_remove(&conn->handlers, item);
-            if (item->u.ns)
+            if (item->ns) xmpp_free(conn->ctx, item->ns);
-                xmpp_free(conn->ctx, item->u.ns);
+            if (item->name) xmpp_free(conn->ctx, item->name);
-            if (item->u.name)
+            if (item->type) xmpp_free(conn->ctx, item->type);
-                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
@@ -708,7 +665,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->u.id);
+                xmpp_free(conn->ctx, item->id);
                 xmpp_free(conn->ctx, item);
                 item = next;
             } else
@@ -729,56 +686,5 @@ void handler_system_delete_all(xmpp_conn_t *conn)
             xmpp_free(conn->ctx, key2);
         }
     }
-    if (iter)
+    if (iter) hash_iter_release(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

@@ -46,8 +46,8 @@ struct _hash_iterator_t {
 };
    
 /** allocate and initialize a new hash table */
-hash_t *
+hash_t *hash_new(xmpp_ctx_t * const ctx, const int size,
-hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func)
+		 hash_free_func free_func)
 {
     hash_t *result = NULL;
 
@@ -93,8 +93,7 @@ void hash_release(hash_t *const table)
 	    while (entry != NULL) {
 		next = entry->next;
 		xmpp_free(ctx, entry->key);
-                if (table->free)
+		if (table->free) table->free(ctx, entry->value);
-                    table->free(ctx, entry->value);
 		xmpp_free(ctx, entry);
 		entry = next;
 	    }
@@ -115,8 +114,7 @@ static int _hash_key(hash_t *table, const char *key)
 	/* assume 32 bit ints */
 	hash ^= ((unsigned)*c++ << shift);
 	shift += 8;
-        if (shift > 24)
+	if (shift > 24) shift = 0;
-            shift = 0;
    }
    return hash % (unsigned)table->length;
 }
@@ -155,8 +153,7 @@ int hash_add(hash_t *table, const char *const key, void *data)
    if (entry == NULL) {
       /* allocate and fill a new entry */
       entry = xmpp_alloc(ctx, sizeof(hashentry_t));
-        if (!entry)
+      if (!entry) return -1;
-            return -1;
       entry->key = xmpp_strdup(ctx, key);
       if (!entry->key) {
          xmpp_free(ctx, entry);
@@ -166,9 +163,6 @@ int hash_add(hash_t *table, const char *const key, void *data)
       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;
@@ -200,8 +194,7 @@ int hash_drop(hash_t *table, const char *key)
 	if (!strcmp(key, entry->key)) {
 	  /* match, remove the entry */
 	  xmpp_free(ctx, entry->key);
-            if (table->free)
+	  if (table->free) table->free(ctx, entry->value);
-                table->free(ctx, entry->value);
 	  if (prev == NULL) {
 	    table->entries[table_index] = entry->next;
 	  } else {
@@ -240,6 +233,7 @@ hash_iterator_t *hash_iter_new(hash_t *table)
     return iter;
 }
 
+
 /** release an iterator that is no longer needed */
 void hash_iter_release(hash_iterator_t *iter)
 {
@@ -247,7 +241,7 @@ void hash_iter_release(hash_iterator_t *iter)
 
     iter->ref--;
 
-    if (iter->ref == 0) { // ref is unsigned!!!
+    if (iter->ref <= 0) {
 	hash_release(iter->table);
 	xmpp_free(ctx, iter);
     }
@@ -262,8 +256,7 @@ const char *hash_iter_next(hash_iterator_t *iter)
     int i;
 
     /* advance until we find the next entry */
-    if (entry != NULL)
+    if (entry != NULL) entry = entry->next;
-        entry = entry->next;
     if (entry == NULL) {
 	/* we're off the end of list, search for a new entry */
 	i = iter->index + 1;

src/hash.h

@@ -21,8 +21,8 @@ typedef struct _hash_t hash_t;
 typedef void (*hash_free_func)(const xmpp_ctx_t * const ctx, void *p);
 
 /** allocate and initialize a new hash table */
-hash_t *
+hash_t *hash_new(xmpp_ctx_t * const ctx, const int size,
-hash_new(xmpp_ctx_t *const ctx, const int size, hash_free_func free_func);
+		 hash_free_func free_func);
 
 /** allocate a new reference to an existing hash table */
 hash_t *hash_clone(hash_t * const table);

src/jid.c

@@ -28,8 +28,7 @@
  *  @return an allocated string with the full JID or NULL if no domain
  *      is specified
  */
-char *xmpp_jid_new(xmpp_ctx_t *ctx,
+char *xmpp_jid_new(xmpp_ctx_t *ctx, const char *node,
-                   const char *node,
 				    const char *domain,
 				    const char *resource)
 {
@@ -37,8 +36,7 @@ char *xmpp_jid_new(xmpp_ctx_t *ctx,
     size_t len, nlen, dlen, rlen;
 
     /* jid must at least have a domain */
-    if (domain == NULL)
+    if (domain == NULL) return NULL;
-        return NULL;
 
     /* accumulate lengths */
     dlen = strlen(domain);

src/md5.c

@@ -43,7 +43,8 @@
         (cp)[3] = ((value) >> 24) & 0xFF; \
     } while(0)
 
-static void MD5Transform(uint32_t buf[4], const unsigned char inext[64]);
+static void MD5Transform(uint32_t buf[4], const unsigned char inext[64],
+                         struct MD5Context *ctx);
 
 /*
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
@@ -90,7 +91,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
             return;
         }
         memcpy(p, buf, t);
-        MD5Transform(ctx->buf, ctx->in);
+        MD5Transform(ctx->buf, ctx->in, ctx);
         buf += t;
         len -= t;
     }
@@ -98,7 +99,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);
+        MD5Transform(ctx->buf, ctx->in, ctx);
         buf += 64;
         len -= 64;
     }
@@ -132,7 +133,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);
+        MD5Transform(ctx->buf, ctx->in, ctx);
 
         /* Now fill the next block with 56 bytes */
         memset(ctx->in, 0, 56);
@@ -145,7 +146,7 @@ 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);
+    MD5Transform(ctx->buf, ctx->in, ctx);
     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]);
@@ -179,7 +180,8 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
  * 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])
+static void MD5Transform(uint32_t buf[4], const unsigned char inext[64],
+                         struct MD5Context *ctx)
 {
     register uint32_t a, b, c, d, i;
     uint32_t in[16];

src/md5.h

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

src/oocontext.cpp

@@ -0,0 +1,84 @@
+/* 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

@@ -0,0 +1,77 @@
+/* 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/parser.h

@@ -27,6 +27,7 @@ typedef void (*parser_end_callback)(char *name, void *const userdata);
 typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza,
                                        void * const userdata);
 
+
 parser_t *parser_new(xmpp_ctx_t *ctx, 
                      parser_start_callback startcb,
                      parser_end_callback endcb,

src/parser_expat.c

@@ -19,10 +19,13 @@
 
 #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
@@ -45,46 +48,6 @@ struct _parser_t {
     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)
@@ -93,9 +56,8 @@ static char *_xml_name(xmpp_ctx_t *ctx, const char *nsname)
     const char *c;
     size_t len;
 
-    c = strchr(nsname, namespace_sep);
+    c = strchr(nsname, NAMESPACE_SEP);
-    if (c == NULL)
+    if (c == NULL) return xmpp_strdup(ctx, nsname);
-        return xmpp_strdup(ctx, nsname);
 
     c++;
     len = strlen(c);
@@ -114,7 +76,7 @@ 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) {
@@ -131,8 +93,7 @@ static void _set_attributes(xmpp_stanza_t *stanza, const XML_Char **attrs)
     char *attr;
     int i;
 
-    if (!attrs)
+    if (!attrs) return;
-        return;
 
     for (i = 0; attrs[i]; i += 2) {
         /* namespaced attributes aren't used in xmpp, discard namespace */
@@ -162,8 +123,9 @@ static void complete_inner_text(parser_t *parser)
     }
 }
 
-static void
+static void _start_element(void *userdata,
-_start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
+                           const XML_Char *nsname,
+                           const XML_Char **attrs)
 {
     parser_t *parser = (parser_t *)userdata;
     xmpp_stanza_t *child;
@@ -175,7 +137,8 @@ _start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
     if (parser->depth == 0) {
         /* notify the owner */
         if (parser->startcb)
-            parser->startcb(name, (char **)attrs, parser->userdata);
+            parser->startcb((char *)name, (char **)attrs, 
+                            parser->userdata);
     } else {
         /* build stanzas at depth 1 */
         if (!parser->stanza && parser->depth != 1) {
@@ -201,10 +164,8 @@ _start_element(void *userdata, const XML_Char *nsname, const XML_Char **attrs)
         }
     }
 
-    if (ns)
+    if (ns) xmpp_free(parser->ctx, ns);
-        xmpp_free(parser->ctx, ns);
+    if (name) xmpp_free(parser->ctx, name);
-    if (name)
-        xmpp_free(parser->ctx, name);
 
     parser->depth++;
 }
@@ -226,7 +187,8 @@ 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;
         }
@@ -238,14 +200,13 @@ static void _characters(void *userdata, const XML_Char *s, int len)
     parser_t *parser = (parser_t *)userdata;
     char *p;
 
-    if (parser->depth < 2)
+    if (parser->depth < 2) return;
-        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_size = parser->inner_text_used + len + 1 +
-            parser->inner_text_used + len + 1 + INNER_TEXT_PADDING;
+                                  INNER_TEXT_PADDING;
         p = xmpp_realloc(parser->ctx, parser->inner_text,
                          parser->inner_text_size);
         if (p == NULL) {
@@ -312,38 +273,23 @@ void parser_free(parser_t *parser)
 /* shuts down and restarts XML parser.  true on success */
 int parser_reset(parser_t *parser)
 {
-    XML_Bool ret;
+    if (parser->expat)
-    const XML_Memory_Handling_Suite *mem = NULL;
-
-    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);
-    }
 
-    if (parser->stanza) {
+    if (parser->stanza) 
 	xmpp_stanza_release(parser->stanza);
+
+    parser->expat = XML_ParserCreateNS(NULL, NAMESPACE_SEP);
+    if (!parser->expat) return 0;
+
+    parser->depth = 0;
     parser->stanza = NULL;
-    }
 
     if (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

@@ -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,14 +36,13 @@ struct _parser_t {
     xmpp_stanza_t *stanza;
 };
 
-static void
+static void _set_attributes(xmpp_stanza_t *stanza, int nattrs,
-_set_attributes(xmpp_stanza_t *stanza, int nattrs, const xmlChar **attrs)
+                            const xmlChar **attrs)
 {
     int i, len;
     char *value;
 
-    if (!attrs)
+    if (!attrs) return;
-        return;
 
     /* SAX2 uses array of localname/prefix/uri/value_begin/value_end */
     for (i = 0; i < nattrs*5; i += 5) {
@@ -60,19 +59,17 @@ _set_attributes(xmpp_stanza_t *stanza, int nattrs, const xmlChar **attrs)
 
 /* SAX2 gives us the attrs in an incredibly inconvenient array,
  * convert it to what the start callback is expecting */
-static char **
+static char **_convert_attrs(parser_t *parser, int nattrs,
-_convert_attrs(parser_t *parser, int nattrs, const xmlChar **attrs)
+                             const xmlChar **attrs)
 {
     int c, i, o, len;
     char *value;
     char **ret;
 
-    if (!attrs)
+    if (!attrs) return NULL;
-        return NULL;
 
     ret = xmpp_alloc(parser->ctx, (nattrs+1)*2*sizeof(char*));
-    if (!ret)
+    if (!ret) return NULL;
-        return NULL;
     memset(ret, 0, (nattrs+1)*2*sizeof(char*));
 
     for (c = 0; c < nattrs; c++) {
@@ -100,39 +97,29 @@ static void _free_cbattrs(parser_t *parser, char **attrs)
         return;
 
     for (i = 0; attrs[i]; i += 2) {
-        if (attrs[i])
+        if (attrs[i]) xmpp_free(parser->ctx, attrs[i]);
-            xmpp_free(parser->ctx, attrs[i]);
+        if (attrs[i+1]) xmpp_free(parser->ctx, attrs[i+1]);
-        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 *name, const xmlChar *prefix,
-                           const xmlChar *prefix,
+                           const xmlChar *uri, int nnamespaces,
-                           const xmlChar *uri,
+                           const xmlChar **namespaces, int nattrs,
-                           int nnamespaces,
+                           int ndefaulted, const xmlChar **attrs)
-                           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 {
@@ -176,16 +163,11 @@ static void _start_element(void *userdata,
     parser->depth++;
 }
 
-static void _end_element(void *userdata,
+static void _end_element(void *userdata, const xmlChar *name,
-                         const xmlChar *name,
+                         const xmlChar *prefix, const xmlChar *uri)
-                         const xmlChar *prefix,
-                         const xmlChar *uri)
 {
     parser_t *parser = (parser_t *)userdata;
 
-    UNUSED(prefix);
-    UNUSED(uri);
-
     parser->depth--;
 
     if (parser->depth == 0) {
@@ -198,7 +180,8 @@ static void _end_element(void *userdata,
 	    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;
 	}
@@ -211,8 +194,7 @@ static void _characters(void *userdata, const xmlChar *chr, int len)
     xmpp_stanza_t *stanza;
 
     /* skip unimportant whitespace, etc */
-    if (parser->depth < 2)
+    if (parser->depth < 2) return;
-        return;
 
     /* create and populate stanza */
     stanza = xmpp_stanza_new(parser->ctx);
@@ -267,8 +249,6 @@ void parser_free(parser_t *parser)
 {
     if (parser->xmlctx)
         xmlFreeParserCtxt(parser->xmlctx);
-    if (parser->stanza)
-        xmpp_stanza_release(parser->stanza);
     xmpp_free(parser->ctx, parser);
 }
 
@@ -277,16 +257,18 @@ int parser_reset(parser_t *parser)
 {
     if (parser->xmlctx)
         xmlFreeParserCtxt(parser->xmlctx);
+
     if (parser->stanza) 
 	xmpp_stanza_release(parser->stanza);
 
-    parser->stanza = NULL;
+    parser->xmlctx = xmlCreatePushParserCtxt(&parser->handlers, 
+                                             parser, NULL, 0, NULL);
+    if (!parser->xmlctx) return 0;
+
     parser->depth = 0;
+    parser->stanza = NULL;
 
-    parser->xmlctx =
+    return 1;
-        xmlCreatePushParserCtxt(&parser->handlers, parser, NULL, 0, NULL);
-
-    return parser->xmlctx ? 1 : 0;
 }
 
 /* feed a chunk of data to the parser */

src/rand.c

@@ -62,8 +62,8 @@ struct _xmpp_rand_t {
 /* adds two arrays as numbers in big-endian representation and stores
  * result in the first one.
  */
-static void
+static void arr_add(uint8_t *arr1, size_t arr1_len,
-arr_add(uint8_t *arr1, size_t arr1_len, uint8_t *arr2, size_t arr2_len)
+                    uint8_t *arr2, size_t arr2_len)
 {
     size_t i;
     uint32_t acc;
@@ -89,10 +89,8 @@ 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,
+static void Hash_df(uint8_t *input_string, size_t input_string_len,
-                    size_t input_string_len,
+                    uint8_t *output_string, size_t no_of_bytes_to_return)
-                    uint8_t *output_string,
-                    size_t no_of_bytes_to_return)
 {
     uint8_t counter;
     uint8_t temp[round_up(seedlen, outlen)];
@@ -121,8 +119,7 @@ static void Hash_df(uint8_t *input_string,
 static void Hash_DRBG_Instantiate(Hash_DRBG_CTX *ctx,
                                   uint8_t *entropy_input,
                                   size_t entropy_input_len,
-                                  uint8_t *nonce,
+                                  uint8_t *nonce, size_t nonce_len)
-                                  size_t nonce_len)
 {
     uint8_t seed_material[ENTROPY_MAX + NONCE_MAX];
     uint8_t seed0[seedlen + 1];
@@ -130,10 +127,8 @@ static void Hash_DRBG_Instantiate(Hash_DRBG_CTX *ctx,
 
     assert(entropy_input_len <= ENTROPY_MAX);
     assert(nonce_len <= NONCE_MAX);
-    assert(nonce != NULL || nonce_len == 0);
 
     memcpy(seed_material, entropy_input, entropy_input_len);
-    if (nonce != NULL)
     memcpy(seed_material + entropy_input_len, nonce, nonce_len);
     Hash_df(seed_material, entropy_input_len + nonce_len, seed, seedlen);
     seed0[0] = 0;
@@ -165,8 +160,8 @@ static void Hash_DRBG_Reseed(Hash_DRBG_CTX *ctx,
     ctx->reseed_counter = 1;
 }
 
-static void
+static void Hashgen(uint8_t *V, uint8_t *output,
-Hashgen(uint8_t *V, uint8_t *output, size_t requested_number_of_bytes)
+                    size_t requested_number_of_bytes)
 {
     uint8_t data[seedlen];
     uint8_t W[GENERATE_MAX];
@@ -190,8 +185,7 @@ Hashgen(uint8_t *V, uint8_t *output, size_t requested_number_of_bytes)
 }
 
 /* assume additional_input is zero length string */
-static int Hash_DRBG_Generate(Hash_DRBG_CTX *ctx,
+static int Hash_DRBG_Generate(Hash_DRBG_CTX *ctx, uint8_t *output,
-                              uint8_t *output,
                               size_t requested_number_of_bytes)
 {
     uint8_t H[outlen];
@@ -293,32 +287,25 @@ 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;
-    const size_t rand_len = len / 2;
+    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
 
-    /*
+    /* current implementation returns printable HEX representation of
-     * We don't want to use any allocation here, because this function
+     * a random buffer, however base64 encoding can be used instead;
-     * can't fail. Also we want to avoid VLA.
+     * the only problem is that base64_encode() allocates memory and
-     * Current implementation uses half of the output buffer for random buffer
+     * as result can fail.
-     * generation and then converts it to HEX representation.
      */
 
-    if (rand_len > 0) {
+    xmpp_rand_bytes(rand, rand_buf, rand_len);
-        xmpp_rand_bytes(rand, (unsigned char *)output, rand_len);
+    for (i = 0; i < rand_len; ++i) {
-        for (i = rand_len; i > 0; --i)
+        xmpp_snprintf(output + i * 2, len, "%02x", rand_buf[i]);
-            rand_byte2hex(output[i - 1], &output[(i - 1) * 2]);
+        len -= 2;
     }
-    if (len > 0)
-        output[len - 1] = '\0';
 }

src/rand.h

@@ -36,7 +36,7 @@ xmpp_rand_t *xmpp_rand_new(xmpp_ctx_t *ctx);
  */
 void xmpp_rand_free(xmpp_ctx_t *ctx, xmpp_rand_t *rand);
 
-/** Generate random integer.
+/** Generate random integer
  *  Analogue of rand(3).
  *
  *  @ingroup Random

src/resolver.h

@@ -33,9 +33,6 @@ typedef struct resolver_srv_rr_struc {
     struct resolver_srv_rr_struc *next;
 } resolver_srv_rr_t;
 
-void resolver_initialize(void);
-void resolver_shutdown(void);
-
 /** Perform lookup for RFC1035 message format.
  *  This function allocates all elements.
  *
@@ -46,10 +43,8 @@ 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,
+int resolver_srv_lookup_buf(xmpp_ctx_t *ctx, const unsigned char *buf,
-                            const unsigned char *buf,
+                            size_t len, resolver_srv_rr_t **srv_rr_list);
-                            size_t len,
-                            resolver_srv_rr_t **srv_rr_list);
 /** Resolve SRV record.
  *
  *  @param ctx a Strophe context object
@@ -60,11 +55,8 @@ int resolver_srv_lookup_buf(xmpp_ctx_t *ctx,
  *
  *  @return XMPP_DOMAIN_FOUND on success or XMPP_DOMAIN_NOT_FOUND on fail
  */
-int resolver_srv_lookup(xmpp_ctx_t *ctx,
+int resolver_srv_lookup(xmpp_ctx_t *ctx, const char *service, const char *proto,
-                        const char *service,
+                        const char *domain, resolver_srv_rr_t **srv_rr_list);
-                        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

@@ -21,6 +21,7 @@
 #include "ostypes.h"
 #include "sasl.h"
 #include "md5.h"
+#include "sha1.h"
 #include "scram.h"
 #include "rand.h"
 #include "util.h"
@@ -35,9 +36,9 @@
 # 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;
@@ -112,17 +113,13 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
 	s = text;
 	while (*s != '\0') {
 	    /* skip any leading commas and spaces */
-            while ((*s == ',') || (*s == ' '))
+	    while ((*s == ',') || (*s == ' ')) s++;
-                s++;
 	    /* accumulate a key ending at '=' */
 	    t = s;
-            while ((*t != '=') && (*t != '\0'))
+	    while ((*t != '=') && (*t != '\0')) t++;
-                t++;
+	    if (*t == '\0') break; /* bad string */
-            if (*t == '\0')
-                break; /* bad string */
 	    key = _make_string(ctx, (char *)s, (t-s));
-            if (key == NULL)
+	    if (key == NULL) break;
-                break;
             /* advance our start pointer past the key */
 	    s = t + 1;
 	    t = s;
@@ -139,8 +136,7 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
 		}
 	    /* otherwise, accumulate a value ending in ',' or '\0' */
 	    } else {
-                while ((*t != ',') && (*t != '\0'))
+		while ((*t != ',') && (*t != '\0')) t++;
-                    t++;
 		value = _make_string(ctx, (char *)s, (t-s));
 		s = t;
 	    }
@@ -172,8 +168,8 @@ static void _digest_to_hex(const char *digest, char *hex)
 }
 
 /** append 'key="value"' to a buffer, growing as necessary */
-static char *
+static char *_add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, 
-_add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
+		      char *buf, int *len, int quote)
 {
     int olen,nlen;
     int keylen, valuelen;
@@ -185,8 +181,7 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
 	buf = xmpp_alloc(ctx, 1);
 	buf[0] = '\0';
     }
-    if (buf == NULL)
+    if (buf == NULL) return NULL;
-        return NULL;
 
     /* get current string length */
     olen = strlen(buf);
@@ -209,33 +204,27 @@ _add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote)
 
     if (buf != NULL) {
 	c = buf + olen;
-        if (olen)
+	if (olen) *c++ = ',';
-            *c++ = ',';
+	memcpy(c, key, keylen); c += keylen;
-        memcpy(c, key, keylen);
-        c += keylen;
 	*c++ = '=';
-        memcpy(c, qvalue, valuelen);
+	memcpy(c, qvalue, valuelen); c += valuelen;
-        c += valuelen;
 	*c++ = '\0';
     }
 
-    if (quote)
+    if (quote) xmpp_free(ctx, (char *)qvalue);
-        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,
+char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
-                      const char *challenge,
+			const char *jid, const char *password) {
-                      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];
@@ -275,7 +264,6 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
     xmpp_rand_nonce(ctx->rand, cnonce, sizeof(cnonce));
     hash_add(table, "cnonce", xmpp_strdup(ctx, cnonce));
     hash_add(table, "nc", xmpp_strdup(ctx, "00000001"));
-    if (hash_get(table, "qop") == NULL)
     hash_add(table, "qop", xmpp_strdup(ctx, "auth"));
     value = xmpp_alloc(ctx, 5 + strlen(domain) + 1);
     memcpy(value, "xmpp/", 5);
@@ -351,15 +339,16 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
 
     /* construct reply */
     result = NULL;
-    result = _add_key(ctx, table, "username", result, 1);
+    rlen = 0;
-    result = _add_key(ctx, table, "realm", result, 1);
+    result = _add_key(ctx, table, "username", result, &rlen, 1); 
-    result = _add_key(ctx, table, "nonce", result, 1);
+    result = _add_key(ctx, table, "realm", result, &rlen, 1); 
-    result = _add_key(ctx, table, "cnonce", result, 1);
+    result = _add_key(ctx, table, "nonce", result, &rlen, 1); 
-    result = _add_key(ctx, table, "nc", result, 0);
+    result = _add_key(ctx, table, "cnonce", result, &rlen, 1); 
-    result = _add_key(ctx, table, "qop", result, 0);
+    result = _add_key(ctx, table, "nc", result, &rlen, 0); 
-    result = _add_key(ctx, table, "digest-uri", result, 1);
+    result = _add_key(ctx, table, "qop", result, &rlen, 0); 
-    result = _add_key(ctx, table, "response", result, 0);
+    result = _add_key(ctx, table, "digest-uri", result, &rlen, 1); 
-    result = _add_key(ctx, table, "charset", result, 0);
+    result = _add_key(ctx, table, "response", result, &rlen, 0); 
+    result = _add_key(ctx, table, "charset", result, &rlen, 0);
  
     xmpp_free(ctx, node);
     xmpp_free(ctx, domain);
@@ -372,16 +361,13 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx,
     return response;
 }
 
-/** generate auth response string for the SASL SCRAM mechanism */
+/** generate auth response string for the SASL SCRAM-SHA-1 mechanism */
-char *sasl_scram(xmpp_ctx_t *ctx,
+char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
-                 const struct hash_alg *alg,
+                      const char *first_bare, const char *jid,
-                 const char *challenge,
-                 const char *first_bare,
-                 const char *jid,
                       const char *password)
 {
-    uint8_t key[SCRAM_DIGEST_SIZE];
+    uint8_t key[SHA1_DIGEST_SIZE];
-    uint8_t sign[SCRAM_DIGEST_SIZE];
+    uint8_t sign[SHA1_DIGEST_SIZE];
     char *r = NULL;
     char *s = NULL;
     char *i = NULL;
@@ -398,8 +384,7 @@ char *sasl_scram(xmpp_ctx_t *ctx,
     char *result = NULL;
     size_t response_len;
     size_t auth_len;
-
+    int j;
-    UNUSED(jid);
 
     tmp = xmpp_strdup(ctx, challenge);
     if (!tmp) {
@@ -434,8 +419,7 @@ char *sasl_scram(xmpp_ctx_t *ctx,
         goto out_sval;
     }
 
-    /* "c=biws," + r + ",p=" + sign_b64 + '\0' */
+    response_len = 39 + strlen(r);
-    response_len = 7 + strlen(r) + 3 + ((alg->digest_size + 2) / 3 * 4) + 1;
     response = xmpp_alloc(ctx, response_len);
     if (!response) {
         goto out_auth;
@@ -445,17 +429,18 @@ char *sasl_scram(xmpp_ctx_t *ctx,
     xmpp_snprintf(auth, auth_len, "%s,%s,%s", first_bare + 3, challenge,
                   response);
 
-    SCRAM_ClientKey(alg, (uint8_t *)password, strlen(password), (uint8_t *)sval,
+    SCRAM_SHA1_ClientKey((uint8_t *)password, strlen(password),
-                    sval_len, (uint32_t)ival, key);
+                         (uint8_t *)sval, sval_len, (uint32_t)ival, key);
-    SCRAM_ClientSignature(alg, key, (uint8_t *)auth, strlen(auth), sign);
+    SCRAM_SHA1_ClientSignature(key, (uint8_t *)auth, strlen(auth), sign);
-    SCRAM_ClientProof(alg, sign, key, sign);
+    for (j = 0; j < SHA1_DIGEST_SIZE; j++) {
+        sign[j] ^= key[j];
+    }
 
-    sign_b64 = xmpp_base64_encode(ctx, sign, alg->digest_size);
+    sign_b64 = xmpp_base64_encode(ctx, sign, sizeof(sign));
     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;
@@ -464,8 +449,8 @@ char *sasl_scram(xmpp_ctx_t *ctx,
     strcat(response, sign_b64);
     xmpp_free(ctx, sign_b64);
 
-    response_b64 =
+    response_b64 = xmpp_base64_encode(ctx, (unsigned char *)response,
-        xmpp_base64_encode(ctx, (unsigned char *)response, strlen(response));
+                                      strlen(response));
     if (!response_b64) {
         goto out_response;
     }

src/sasl.h

@@ -17,20 +17,14 @@
 #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,
+char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
-                      const char *challenge,
+		      const char *jid, const char *password);
-                      const char *jid,
+char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
-                      const char *password);
+                      const char *first_bare, const char *jid,
-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,103 +19,56 @@
 #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_MAX 128
+#define HMAC_BLOCK_SIZE 64
 
 static const uint8_t ipad = 0x36;
 static const uint8_t opad = 0x5C;
 
-const struct hash_alg scram_sha1 = {
+static void crypto_HMAC_SHA1(const uint8_t *key, size_t key_len,
-    "SCRAM-SHA-1",
+                             const uint8_t *text, size_t len,
-    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};
-
-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_pad[HMAC_BLOCK_SIZE];
-    uint8_t key_ipad[HMAC_BLOCK_SIZE_MAX];
+    uint8_t key_ipad[HMAC_BLOCK_SIZE];
-    uint8_t key_opad[HMAC_BLOCK_SIZE_MAX];
+    uint8_t key_opad[HMAC_BLOCK_SIZE];
-    uint8_t sha_digest[SCRAM_DIGEST_SIZE];
+    uint8_t sha_digest[SHA1_DIGEST_SIZE];
-    size_t blocksize;
+    int i;
-    size_t i;
+    SHA1_CTX ctx;
-    union common_hash_ctx ctx;
 
-    assert(alg->digest_size <= HMAC_BLOCK_SIZE_MAX);
+    memset(key_pad, 0, sizeof(key_pad));
-    blocksize = alg->digest_size < 48 ? 64 : 128;
+    if (key_len <= HMAC_BLOCK_SIZE) {
-
-    memset(key_pad, 0, blocksize);
-    if (key_len <= blocksize) {
         memcpy(key_pad, key, key_len);
     } else {
         /* according to RFC2104 */
-        alg->hash(key, key_len, key_pad);
+        crypto_SHA1(key, key_len, key_pad);
     }
 
-    for (i = 0; i < blocksize; i++) {
+    for (i = 0; i < HMAC_BLOCK_SIZE; i++) {
         key_ipad[i] = key_pad[i] ^ ipad;
         key_opad[i] = key_pad[i] ^ opad;
     }
 
-    alg->init((void *)&ctx);
+    crypto_SHA1_Init(&ctx);
-    alg->update((void *)&ctx, key_ipad, blocksize);
+    crypto_SHA1_Update(&ctx, key_ipad, HMAC_BLOCK_SIZE);
-    alg->update((void *)&ctx, text, len);
+    crypto_SHA1_Update(&ctx, text, len);
-    alg->final((void *)&ctx, sha_digest);
+    crypto_SHA1_Final(&ctx, sha_digest);
 
-    alg->init((void *)&ctx);
+    crypto_SHA1_Init(&ctx);
-    alg->update((void *)&ctx, key_opad, blocksize);
+    crypto_SHA1_Update(&ctx, key_opad, HMAC_BLOCK_SIZE);
-    alg->update((void *)&ctx, sha_digest, alg->digest_size);
+    crypto_SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
-    alg->final((void *)&ctx, digest);
+    crypto_SHA1_Final(&ctx, digest);
 }
 
-static void SCRAM_Hi(const struct hash_alg *alg,
+static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
-                     const uint8_t *text,
+                          const uint8_t *salt, size_t salt_len, uint32_t i,
-                     size_t len,
-                     const uint8_t *salt,
-                     size_t salt_len,
-                     uint32_t i,
                           uint8_t *digest)
 {
-    size_t k;
+    int  k;
     uint32_t j;
     uint8_t tmp[128];
 
@@ -124,7 +77,7 @@ static void SCRAM_Hi(const struct hash_alg *alg,
     /* assume salt + INT(1) isn't longer than sizeof(tmp) */
     assert(salt_len <= sizeof(tmp) - sizeof(int1));
 
-    memset(digest, 0, alg->digest_size);
+    memset(digest, 0, SHA1_DIGEST_SIZE);
     if (i == 0) {
         return;
     }
@@ -133,53 +86,46 @@ static void SCRAM_Hi(const struct hash_alg *alg,
     memcpy(&tmp[salt_len], int1, sizeof(int1));
 
     /* 'text' for Hi is a 'key' for HMAC */
-    crypto_HMAC(alg, text, len, tmp, salt_len + sizeof(int1), digest);
+    crypto_HMAC_SHA1(text, len, tmp, salt_len + sizeof(int1), digest);
-    memcpy(tmp, digest, alg->digest_size);
+    memcpy(tmp, digest, SHA1_DIGEST_SIZE);
 
     for (j = 1; j < i; j++) {
-        crypto_HMAC(alg, text, len, tmp, alg->digest_size, tmp);
+        crypto_HMAC_SHA1(text, len, tmp, SHA1_DIGEST_SIZE, tmp);
-        for (k = 0; k < alg->digest_size; k++) {
+        for (k = 0; k < SHA1_DIGEST_SIZE; k++) {
             digest[k] ^= tmp[k];
         }
     }
 }
 
-void SCRAM_ClientKey(const struct hash_alg *alg,
+void SCRAM_SHA1_ClientKey(const uint8_t *password, size_t len,
-                     const uint8_t *password,
+                          const uint8_t *salt, size_t salt_len, uint32_t i,
-                     size_t len,
-                     const uint8_t *salt,
-                     size_t salt_len,
-                     uint32_t i,
                           uint8_t *key)
 {
-    uint8_t salted[SCRAM_DIGEST_SIZE];
+    uint8_t salted[SHA1_DIGEST_SIZE];
 
     /* XXX: Normalize(password) is omitted */
 
-    SCRAM_Hi(alg, password, len, salt, salt_len, i, salted);
+    SCRAM_SHA1_Hi(password, len, salt, salt_len, i, salted);
-    crypto_HMAC(alg, salted, alg->digest_size, (uint8_t *)"Client Key",
+    crypto_HMAC_SHA1(salted, SHA1_DIGEST_SIZE, (uint8_t *)"Client Key",
                      strlen("Client Key"), key);
 }
 
-void SCRAM_ClientSignature(const struct hash_alg *alg,
+void SCRAM_SHA1_ClientSignature(const uint8_t *ClientKey,
-                           const uint8_t *ClientKey,
+                                const uint8_t *AuthMessage, size_t len,
-                           const uint8_t *AuthMessage,
-                           size_t len,
                                 uint8_t *sign)
 {
-    uint8_t stored[SCRAM_DIGEST_SIZE];
+    uint8_t stored[SHA1_DIGEST_SIZE];
 
-    alg->hash(ClientKey, alg->digest_size, stored);
+    crypto_SHA1(ClientKey, SHA1_DIGEST_SIZE, stored);
-    crypto_HMAC(alg, stored, alg->digest_size, AuthMessage, len, sign);
+    crypto_HMAC_SHA1(stored, SHA1_DIGEST_SIZE, AuthMessage, len, sign);
 }
 
-void SCRAM_ClientProof(const struct hash_alg *alg,
+void SCRAM_SHA1_ClientProof(const uint8_t *ClientKey,
-                       const uint8_t *ClientKey,
                             const uint8_t *ClientSignature,
                             uint8_t *proof)
 {
-    size_t i;
+    int i;
-    for (i = 0; i < alg->digest_size; i++) {
+    for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
         proof[i] = ClientKey[i] ^ ClientSignature[i];
     }
 }

src/scram.h

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

src/server.c

@@ -0,0 +1,162 @@
+/* server.c
+ * strophe XMPP client library -- server object functions
+ *
+ * Copyright (C) 2016 Dmitry Podgorny <pasis.ua@gmail.com>
+ *
+ *  This software is provided AS-IS with no warranty, either express
+ *  or implied.
+ *
+ *  This program is dual licensed under the MIT and GPLv3 licenses.
+ */
+
+/** @file
+ *  Server management.
+ */
+
+/** @defgroup Server Server management
+ */
+
+#include <string.h>
+
+#include "common.h"
+#include "strophe.h"
+
+static xmpp_server_t *conn2srv(xmpp_conn_t *conn);
+static void _server_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_server_t *xmpp_server_new(xmpp_ctx_t * const ctx)
+{
+    xmpp_server_t *srv;
+    xmpp_serverlist_t *item;
+
+    srv = xmpp_alloc(ctx, sizeof(*srv));
+    item = xmpp_alloc(ctx, sizeof(*item));
+    if (srv == NULL || item == NULL) {
+        xmpp_error(ctx, "xmpp", "Failed to allocate memory.");
+        xmpp_free(ctx, srv);
+        xmpp_free(ctx, item);
+        srv = NULL;
+        item = NULL;
+    }
+
+    if (srv != NULL) {
+        memset(srv, 0, sizeof(*srv));
+        srv->state = XMPP_STATE_STOPPED;
+        srv->ctx = ctx;
+        srv->sock = -1;
+
+        item->server = srv;
+        item->next = ctx->serverlist;
+        ctx->serverlist = item;
+    }
+    return srv;
+}
+
+void xmpp_server_free(xmpp_server_t * const srv)
+{
+    xmpp_ctx_t *ctx = srv->ctx;
+    xmpp_serverlist_t *item, *prev = NULL;
+
+    item = ctx->serverlist;
+    while (item != NULL) {
+        if (item->server == srv) {
+            if (prev == NULL) ctx->serverlist = item->next;
+            if (prev != NULL) prev->next = item->next;
+            xmpp_free(ctx, item);
+        }
+        prev = item;
+        item = item->next;
+    }
+
+    xmpp_free(ctx, srv);
+}
+
+int xmpp_server_listen(xmpp_server_t * const srv, unsigned short port,
+                       xmpp_server_handler callback, void * const userdata)
+{
+    int rc = 0;
+
+    if (port == 0) port = XMPP_PORT_CLIENT;
+    srv->callback = callback;
+    srv->userdata = userdata;
+    srv->port = port;
+    srv->sock = sock_listen(port);
+    if (srv->sock >= 0) {
+        srv->state = XMPP_STATE_LISTENING;
+        xmpp_debug(srv->ctx, "xmpp", "Listening on port %u.", port);
+    } else
+        rc = XMPP_EINT;
+
+    return rc;
+}
+
+void xmpp_server_stop(xmpp_server_t * const srv)
+{
+    srv->state = XMPP_STATE_STOPPED;
+    sock_stop_listen(srv->sock);
+    xmpp_debug(srv->ctx, "xmpp", "Server stopped on %u.", srv->port);
+}
+
+void server_accept(xmpp_server_t * const srv)
+{
+    xmpp_conn_t *conn;
+    sock_t fd;
+
+    fd = sock_accept(srv->sock);
+    if (fd >= 0) {
+        xmpp_debug(srv->ctx, "xmpp", "New incoming connection on port %u.",
+                   srv->port);
+
+        conn = xmpp_conn_new(srv->ctx);
+        conn->type = XMPP_INCOMING;
+        conn->state = XMPP_STATE_CONNECTED;
+        conn->sock = fd;
+        conn->conn_handler = _server_conn_handler;
+        conn->userdata = (void *)srv;
+        conn->authenticated = 1; /* don't ignore handlers */
+        conn_prepare_reset(conn, server_handle_open);
+
+        srv->callback(srv, conn, XMPP_SERVER_ACCEPT, 0, srv->userdata);
+    }
+}
+
+void server_handle_open(xmpp_conn_t * const conn)
+{
+    xmpp_server_t *srv = conn2srv(conn);
+
+    /* XXX need to reset parser and re-open stream after authentication */
+
+    srv->callback(srv, conn, XMPP_SERVER_OPEN_STREAM, 0, srv->userdata);
+}
+
+static xmpp_server_t *conn2srv(xmpp_conn_t *conn)
+{
+    xmpp_server_t *srv;
+
+    /* XXX dirty hack */
+    if (conn->ctx->serverlist != NULL)
+        srv = conn->ctx->serverlist->server;
+    else
+        srv = NULL;
+
+    return srv;
+}
+
+static void _server_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_server_t *srv = (xmpp_server_t *)userdata;
+
+    if (status == XMPP_CONN_DISCONNECT) {
+        /* remove conn from the list */
+        /* XXX when client sends </stream> first, server should close stream too */
+        srv->callback(srv, conn, XMPP_SERVER_DISCONNECT, error, srv->userdata);
+    }
+}

src/sha.h

@@ -1,112 +0,0 @@
-/* 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

@@ -75,6 +75,9 @@ 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]);
 
@@ -83,27 +86,16 @@ 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)                                                                 \
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    (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))
-                                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)                                     \
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-    z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-    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 R1(v, w, x, y, z, i)                                    \
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-    z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-    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)
 {
@@ -126,13 +118,6 @@ 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])
 {
@@ -143,9 +128,13 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
     } CHAR64LONG16;
     CHAR64LONG16* block;
 
+#ifdef SHA1HANDSOFF
     static uint8_t workspace[64];
     block = (CHAR64LONG16*)workspace;
     memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16*)buffer;
+#endif
 
     /* Copy context->state[] to working vars */
     a = state[0];
@@ -155,7 +144,6 @@ 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);
@@ -176,7 +164,6 @@ 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;
@@ -186,13 +173,10 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
     state[4] += e;
 
     /* Wipe variables */
-    SHA1_cleanse(&a, sizeof(a));
+    a = b = c = d = e = 0;
-    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)
 {
@@ -205,17 +189,16 @@ 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,
+void crypto_SHA1_Update(SHA1_CTX* context, const uint8_t* data,
-                        const uint8_t *data,
                         const size_t len)
 {
     size_t i, j;
 
     j = (context->count[0] >> 3) & 63;
-    if ((context->count[0] += (uint32_t)len << 3) < ((uint32_t)len << 3))
+    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
-        context->count[1]++;
+    context->count[1] += (len >> 29);
-    context->count[1] += (uint32_t)(len >> 29);
     if ((j + len) > 63) {
         memcpy(&context->buffer[j], data, (i = 64-j));
         SHA1_Transform(context->state, context->buffer);
@@ -223,11 +206,12 @@ void crypto_SHA1_Update(SHA1_CTX *context,
             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)
 {
@@ -235,30 +219,32 @@ void crypto_SHA1_Final(SHA1_CTX *context, uint8_t *digest)
     uint8_t  finalcount[8];
 
     for (i = 0; i < 8; i++) {
-        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >>
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
-                                         ((3 - (i & 3)) * 8)) &
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-                                        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);
     }
-    /* Should cause a SHA1_Transform() */
+    crypto_SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
-    crypto_SHA1_Update(context, finalcount, 8);
     for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
-        digest[i] =
+        digest[i] = (uint8_t)
-            (uint8_t)((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
     }
     
     /* Wipe variables */
-    SHA1_cleanse(context->buffer, 64);
+    i = 0;
-    SHA1_cleanse(context->state, 20);
+    memset(context->buffer, 0, 64);
-    SHA1_cleanse(context->count, 8);
+    memset(context->state, 0, 20);
-    SHA1_cleanse(finalcount, 8); /* SWR */
+    memset(context->count, 0, 8);
+    memset(finalcount, 0, 8);	/* SWR */
 
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite its own static vars */
     SHA1_Transform(context->state, context->buffer);
+#endif
 }
 
+
 void crypto_SHA1(const uint8_t* data, size_t len, uint8_t* digest)
 {
     SHA1_CTX ctx;

src/sha1.h

@@ -24,8 +24,7 @@ typedef struct {
 #define SHA1_DIGEST_SIZE 20
 
 void crypto_SHA1_Init(SHA1_CTX* context);
-void crypto_SHA1_Update(SHA1_CTX *context,
+void crypto_SHA1_Update(SHA1_CTX* context, const uint8_t* data,
-                        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);

src/sha256.c

@@ -1,210 +0,0 @@
-/*
- * 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

@@ -1,34 +0,0 @@
-/* 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

@@ -1,201 +0,0 @@
-/*
- * 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

@@ -1,34 +0,0 @@
-/* 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/snprintf.c

@@ -85,29 +85,14 @@
 #define LDOUBLE double
 #endif
 
-static int dopr(char *buffer, size_t maxlen, const char *format, va_list args);
+static int dopr (char *buffer, size_t maxlen, const char *format, 
-static int fmtstr(char *buffer,
+                 va_list args);
-                  size_t *currlen,
+static int fmtstr (char *buffer, size_t *currlen, size_t maxlen,
-                  size_t maxlen,
+		   char *value, int flags, int min, int max);
-                  char *value,
+static int fmtint (char *buffer, size_t *currlen, size_t maxlen,
-                  int flags,
+		   long value, int base, int min, int max, int flags);
-                  int min,
+static int fmtfp (char *buffer, size_t *currlen, size_t maxlen,
-                  int max);
+		  LDOUBLE fvalue, int min, int max, int flags);
-static int fmtint(char *buffer,
-                  size_t *currlen,
-                  size_t maxlen,
-                  long value,
-                  int base,
-                  int min,
-                  int max,
-                  int flags);
-static int fmtfp(char *buffer,
-                 size_t *currlen,
-                 size_t maxlen,
-                 LDOUBLE fvalue,
-                 int min,
-                 int max,
-                 int flags);
 static int dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c );
 
 /*
@@ -162,11 +147,13 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
   ch = *format++;
   total = 0;
 
-    while (state != DP_S_DONE) {
+  while (state != DP_S_DONE)
+  {
     if (ch == '\0')
       state = DP_S_DONE;
 
-        switch (state) {
+    switch(state) 
+    {
     case DP_S_DEFAULT:
       if (ch == '%') 
 	state = DP_S_FLAGS;
@@ -175,7 +162,8 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
       ch = *format++;
       break;
     case DP_S_FLAGS:
-            switch (ch) {
+      switch (ch) 
+      {
       case '-':
 	flags |= DP_F_MINUS;
         ch = *format++;
@@ -202,39 +190,50 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
       }
       break;
     case DP_S_MIN:
-            if (isdigit(ch)) {
+      if (isdigit(ch)) 
+      {
 	min = 10*min + char_to_int (ch);
 	ch = *format++;
-            } else if (ch == '*') {
+      } 
+      else if (ch == '*') 
+      {
 	min = va_arg (args, int);
 	ch = *format++;
 	state = DP_S_DOT;
-            } else
+      } 
+      else 
 	state = DP_S_DOT;
       break;
     case DP_S_DOT:
-            if (ch == '.') {
+      if (ch == '.') 
+      {
 	state = DP_S_MAX;
 	ch = *format++;
-            } else
+      } 
+      else 
 	state = DP_S_MOD;
       break;
     case DP_S_MAX:
-            if (isdigit(ch)) {
+      if (isdigit(ch)) 
+      {
 	if (max < 0)
 	  max = 0;
 	max = 10*max + char_to_int (ch);
 	ch = *format++;
-            } else if (ch == '*') {
+      } 
+      else if (ch == '*') 
+      {
 	max = va_arg (args, int);
 	ch = *format++;
 	state = DP_S_MOD;
-            } else
+      } 
+      else 
 	state = DP_S_MOD;
       break;
     case DP_S_MOD:
       /* Currently, we don't support Long Long, bummer */
-            switch (ch) {
+      switch (ch) 
+      {
       case 'h':
 	cflags = DP_C_SHORT;
 	ch = *format++;
@@ -253,7 +252,8 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
       state = DP_S_CONV;
       break;
     case DP_S_CONV:
-            switch (ch) {
+      switch (ch) 
+      {
       case 'd':
       case 'i':
 	if (cflags == DP_C_SHORT) 
@@ -262,8 +262,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	  value = va_arg (args, long int);
 	else
 	  value = va_arg (args, int);
-                total += fmtint(buffer, &currlen, maxlen, value, 10, min, max,
+	total += fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
-                                flags);
 	break;
       case 'o':
 	flags |= DP_F_UNSIGNED;
@@ -273,8 +272,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	  value = va_arg (args, unsigned long int);
 	else
 	  value = va_arg (args, unsigned int);
-                total +=
+	total += fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
-                    fmtint(buffer, &currlen, maxlen, value, 8, min, max, flags);
 	break;
       case 'u':
 	flags |= DP_F_UNSIGNED;
@@ -284,8 +282,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	  value = va_arg (args, unsigned long int);
 	else
 	  value = va_arg (args, unsigned int);
-                total += fmtint(buffer, &currlen, maxlen, value, 10, min, max,
+	total += fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
-                                flags);
 	break;
       case 'X':
 	flags |= DP_F_UP;
@@ -298,8 +295,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	  value = va_arg (args, unsigned long int);
 	else
 	  value = va_arg (args, unsigned int);
-                total += fmtint(buffer, &currlen, maxlen, value, 16, min, max,
+	total += fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
-                                flags);
 	break;
       case 'f':
 	if (cflags == DP_C_LDOUBLE)
@@ -307,8 +303,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	else
 	  fvalue = va_arg (args, double);
 	/* um, floating point? */
-                total +=
+	total += fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
-                    fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags);
 	break;
       case 'E':
 	flags |= DP_F_UP;
@@ -329,29 +324,32 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
 	  fvalue = va_arg (args, double);
 	break;
       case 'c':
-                total +=
+	total += dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
-                    dopr_outch(buffer, &currlen, maxlen, va_arg(args, int));
 	break;
       case 's':
 	strvalue = va_arg (args, char *);
-                total +=
+	total += fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
-                    fmtstr(buffer, &currlen, maxlen, strvalue, flags, min, max);
 	break;
       case 'p':
 	strvalue = va_arg (args, void *);
-                total += fmtint(buffer, &currlen, maxlen, (long)strvalue, 16,
+	total += fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min,
-                                min, max, flags);
+                         max, flags);
 	break;
       case 'n':
-                if (cflags == DP_C_SHORT) {
+	if (cflags == DP_C_SHORT) 
+	{
 	  short int *num;
 	  num = va_arg (args, short int *);
 	  *num = currlen;
-                } else if (cflags == DP_C_LONG) {
+        } 
+	else if (cflags == DP_C_LONG) 
+	{
 	  long int *num;
 	  num = va_arg (args, long int *);
 	  *num = currlen;
-                } else {
+        } 
+	else 
+	{
 	  int *num;
 	  num = va_arg (args, int *);
 	  *num = currlen;
@@ -380,7 +378,8 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
       break; /* some picky compilers need this */
     }
   }
-    if (buffer != NULL && maxlen > 0) {
+  if (buffer != NULL && maxlen > 0)
+  {
     if (currlen < maxlen - 1) 
       buffer[currlen] = '\0';
     else 
@@ -389,24 +388,19 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args)
   return total;
 }
 
-static int fmtstr(char *buffer,
+static int fmtstr (char *buffer, size_t *currlen, size_t maxlen,
-                  size_t *currlen,
+                   char *value, int flags, int min, int max)
-                  size_t maxlen,
-                  char *value,
-                  int flags,
-                  int min,
-                  int max)
 {
   int padlen, strln;     /* amount to pad */
   int cnt = 0;
   int total = 0;
   
-    if (value == 0) {
+  if (value == 0)
+  {
     value = "<NULL>";
   }
 
-    for (strln = 0; value[strln]; ++strln)
+  for (strln = 0; value[strln]; ++strln); /* strlen */
-        ; /* strlen */
   if (max >= 0 && max < strln)
     strln = max;
   padlen = min - strln;
@@ -415,15 +409,18 @@ static int fmtstr(char *buffer,
   if (flags & DP_F_MINUS) 
     padlen = -padlen; /* Left Justify */
 
-    while (padlen > 0) {
+  while (padlen > 0)
+  {
     total += dopr_outch (buffer, currlen, maxlen, ' ');
     --padlen;
   }
-    while (*value && ((max < 0) || (cnt < max))) {
+  while (*value && ((max < 0) || (cnt < max)))
+  {
     total += dopr_outch (buffer, currlen, maxlen, *value++);
     ++cnt;
   }
-    while (padlen < 0) {
+  while (padlen < 0)
+  {
     total += dopr_outch (buffer, currlen, maxlen, ' ');
     ++padlen;
   }
@@ -432,14 +429,8 @@ static int fmtstr(char *buffer,
 
 /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
 
-static int fmtint(char *buffer,
+static int fmtint (char *buffer, size_t *currlen, size_t maxlen,
-                  size_t *currlen,
+		   long value, int base, int min, int max, int flags)
-                  size_t maxlen,
-                  long value,
-                  int base,
-                  int min,
-                  int max,
-                  int flags)
 {
   int signvalue = 0;
   unsigned long uvalue;
@@ -455,35 +446,37 @@ static int fmtint(char *buffer,
 
   uvalue = value;
 
-    if (!(flags & DP_F_UNSIGNED)) {
+  if(!(flags & DP_F_UNSIGNED))
+  {
     if( value < 0 ) {
       signvalue = '-';
       uvalue = -value;
-        } else if (flags & DP_F_PLUS) /* Do a sign (+/i) */
+    }
+    else
+      if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
 	signvalue = '+';
-        else if (flags & DP_F_SPACE)
+    else
+      if (flags & DP_F_SPACE)
 	signvalue = ' ';
   }
   
-    if (flags & DP_F_UP)
+  if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
-        caps = 1; /* Should characters be upper case? */
 
   do {
-        convert[place++] = (caps ? "0123456789ABCDEF"
+    convert[place++] =
-                                 : "0123456789abcdef")[uvalue % (unsigned)base];
+      (caps? "0123456789ABCDEF":"0123456789abcdef")
+      [uvalue % (unsigned)base  ];
     uvalue = (uvalue / (unsigned)base );
   } while(uvalue && (place < 20));
-    if (place == 20)
+  if (place == 20) place--;
-        place--;
   convert[place] = 0;
 
   zpadlen = max - place;
   spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
-    if (zpadlen < 0)
+  if (zpadlen < 0) zpadlen = 0;
-        zpadlen = 0;
+  if (spadlen < 0) spadlen = 0;
-    if (spadlen < 0)
+  if (flags & DP_F_ZERO)
-        spadlen = 0;
+  {
-    if (flags & DP_F_ZERO) {
     zpadlen = MAX(zpadlen, spadlen);
     spadlen = 0;
   }
@@ -496,7 +489,8 @@ static int fmtint(char *buffer,
 #endif
 
   /* Spaces */
-    while (spadlen > 0) {
+  while (spadlen > 0) 
+  {
     total += dopr_outch (buffer, currlen, maxlen, ' ');
     --spadlen;
   }
@@ -506,8 +500,10 @@ static int fmtint(char *buffer,
     total += dopr_outch (buffer, currlen, maxlen, signvalue);
 
   /* Zeros */
-    if (zpadlen > 0) {
+  if (zpadlen > 0) 
-        while (zpadlen > 0) {
+  {
+    while (zpadlen > 0)
+    {
       total += dopr_outch (buffer, currlen, maxlen, '0');
       --zpadlen;
     }
@@ -540,7 +536,8 @@ static LDOUBLE _snp_pow10(int exp)
 {
   LDOUBLE result = 1;
 
-    while (exp) {
+  while (exp)
+  {
     result *= 10;
     exp--;
   }
@@ -560,13 +557,8 @@ static long _snp_round(LDOUBLE value)
   return intpart;
 }
 
-static int fmtfp(char *buffer,
+static int fmtfp (char *buffer, size_t *currlen, size_t maxlen,
-                 size_t *currlen,
+		  LDOUBLE fvalue, int min, int max, int flags)
-                 size_t maxlen,
-                 LDOUBLE fvalue,
-                 int min,
-                 int max,
-                 int flags)
 {
   int signvalue = 0;
   LDOUBLE ufvalue;
@@ -592,9 +584,11 @@ static int fmtfp(char *buffer,
 
   if (fvalue < 0)
     signvalue = '-';
-    else if (flags & DP_F_PLUS) /* Do a sign (+/i) */
+  else
+    if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
       signvalue = '+';
-    else if (flags & DP_F_SPACE)
+    else
+      if (flags & DP_F_SPACE)
 	signvalue = ' ';
 
 #if 0
@@ -615,7 +609,8 @@ static int fmtfp(char *buffer,
    */
   fracpart = _snp_round ((_snp_pow10 (max)) * (ufvalue - intpart));
 
-    if (fracpart >= _snp_pow10(max)) {
+  if (fracpart >= _snp_pow10 (max))
+  {
     intpart++;
     fracpart -= _snp_pow10 (max);
   }
@@ -630,8 +625,7 @@ static int fmtfp(char *buffer,
       (caps? "0123456789ABCDEF":"0123456789abcdef")[intpart % 10];
     intpart = (intpart / 10);
   } while(intpart && (iplace < 20));
-    if (iplace == 20)
+  if (iplace == 20) iplace--;
-        iplace--;
   iconvert[iplace] = 0;
 
   /* Convert fractional part */
@@ -640,8 +634,7 @@ static int fmtfp(char *buffer,
       (caps? "0123456789ABCDEF":"0123456789abcdef")[fracpart % 10];
     fracpart = (fracpart / 10);
   } while(fracpart && (fplace < 20));
-    if (fplace == 20)
+  if (fplace == 20) fplace--;
-        fplace--;
   fconvert[fplace] = 0;
 
   /* -1 for decimal point, another -1 if we are printing a sign */
@@ -654,18 +647,22 @@ static int fmtfp(char *buffer,
   if (flags & DP_F_MINUS) 
     padlen = -padlen; /* Left Justifty */
 
-    if ((flags & DP_F_ZERO) && (padlen > 0)) {
+  if ((flags & DP_F_ZERO) && (padlen > 0)) 
-        if (signvalue) {
+  {
+    if (signvalue) 
+    {
       total += dopr_outch (buffer, currlen, maxlen, signvalue);
       --padlen;
       signvalue = 0;
     }
-        while (padlen > 0) {
+    while (padlen > 0)
+    {
       total += dopr_outch (buffer, currlen, maxlen, '0');
       --padlen;
     }
   }
-    while (padlen > 0) {
+  while (padlen > 0)
+  {
     total += dopr_outch (buffer, currlen, maxlen, ' ');
     --padlen;
   }
@@ -679,19 +676,22 @@ static int fmtfp(char *buffer,
    * Decimal point.  This should probably use locale to find the correct
    * char to print out.
    */
-    if (max > 0) {
+  if (max > 0)
+  {
     total += dopr_outch (buffer, currlen, maxlen, '.');
 
     while (fplace > 0) 
       total += dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
   }
 
-    while (zpadlen > 0) {
+  while (zpadlen > 0)
+  {
     total += dopr_outch (buffer, currlen, maxlen, '0');
     --zpadlen;
   }
 
-    while (padlen < 0) {
+  while (padlen < 0) 
+  {
     total += dopr_outch (buffer, currlen, maxlen, ' ');
     ++padlen;
   }

src/sock.c

@@ -21,8 +21,8 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <iphlpapi.h>
+#include <Iphlpapi.h>
-#include <mstcpip.h> /* tcp_keepalive */
+#include <Mstcpip.h>    /* tcp_keepalive */
 #else
 #include <errno.h>
 #include <unistd.h>
@@ -109,6 +109,43 @@ sock_t sock_connect(const char *const host, const unsigned short port)
     return sock;
 }
 
+sock_t sock_listen(const unsigned short port)
+{
+    struct sockaddr_in addr;
+    sock_t sock;
+    int rc;
+
+    sock = socket(AF_INET, SOCK_STREAM, 0);
+    if (sock < 0) return -1;
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(port);
+    addr.sin_addr.s_addr = INADDR_ANY;
+    rc = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
+    if (rc == 0) {
+        rc = listen(sock, 100);
+        sock_set_nonblocking(sock);
+    }
+    if (rc != 0) close(sock);
+
+    return rc == 0 ? sock : -1;
+}
+
+int sock_stop_listen(const sock_t sock)
+{
+    return sock_close(sock);
+}
+
+sock_t sock_accept(const sock_t sock)
+{
+    sock_t fd;
+
+    fd = accept(sock, NULL, NULL);
+
+    return fd;
+}
+
 int sock_set_keepalive(const sock_t sock, int timeout, int interval)
 {
     int ret;
@@ -123,8 +160,7 @@ 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,
+    ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &ka, sizeof(ka), NULL, 0, &dw, NULL, NULL);
-                   NULL, NULL);
 #else
     ret = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval));
     if (ret < 0)
@@ -132,19 +168,15 @@ 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,
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &timeout, sizeof(timeout));
-                         sizeof(timeout));
 #elif defined(TCP_KEEPALIVE)
-        /* QNX receives `struct timeval' as argument, but it seems OSX does int
+        /* QNX receives `struct timeval' as argument, but it seems OSX does int */
-         */
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPALIVE, &timeout, sizeof(timeout));
-        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,
+        ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(interval));
-                         sizeof(interval));
         if (ret < 0)
             return ret;
 #endif /* TCP_KEEPINTVL */
@@ -163,33 +195,38 @@ int sock_close(const sock_t sock)
 #endif
 }
 
-static int _sock_set_blocking_mode(sock_t sock, int blocking)
+int sock_set_blocking(const sock_t sock)
 {
 #ifdef _WIN32
-    u_long nonblock = blocking ? 0 : 1;
+    u_long block = 0;
+    return ioctlsocket(sock, FIONBIO, &block);
+#else
+    int rc;
+
+    rc = fcntl(sock, F_GETFL, NULL);
+    if (rc >= 0) {
+        rc = fcntl(sock, F_SETFL, rc & (~O_NONBLOCK));
+    }
+    return rc;
+#endif
+}
+
+int sock_set_nonblocking(const sock_t sock)
+{
+#ifdef _WIN32
+    u_long nonblock = 1;
     return ioctlsocket(sock, FIONBIO, &nonblock);
 #else
     int rc;
 
     rc = fcntl(sock, F_GETFL, NULL);
     if (rc >= 0) {
-        rc = blocking ? rc & (~O_NONBLOCK) : rc | O_NONBLOCK;
+        rc = fcntl(sock, F_SETFL, rc | O_NONBLOCK);
-        rc = fcntl(sock, F_SETFL, rc);
     }
     return rc;
 #endif
 }
 
-int sock_set_blocking(const sock_t sock)
-{
-    return _sock_set_blocking_mode(sock, 1);
-}
-
-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)
 {
     return recv(sock, buff, len, 0);
@@ -212,29 +249,27 @@ int sock_is_recoverable(const int error)
 
 int sock_connect_error(const sock_t sock)
 {
-    struct sockaddr_storage ss;
+    struct sockaddr sa;
-    struct sockaddr *sa = (struct sockaddr *)&ss;
     socklen_t len;
     char temp;
 
-    memset(&ss, 0, sizeof(ss));
+    memset(&sa, 0, sizeof(sa));
-    len = sizeof(ss);
+    sa.sa_family = AF_UNSPEC;
-    sa->sa_family = AF_UNSPEC;
+    len = sizeof(sa);
 
     /* 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)
+    if (sock_error() != WSAENOTCONN) return sock_error();
-        return sock_error();
 #else
-    if (sock_error() != ENOTCONN)
+    if (sock_error() != ENOTCONN) return sock_error();
-        return sock_error();
 #endif
 
     /* load the correct error into errno through error slippage */

src/sock.h

@@ -32,6 +32,9 @@ int sock_error(void);
 
 sock_t sock_connect(const char * const host, const unsigned short port);
 int sock_close(const sock_t sock);
+sock_t sock_listen(const unsigned short port);
+int sock_stop_listen(const sock_t sock);
+sock_t sock_accept(const sock_t sock);
 
 int sock_set_blocking(const sock_t sock);
 int sock_set_nonblocking(const sock_t sock);

src/stanza.c

@@ -22,7 +22,6 @@
 #include "strophe.h"
 #include "common.h"
 #include "hash.h"
-#include "parser.h"
 
 /** Create a stanza object.
  *  This function allocates and initializes a blank stanza object.
@@ -83,13 +82,11 @@ static int _stanza_copy_attributes(xmpp_stanza_t *dst,
     int rc = XMPP_EOK;
 
     iter = hash_iter_new(src->attributes);
-    if (!iter)
+    if (!iter) rc = XMPP_EMEM;
-        rc = XMPP_EMEM;
 
     while (rc == XMPP_EOK && (key = hash_iter_next(iter))) {
         val = hash_get(src->attributes, key);
-        if (!val)
+        if (!val) rc = XMPP_EINT;
-            rc = XMPP_EINT;
         if (rc == XMPP_EOK)
             rc = xmpp_stanza_set_attribute(dst, key, val);
     }
@@ -119,15 +116,13 @@ xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza)
     xmpp_stanza_t *copy, *child, *copychild, *tail;
 
     copy = xmpp_stanza_new(stanza->ctx);
-    if (!copy)
+    if (!copy) goto copy_error;
-        goto copy_error;
 
     copy->type = stanza->type;
 
     if (stanza->data) {
 	copy->data = xmpp_strdup(stanza->ctx, stanza->data);
-        if (!copy->data)
+	if (!copy->data) goto copy_error;
-            goto copy_error;
     }
 
     if (stanza->attributes) {
@@ -138,8 +133,7 @@ xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza)
     tail = copy->children;
     for (child = stanza->children; child; child = child->next) {
 	copychild = xmpp_stanza_copy(child);
-        if (!copychild)
+	if (!copychild) goto copy_error;
-            goto copy_error;
 	copychild->parent = copy;
 
 	if (tail) {
@@ -154,8 +148,7 @@ xmpp_stanza_t *xmpp_stanza_copy(const xmpp_stanza_t *const stanza)
 
 copy_error:
     /* release all the hitherto allocated memory */
-    if (copy)
+    if (copy) xmpp_stanza_release(copy);
-        xmpp_stanza_release(copy);
     return NULL;
 }
 
@@ -186,10 +179,8 @@ int xmpp_stanza_release(xmpp_stanza_t *const stanza)
 	    xmpp_stanza_release(tchild);
 	}
 
-        if (stanza->attributes)
+	if (stanza->attributes) hash_release(stanza->attributes);
-            hash_release(stanza->attributes);
+	if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
-        if (stanza->data)
-            xmpp_free(stanza->ctx, stanza->data);
 	xmpp_free(stanza->ctx, stanza);
 	released = 1;
     }
@@ -197,19 +188,6 @@ int xmpp_stanza_release(xmpp_stanza_t *const stanza)
     return released;
 }
 
-/** Get the strophe context that the stanza is associated with.
- *
- *  @param stanza a Strophe stanza object
- *
- *  @return a Strophe context
- *
- *  @ingroup Stanza
- */
-xmpp_ctx_t *xmpp_stanza_get_context(const xmpp_stanza_t *const stanza)
-{
-    return stanza->ctx;
-}
-
 /** Determine if a stanza is a text node.
  *  
  *  @param stanza a Strophe stanza object
@@ -295,11 +273,9 @@ static char *_escape_xml(xmpp_ctx_t *const ctx, char *text)
 }
 
 /* small helper function */
-static void _render_update(int *written,
+static void _render_update(int *written, const int length,
-                           const int length,
 			   const int lastwrite,
-                           size_t *left,
+			   size_t *left, char **ptr)
-                           char **ptr)
 {
     *written += lastwrite;
 
@@ -318,8 +294,7 @@ static void _render_update(int *written,
  * and return values > buflen indicate buffer was not large enough
  */
 static int _render_stanza_recursive(xmpp_stanza_t *stanza,
-                                    char *const buf,
+			     char * const buf, size_t const buflen)
-                                    size_t const buflen)
 {
     char *ptr = buf;
     size_t left = buflen;
@@ -331,29 +306,23 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 
     written = 0;
 
-    if (stanza->type == XMPP_STANZA_UNKNOWN)
+    if (stanza->type == XMPP_STANZA_UNKNOWN) return XMPP_EINVOP;
-        return XMPP_EINVOP;
 
     if (stanza->type == XMPP_STANZA_TEXT) {
-        if (!stanza->data)
+	if (!stanza->data) return XMPP_EINVOP;
-            return XMPP_EINVOP;
 
 	tmp = _escape_xml(stanza->ctx, stanza->data);
-        if (tmp == NULL)
+	if (tmp == NULL) return XMPP_EMEM;
-            return XMPP_EMEM;
 	ret = xmpp_snprintf(ptr, left, "%s", tmp);
 	xmpp_free(stanza->ctx, tmp);
-        if (ret < 0)
+	if (ret < 0) return XMPP_EMEM;
-            return XMPP_EMEM;
 	_render_update(&written, buflen, ret, &left, &ptr);
     } else { /* stanza->type == XMPP_STANZA_TAG */
-        if (!stanza->data)
+	if (!stanza->data) return XMPP_EINVOP;
-            return XMPP_EINVOP;
 
 	/* write beginning of tag and attributes */
 	ret = xmpp_snprintf(ptr, left, "<%s", stanza->data);
-        if (ret < 0)
+	if (ret < 0) return XMPP_EMEM;
-            return XMPP_EMEM;
 	_render_update(&written, buflen, ret, &left, &ptr);
 
 	if (stanza->attributes && hash_num_keys(stanza->attributes) > 0) {
@@ -361,10 +330,10 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 	    while ((key = hash_iter_next(iter))) {
 		if (!strcmp(key, "xmlns")) {
 		    /* don't output namespace if parent stanza is the same */
-                    if (stanza->parent && stanza->parent->attributes &&
+		    if (stanza->parent &&
+			stanza->parent->attributes &&
 			hash_get(stanza->parent->attributes, key) &&
-                        !strcmp(
+			!strcmp((char*)hash_get(stanza->attributes, key),
-                            (char *)hash_get(stanza->attributes, key),
 			    (char*)hash_get(stanza->parent->attributes, key)))
 			continue;
 		    /* or if this is the stream namespace */
@@ -375,16 +344,10 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 		}
 		tmp = _escape_xml(stanza->ctx,
 		    (char *)hash_get(stanza->attributes, key));
-                if (tmp == NULL) {
+		if (tmp == NULL) return XMPP_EMEM;
-                    hash_iter_release(iter);
-                    return XMPP_EMEM;
-                }
 		ret = xmpp_snprintf(ptr, left, " %s=\"%s\"", key, tmp);
 		xmpp_free(stanza->ctx, tmp);
-                if (ret < 0) {
+		if (ret < 0) return XMPP_EMEM;
-                    hash_iter_release(iter);
-                    return XMPP_EMEM;
-                }
 		_render_update(&written, buflen, ret, &left, &ptr);
 	    }
 	    hash_iter_release(iter);
@@ -393,24 +356,21 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 	if (!stanza->children) {
 	    /* write end if singleton tag */
 	    ret = xmpp_snprintf(ptr, left, "/>");
-            if (ret < 0)
+	    if (ret < 0) return XMPP_EMEM;
-                return XMPP_EMEM;
 	    _render_update(&written, buflen, ret, &left, &ptr);
 	} else {
 	    /* this stanza has child stanzas */
 
 	    /* write end of start tag */
 	    ret = xmpp_snprintf(ptr, left, ">");
-            if (ret < 0)
+	    if (ret < 0) return XMPP_EMEM;
-                return XMPP_EMEM;
 	    _render_update(&written, buflen, ret, &left, &ptr);
 	    
 	    /* iterate and recurse over child stanzas */
 	    child = stanza->children;
 	    while (child) {
 		ret = _render_stanza_recursive(child, ptr, left);
-                if (ret < 0)
+		if (ret < 0) return ret;
-                    return ret;
 
 		_render_update(&written, buflen, ret, &left, &ptr);
 
@@ -419,8 +379,7 @@ static int _render_stanza_recursive(xmpp_stanza_t *stanza,
 
 	    /* write end tag */
 	    ret = xmpp_snprintf(ptr, left, "</%s>", stanza->data);
-            if (ret < 0)
+	    if (ret < 0) return XMPP_EMEM;
-                return XMPP_EMEM;
 	    
 	    _render_update(&written, buflen, ret, &left, &ptr);
 	}
@@ -462,12 +421,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
     }
 
     ret = _render_stanza_recursive(stanza, buffer, length);
-    if (ret < 0) {
+    if (ret < 0) return ret;
-        xmpp_free(stanza->ctx, buffer);
-        *buf = NULL;
-        *buflen = 0;
-        return ret;
-    }
 
     if ((size_t)ret > length - 1) {
 	tmp = xmpp_realloc(stanza->ctx, buffer, ret + 1);
@@ -481,12 +435,7 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
 	buffer = tmp;
 
 	ret = _render_stanza_recursive(stanza, buffer, length);
-        if ((size_t)ret > length - 1) {
+	if ((size_t)ret > length - 1) return XMPP_EMEM;
-            xmpp_free(stanza->ctx, buffer);
-            *buf = NULL;
-            *buflen = 0;
-            return XMPP_EMEM;
-        }
     }
     
     buffer[length - 1] = 0;
@@ -507,13 +456,12 @@ int xmpp_stanza_to_text(xmpp_stanza_t *stanza,
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name)
+int xmpp_stanza_set_name(xmpp_stanza_t *stanza, 
+			 const char * const name)
 {
-    if (stanza->type == XMPP_STANZA_TEXT)
+    if (stanza->type == XMPP_STANZA_TEXT) return XMPP_EINVOP;
-        return XMPP_EINVOP;
 
-    if (stanza->data)
+    if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
-        xmpp_free(stanza->ctx, stanza->data);
 
     stanza->type = XMPP_STANZA_TAG;
     stanza->data = xmpp_strdup(stanza->ctx, name);
@@ -533,8 +481,7 @@ int xmpp_stanza_set_name(xmpp_stanza_t *stanza, const char *const name)
  */
 const char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza)
 {
-    if (stanza->type == XMPP_STANZA_TEXT)
+    if (stanza->type == XMPP_STANZA_TEXT) return NULL;
-        return NULL;
     return stanza->data;
 }
 
@@ -570,8 +517,7 @@ int xmpp_stanza_get_attribute_count(xmpp_stanza_t *const stanza)
  *  @ingroup Stanza
  */
 int xmpp_stanza_get_attributes(xmpp_stanza_t * const stanza,
-                               const char **attr,
+			       const char **attr, int attrlen)
-                               int attrlen)
 {
     hash_iterator_t *iter;
     const char *key;
@@ -618,17 +564,16 @@ int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
     char *val;
     int rc;
 
-    if (stanza->type != XMPP_STANZA_TAG)
+    if (stanza->type != XMPP_STANZA_TAG) return XMPP_EINVOP;
-        return XMPP_EINVOP;
 
     if (!stanza->attributes) {
 	stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free);
-        if (!stanza->attributes)
+	if (!stanza->attributes) return XMPP_EMEM;
-            return XMPP_EMEM;
     }
 
     val = xmpp_strdup(stanza->ctx, value);
     if (!val) {
+        hash_release(stanza->attributes);
         return XMPP_EMEM;
     }
 
@@ -652,52 +597,12 @@ int xmpp_stanza_set_attribute(xmpp_stanza_t *const stanza,
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_ns(xmpp_stanza_t *const stanza, const char *const ns)
+int xmpp_stanza_set_ns(xmpp_stanza_t * const stanza,
+		       const char * const ns)
 {
     return xmpp_stanza_set_attribute(stanza, "xmlns", ns);
 }
 
-/** Add a child stanza to a stanza object.
- *  If do_clone is TRUE, user keeps reference to the child stanza and must call
- *  xmpp_stanza_release() to release the reference. If do_clone is FALSE, user
- *  transfers ownership and must not neither call xmpp_stanza_release() for
- *  the child stanza nor use it.
- *
- *  @param stanza a Strophe stanza object
- *  @param child the child stanza object
- *  @param do_clone TRUE to increase ref count of child (default for
- *                  xmpp_stanza_add_child())
- *
- *  @return XMPP_EOK (0) on success or a number less than 0 on failure
- *
- *  @ingroup Stanza
- */
-int xmpp_stanza_add_child_ex(xmpp_stanza_t *stanza,
-                             xmpp_stanza_t *child,
-                             int do_clone)
-{
-    xmpp_stanza_t *s;
-
-    if (do_clone) {
-        /* get a reference to the child */
-        xmpp_stanza_clone(child);
-    }
-
-    child->parent = stanza;
-
-    if (!stanza->children)
-        stanza->children = child;
-    else {
-        s = stanza->children;
-        while (s->next)
-            s = s->next;
-        s->next = child;
-        child->prev = s;
-    }
-
-    return XMPP_EOK;
-}
-
 /** Add a child stanza to a stanza object.
  *  This function clones the child and appends it to the stanza object's
  *  children.
@@ -711,7 +616,23 @@ int xmpp_stanza_add_child_ex(xmpp_stanza_t *stanza,
  */
 int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
 {
-    return xmpp_stanza_add_child_ex(stanza, child, 1);
+    xmpp_stanza_t *s;
+
+    /* get a reference to the child */
+    xmpp_stanza_clone(child);
+
+    child->parent = stanza;
+
+    if (!stanza->children)
+	stanza->children = child;
+    else {
+	s = stanza->children;
+	while (s->next) s = s->next;
+	s->next = child;
+	child->prev = s;
+    }
+
+    return XMPP_EOK;
 }
 
 /** Set the text data for a text stanza.
@@ -727,15 +648,14 @@ int xmpp_stanza_add_child(xmpp_stanza_t *stanza, xmpp_stanza_t *child)
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text)
+int xmpp_stanza_set_text(xmpp_stanza_t *stanza,
+			 const char * const text)
 {
-    if (stanza->type == XMPP_STANZA_TAG)
+    if (stanza->type == XMPP_STANZA_TAG) return XMPP_EINVOP;
-        return XMPP_EINVOP;
     
     stanza->type = XMPP_STANZA_TEXT;
 
-    if (stanza->data)
+    if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
-        xmpp_free(stanza->ctx, stanza->data);
     stanza->data = xmpp_strdup(stanza->ctx, text);
 
     return stanza->data == NULL ? XMPP_EMEM : XMPP_EOK;
@@ -759,16 +679,13 @@ int xmpp_stanza_set_text_with_size(xmpp_stanza_t *stanza,
 				   const char * const text,
 				   const size_t size)
 {
-    if (stanza->type == XMPP_STANZA_TAG)
+    if (stanza->type == XMPP_STANZA_TAG) return XMPP_EINVOP;
-        return XMPP_EINVOP;
 
     stanza->type = XMPP_STANZA_TEXT;
 
-    if (stanza->data)
+    if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
-        xmpp_free(stanza->ctx, stanza->data);
     stanza->data = xmpp_alloc(stanza->ctx, size + 1);
-    if (!stanza->data)
+    if (!stanza->data) return XMPP_EMEM;
-        return XMPP_EMEM;
 
     memcpy(stanza->data, text, size);
     stanza->data[size] = 0;
@@ -892,50 +809,16 @@ xmpp_stanza_t *xmpp_stanza_get_child_by_ns(xmpp_stanza_t *const stanza,
 					   const char * const ns)
 {
     xmpp_stanza_t *child;
-    const char *child_ns;
 
     for (child = stanza->children; child; child = child->next) {
-        child_ns = xmpp_stanza_get_ns(child);
+	if (xmpp_stanza_get_ns(child) &&
-        if (child_ns && strcmp(ns, child_ns) == 0)
+	    strcmp(ns, xmpp_stanza_get_ns(child)) == 0)
 	    break;
     }
     
     return child;
 }
 
-/** Get the first child of stanza with name and a given namespace.
- *  This function searches all the immediate children of stanza for a child
- *  stanza that matches the name and namespace provided.
- *  The first matching child is returned.
- *
- *  @param stanza a Strophe stanza object
- *  @param name a string with the name to match
- *  @param ns a string with the namespace to match
- *
- *  @return the matching child stanza object or NULL if no match was found
- *
- *  @ingroup Stanza
- */
-xmpp_stanza_t *xmpp_stanza_get_child_by_name_and_ns(xmpp_stanza_t *const stanza,
-                                                    const char *const name,
-                                                    const char *const ns)
-{
-    xmpp_stanza_t *child;
-    const char *child_ns;
-
-    for (child = stanza->children; child; child = child->next) {
-        if (child->type == XMPP_STANZA_TAG &&
-            (strcmp(name, xmpp_stanza_get_name(child)) == 0)) {
-            child_ns = xmpp_stanza_get_ns(child);
-            if (child_ns && strcmp(ns, child_ns) == 0) {
-                break;
-            }
-        }
-    }
-
-    return child;
-}
-
 /** Get the list of children.
  *  This function returns the first child of the stanza object.  The rest
  *  of the children can be obtained by calling xmpp_stanza_get_next() to
@@ -994,12 +877,10 @@ char *xmpp_stanza_get_text(xmpp_stanza_t *const stanza)
 	if (child->type == XMPP_STANZA_TEXT)
 	    len += strlen(child->data);
 
-    if (len == 0)
+    if (len == 0) return NULL;
-        return NULL;
 
     text = (char *)xmpp_alloc(stanza->ctx, len + 1);
-    if (!text)
+    if (!text) return NULL;
-        return NULL;
 
     len = 0;
     for (child = stanza->children; child; child = child->next)
@@ -1046,7 +927,8 @@ const char *xmpp_stanza_get_text_ptr(xmpp_stanza_t *const stanza)
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id)
+int xmpp_stanza_set_id(xmpp_stanza_t * const stanza,
+		       const char * const id)
 {
     return xmpp_stanza_set_attribute(stanza, "id", id);
 }
@@ -1062,7 +944,8 @@ int xmpp_stanza_set_id(xmpp_stanza_t *const stanza, const char *const id)
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type)
+int xmpp_stanza_set_type(xmpp_stanza_t * const stanza,
+			 const char * const type)
 {
     return xmpp_stanza_set_attribute(stanza, "type", type);
 }
@@ -1079,7 +962,8 @@ int xmpp_stanza_set_type(xmpp_stanza_t *const stanza, const char *const type)
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to)
+int xmpp_stanza_set_to(xmpp_stanza_t * const stanza,
+                       const char * const to)
 {
     return xmpp_stanza_set_attribute(stanza, "to", to);
 }
@@ -1096,7 +980,8 @@ int xmpp_stanza_set_to(xmpp_stanza_t *const stanza, const char *const to)
  *
  *  @ingroup Stanza
  */
-int xmpp_stanza_set_from(xmpp_stanza_t *const stanza, const char *const from)
+int xmpp_stanza_set_from(xmpp_stanza_t * const stanza,
+                         const char * const from)
 {
     return xmpp_stanza_set_attribute(stanza, "from", from);
 }
@@ -1164,19 +1049,16 @@ xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza)
     int rc;
 
     from = xmpp_stanza_get_from(stanza);
-    if (!from)
+    if (!from) goto copy_error;
-        goto copy_error;
 
     copy = xmpp_stanza_new(stanza->ctx);
-    if (!copy)
+    if (!copy) goto copy_error;
-        goto copy_error;
 
     copy->type = stanza->type;
 
     if (stanza->data) {
         copy->data = xmpp_strdup(stanza->ctx, stanza->data);
-        if (!copy->data)
+        if (!copy->data) goto copy_error;
-            goto copy_error;
     }
 
     if (stanza->attributes) {
@@ -1186,100 +1068,19 @@ xmpp_stanza_t *xmpp_stanza_reply(xmpp_stanza_t *const stanza)
 
     xmpp_stanza_del_attribute(copy, "to");
     xmpp_stanza_del_attribute(copy, "from");
-    xmpp_stanza_del_attribute(copy, "xmlns");
     rc = xmpp_stanza_set_to(copy, from);
-    if (rc != XMPP_EOK)
+    if (rc != XMPP_EOK) goto copy_error;
-        goto copy_error;
 
     return copy;
 
 copy_error:
-    if (copy)
+    if (copy) xmpp_stanza_release(copy);
-        xmpp_stanza_release(copy);
     return NULL;
 }
 
-/** Create an error stanza in reply to the provided stanza.
+static xmpp_stanza_t *
- *
+_stanza_new_with_attrs(xmpp_ctx_t *ctx, const char * const name,
- *  Check https://tools.ietf.org/html/rfc6120#section-8.3 for details.
+                       const char * const type, const char * const id,
- *
- *  @param stanza a Strophe stanza object
- *  @param error_type type attribute in the <error/> child element
- *  @param condition the defined-condition (e.g. "item-not-found")
- *  @param text optional description, may be NULL
- *
- *  @return a new Strophe stanza object
- *
- *  @ingroup Stanza
- */
-xmpp_stanza_t *xmpp_stanza_reply_error(xmpp_stanza_t *const stanza,
-                                       const char *const error_type,
-                                       const char *const condition,
-                                       const char *const text)
-{
-    xmpp_ctx_t *ctx = stanza->ctx;
-    xmpp_stanza_t *reply = NULL;
-    xmpp_stanza_t *error;
-    xmpp_stanza_t *item;
-    xmpp_stanza_t *text_stanza;
-    const char *to;
-
-    if (!error_type || !condition)
-        goto quit_err;
-
-    reply = xmpp_stanza_reply(stanza);
-    if (!reply)
-        goto quit_err;
-
-    xmpp_stanza_set_type(reply, "error");
-    to = xmpp_stanza_get_to(stanza);
-    if (to)
-        xmpp_stanza_set_from(reply, to);
-
-    error = xmpp_stanza_new(ctx);
-    if (!error)
-        goto quit_err;
-    xmpp_stanza_set_name(error, "error");
-    xmpp_stanza_set_type(error, error_type);
-    xmpp_stanza_add_child(reply, error);
-    xmpp_stanza_release(error);
-
-    item = xmpp_stanza_new(ctx);
-    if (!item)
-        goto quit_err;
-    xmpp_stanza_set_name(item, condition);
-    xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF);
-    xmpp_stanza_add_child(error, item);
-    xmpp_stanza_release(item);
-
-    if (text) {
-        item = xmpp_stanza_new(ctx);
-        if (!item)
-            goto quit_err;
-        xmpp_stanza_set_name(item, "text");
-        xmpp_stanza_set_ns(item, XMPP_NS_STANZAS_IETF);
-        xmpp_stanza_add_child(error, item);
-        xmpp_stanza_release(item);
-        text_stanza = xmpp_stanza_new(ctx);
-        if (!text_stanza)
-            goto quit_err;
-        xmpp_stanza_set_text(text_stanza, text);
-        xmpp_stanza_add_child(item, text_stanza);
-        xmpp_stanza_release(text_stanza);
-    }
-
-    return reply;
-
-quit_err:
-    if (reply)
-        xmpp_stanza_release(reply);
-    return NULL;
-}
-
-static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
-                                             const char *const name,
-                                             const char *const type,
-                                             const char *const id,
                        const char * const to)
 {
     xmpp_stanza_t *stanza = xmpp_stanza_new(ctx);
@@ -1313,10 +1114,8 @@ static xmpp_stanza_t *_stanza_new_with_attrs(xmpp_ctx_t *ctx,
  *
  *  @ingroup Stanza
  */
-xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx,
+xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx, const char * const type,
-                                const char *const type,
+                                const char * const to, const char * const id)
-                                const char *const to,
-                                const char *const id)
 {
     return _stanza_new_with_attrs(ctx, "message", type, id, to);
 }
@@ -1401,8 +1200,8 @@ int xmpp_message_set_body(xmpp_stanza_t *msg, const char *const text)
  *
  *  @ingroup Stanza
  */
-xmpp_stanza_t *
+xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char * const type,
-xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id)
+                           const char * const id)
 {
     return _stanza_new_with_attrs(ctx, "iq", type, id, NULL);
 }
@@ -1419,180 +1218,3 @@ xmpp_stanza_t *xmpp_presence_new(xmpp_ctx_t *ctx)
 {
     return _stanza_new_with_attrs(ctx, "presence", NULL, NULL, NULL);
 }
-
-/** Create an <stream:error/> stanza object with given type and error text.
- *  The error text is optional and may be NULL.
- *
- *  @param ctx a Strophe context object
- *  @param type enum of xmpp_error_type_t
- *  @param text content of a 'text'
- *
- *  @return a new Strophe stanza object
- *
- *  @todo Handle errors in this function
- *
- *  @ingroup Stanza
- */
-xmpp_stanza_t *xmpp_error_new(xmpp_ctx_t *ctx,
-                              xmpp_error_type_t const type,
-                              const char *const text)
-{
-    xmpp_stanza_t *error =
-        _stanza_new_with_attrs(ctx, "stream:error", NULL, NULL, NULL);
-    xmpp_stanza_t *error_type = xmpp_stanza_new(ctx);
-
-    switch (type) {
-    case XMPP_SE_BAD_FORMAT:
-        xmpp_stanza_set_name(error_type, "bad-format");
-        break;
-    case XMPP_SE_BAD_NS_PREFIX:
-        xmpp_stanza_set_name(error_type, "bad-namespace-prefix");
-        break;
-    case XMPP_SE_CONFLICT:
-        xmpp_stanza_set_name(error_type, "conflict");
-        break;
-    case XMPP_SE_CONN_TIMEOUT:
-        xmpp_stanza_set_name(error_type, "connection-timeout");
-        break;
-    case XMPP_SE_HOST_GONE:
-        xmpp_stanza_set_name(error_type, "host-gone");
-        break;
-    case XMPP_SE_HOST_UNKNOWN:
-        xmpp_stanza_set_name(error_type, "host-unknown");
-        break;
-    case XMPP_SE_IMPROPER_ADDR:
-        xmpp_stanza_set_name(error_type, "improper-addressing");
-        break;
-    case XMPP_SE_INTERNAL_SERVER_ERROR:
-        xmpp_stanza_set_name(error_type, "internal-server-error");
-        break;
-    case XMPP_SE_INVALID_FROM:
-        xmpp_stanza_set_name(error_type, "invalid-from");
-        break;
-    case XMPP_SE_INVALID_ID:
-        xmpp_stanza_set_name(error_type, "invalid-id");
-        break;
-    case XMPP_SE_INVALID_NS:
-        xmpp_stanza_set_name(error_type, "invalid-namespace");
-        break;
-    case XMPP_SE_INVALID_XML:
-        xmpp_stanza_set_name(error_type, "invalid-xml");
-        break;
-    case XMPP_SE_NOT_AUTHORIZED:
-        xmpp_stanza_set_name(error_type, "not-authorized");
-        break;
-    case XMPP_SE_POLICY_VIOLATION:
-        xmpp_stanza_set_name(error_type, "policy-violation");
-        break;
-    case XMPP_SE_REMOTE_CONN_FAILED:
-        xmpp_stanza_set_name(error_type, "remote-connection-failed");
-        break;
-    case XMPP_SE_RESOURCE_CONSTRAINT:
-        xmpp_stanza_set_name(error_type, "resource-constraint");
-        break;
-    case XMPP_SE_RESTRICTED_XML:
-        xmpp_stanza_set_name(error_type, "restricted-xml");
-        break;
-    case XMPP_SE_SEE_OTHER_HOST:
-        xmpp_stanza_set_name(error_type, "see-other-host");
-        break;
-    case XMPP_SE_SYSTEM_SHUTDOWN:
-        xmpp_stanza_set_name(error_type, "system-shutdown");
-        break;
-    case XMPP_SE_UNDEFINED_CONDITION:
-        xmpp_stanza_set_name(error_type, "undefined-condition");
-        break;
-    case XMPP_SE_UNSUPPORTED_ENCODING:
-        xmpp_stanza_set_name(error_type, "unsupported-encoding");
-        break;
-    case XMPP_SE_UNSUPPORTED_STANZA_TYPE:
-        xmpp_stanza_set_name(error_type, "unsupported-stanza-type");
-        break;
-    case XMPP_SE_UNSUPPORTED_VERSION:
-        xmpp_stanza_set_name(error_type, "unsupported-version");
-        break;
-    case XMPP_SE_XML_NOT_WELL_FORMED:
-        xmpp_stanza_set_name(error_type, "xml-not-well-formed");
-        break;
-    default:
-        xmpp_stanza_set_name(error_type, "internal-server-error");
-        break;
-    }
-
-    xmpp_stanza_set_ns(error_type, XMPP_NS_STREAMS_IETF);
-    xmpp_stanza_add_child(error, error_type);
-    xmpp_stanza_release(error_type);
-
-    if (text) {
-        xmpp_stanza_t *error_text = xmpp_stanza_new(ctx);
-        xmpp_stanza_t *content = xmpp_stanza_new(ctx);
-
-        xmpp_stanza_set_name(error_text, "text");
-        xmpp_stanza_set_ns(error_text, XMPP_NS_STREAMS_IETF);
-
-        xmpp_stanza_set_text(content, text);
-        xmpp_stanza_add_child(error_text, content);
-        xmpp_stanza_release(content);
-
-        xmpp_stanza_add_child(error, error_text);
-        xmpp_stanza_release(error_text);
-    }
-
-    return error;
-}
-
-static void _stub_stream_start(char *name, char **attrs, void *userdata)
-{
-    UNUSED(name);
-    UNUSED(attrs);
-    UNUSED(userdata);
-}
-
-static void _stub_stream_end(char *name, void *userdata)
-{
-    UNUSED(name);
-    UNUSED(userdata);
-}
-
-static void _stream_stanza(xmpp_stanza_t *stanza, void *userdata)
-{
-    stanza = xmpp_stanza_clone(stanza);
-    *(xmpp_stanza_t **)userdata = stanza;
-}
-
-/** Create a stanza object from the string.
- *  This function allocates and initializes a stanza object which represents
- *  stanza located in the string.
- *  The stanza will have a reference count of one, so the caller does not
- *  need to clone it.
- *
- *  @param ctx a Strophe context object
- *  @param str stanza in NULL terminated string representation
- *
- *  @return a stanza object or NULL on an error
- *
- *  @ingroup Stanza
- */
-xmpp_stanza_t *xmpp_stanza_new_from_string(xmpp_ctx_t *ctx, const char *str)
-{
-    xmpp_stanza_t *stanza = NULL;
-    parser_t *parser;
-    int ret;
-
-    static const char *start = "<stream>";
-    static const char *end = "</stream>";
-
-    parser = parser_new(ctx, _stub_stream_start, _stub_stream_end,
-                        _stream_stanza, &stanza);
-    if (parser) {
-        ret = parser_feed(parser, (char *)start, strlen(start)) &&
-              parser_feed(parser, (char *)str, strlen(str)) &&
-              parser_feed(parser, (char *)end, strlen(end));
-        parser_free(parser);
-        if (!ret && stanza) {
-            xmpp_stanza_release(stanza);
-            stanza = NULL;
-        }
-    }
-    return stanza;
-}

src/tls_dummy.c

@@ -35,73 +35,57 @@ 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)
 {
-    UNUSED(tls);
-    UNUSED(buff);
-    UNUSED(len);
     return -1;
 }
 
 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

@@ -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,
+    err = gnutls_certificate_set_x509_trust_file(tls->cred,
-                                                 GNUTLS_X509_FMT_PEM);
+            cafilename, GNUTLS_X509_FMT_PEM);
     if (err >= 0) {
         err = gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE,
                                      tls->cred);
@@ -142,6 +142,5 @@ 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

@@ -31,22 +31,6 @@
 #include "tls.h"
 #include "sock.h"
 
-/*
- * Redefine OPENSSL_VERSION_NUMBER for LibreSSL.
- * LibreSSL and OpenSSL use different and incompatible version schemes. Solve
- * this issue in the way how nginx project did.
- */
-#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
-#undef OPENSSL_VERSION_NUMBER
-#if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
-#define OPENSSL_VERSION_NUMBER 0x1010000fL
-#elif (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
-#define OPENSSL_VERSION_NUMBER 0x1000200fL
-#else
-#define OPENSSL_VERSION_NUMBER 0x1000107fL
-#endif
-#endif
-
 struct _tls {
     xmpp_ctx_t *ctx;
     sock_t sock;
@@ -62,124 +46,8 @@ 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),
-#ifndef LIBRESSL_VERSION_NUMBER
-#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
-#endif /* !LIBRESSL_VERSION_NUMBER */
-};
-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),
-#ifndef LIBRESSL_VERSION_NUMBER
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_VERSION),
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_ALGORITHM),
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_CURVE),
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM),
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED),
-    TLS_ERROR_FIELD(X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256),
-#endif /* !LIBRESSL_VERSION_NUMBER */
-    TLS_ERROR_FIELD(X509_V_ERR_HOSTNAME_MISMATCH),
-    TLS_ERROR_FIELD(X509_V_ERR_EMAIL_MISMATCH),
-    TLS_ERROR_FIELD(X509_V_ERR_IP_ADDRESS_MISMATCH),
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-    TLS_ERROR_FIELD(X509_V_ERR_INVALID_CALL),
-    TLS_ERROR_FIELD(X509_V_ERR_STORE_LOOKUP),
-#ifndef LIBRESSL_VERSION_NUMBER
-    TLS_ERROR_FIELD(X509_V_ERR_PATH_LOOP),
-    TLS_ERROR_FIELD(X509_V_ERR_DANE_NO_MATCH),
-    TLS_ERROR_FIELD(X509_V_ERR_EE_KEY_TOO_SMALL),
-    TLS_ERROR_FIELD(X509_V_ERR_CA_KEY_TOO_SMALL),
-    TLS_ERROR_FIELD(X509_V_ERR_CA_MD_TOO_WEAK),
-    TLS_ERROR_FIELD(X509_V_ERR_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 /* !LIBRESSL_VERSION_NUMBER */
-#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-};
-#undef TLS_ERROR_FIELD
 
 void tls_initialize(void)
 {
@@ -225,19 +93,11 @@ 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;
 
@@ -251,44 +111,26 @@ 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, NULL);
+        SSL_set_verify(tls->ssl, mode, 0);
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
         /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
-        param = SSL_get0_param(tls->ssl);
+        X509_VERIFY_PARAM *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
+         * See https://tools.ietf.org/html/rfc6125#section-7.2 for more information.
-         * information.
          */
-        X509_VERIFY_PARAM_set_hostflags(param,
+        X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-                                        X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
         X509_VERIFY_PARAM_set1_host(param, conn->domain, 0);
 #endif
 
@@ -318,14 +160,7 @@ void tls_free(tls_t *tls)
 
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
-    int ret;
+    return -1;
-
-    ret = SSL_CTX_load_verify_locations(tls->ssl_ctx, cafilename, NULL);
-    if (ret != 1) {
-        xmpp_error(tls->ctx, "tls", "Failed to process CAfile: %s", cafilename);
-        _tls_log_error(tls->ctx);
-    }
-    return ret;
 }
 
 int tls_start(tls_t *tls)
@@ -351,14 +186,8 @@ int tls_start(tls_t *tls)
     }
 
     x509_res = SSL_get_verify_result(tls->ssl);
-    if (x509_res == X509_V_OK) {
+    xmpp_debug(tls->ctx, "tls", "Certificate verification %s",
-        xmpp_debug(tls->ctx, "tls", "Certificate verification passed");
+               x509_res == X509_V_OK ? "passed" : "FAILED");
-    } 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);
     return ret <= 0 ? 0 : 1;
@@ -370,11 +199,6 @@ int tls_stop(tls_t *tls)
     int error;
     int ret;
 
-    /* According to OpenSSL.org, we must not call SSL_shutdown(3)
-       if a previous fatal error has occurred on a connection. */
-    if (tls->lasterror == SSL_ERROR_SYSCALL || tls->lasterror == SSL_ERROR_SSL)
-        return 1;
-
     while (1) {
         ++retries;
         ret = SSL_shutdown(tls->ssl);
@@ -385,14 +209,6 @@ int tls_stop(tls_t *tls)
         }
         _tls_sock_wait(tls, error);
     }
-    if (error == SSL_ERROR_SYSCALL && errno == 0) {
-        /*
-         * Handle special case when peer closes connection instead of
-         * proper shutdown.
-         */
-        error = 0;
-        ret = 1;
-    }
     _tls_set_error(tls, error);
 
     return ret <= 0 ? 0 : 1;
@@ -400,9 +216,10 @@ int tls_stop(tls_t *tls)
 
 int tls_is_recoverable(int error)
 {
-    return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ ||
+    return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ
-            error == SSL_ERROR_WANT_WRITE || error == SSL_ERROR_WANT_CONNECT ||
+            || error == SSL_ERROR_WANT_WRITE
-            error == SSL_ERROR_WANT_ACCEPT);
+            || error == SSL_ERROR_WANT_CONNECT
+            || error == SSL_ERROR_WANT_ACCEPT);
 }
 
 int tls_pending(tls_t *tls)
@@ -432,7 +249,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;
 }
 
@@ -444,18 +260,14 @@ static void _tls_sock_wait(tls_t *tls, int error)
     int nfds;
     int ret;
 
-    if (error == SSL_ERROR_NONE)
-        return;
-
     FD_ZERO(&rfds);
     FD_ZERO(&wfds);
     if (error == SSL_ERROR_WANT_READ)
         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)
+    nfds = (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE) ?
-               ? tls->sock + 1
+           tls->sock + 1 : 0;
-               : 0;
     do {
         tv.tv_sec = TLS_TIMEOUT_SEC;
         tv.tv_usec = TLS_TIMEOUT_USEC;
@@ -463,16 +275,9 @@ 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=%s(%d) errno=%d",
-                   TLS_ERROR_STR(error, tls_errors), error, errno);
         _tls_log_error(tls->ctx);
     }
     tls->lasterror = error;
@@ -491,26 +296,3 @@ static void _tls_log_error(xmpp_ctx_t *ctx)
         }
     } while (e != 0);
 }
-
-static void _tls_dump_cert_info(tls_t *tls)
-{
-    X509 *cert;
-    char *name;
-
-    cert = SSL_get_peer_certificate(tls->ssl);
-    if (cert == NULL)
-        xmpp_debug(tls->ctx, "tls", "Certificate was not presented by peer");
-    else {
-        name = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
-        if (name != NULL) {
-            xmpp_debug(tls->ctx, "tls", "Subject=%s", name);
-            OPENSSL_free(name);
-        }
-        name = X509_NAME_oneline(X509_get_issuer_name(cert), NULL, 0);
-        if (name != NULL) {
-            xmpp_debug(tls->ctx, "tls", "Issuer=%s", name);
-            OPENSSL_free(name);
-        }
-        X509_free(cert);
-    }
-}

src/tls_schannel.c

@@ -118,7 +118,8 @@ tls_t *tls_new(xmpp_conn_t *conn)
 
     ret = tls->sft->QuerySecurityPackageInfo(UNISP_NAME, &(tls->spi));
 
-    if (ret != SEC_E_OK) {
+    if (ret != SEC_E_OK)
+    {
 	tls_free(tls);
 	return NULL;
     }
@@ -139,11 +140,11 @@ tls_t *tls_new(xmpp_conn_t *conn)
     (void)algs;
 #endif
 
-    ret = tls->sft->AcquireCredentialsHandleA(
+    ret = tls->sft->AcquireCredentialsHandleA(NULL, UNISP_NAME,
-        NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, &scred, NULL, NULL,
+	SECPKG_CRED_OUTBOUND, NULL, &scred, NULL, NULL, &(tls->hcred), NULL);
-        &(tls->hcred), NULL);
 
-    if (ret != SEC_E_OK) {
+    if (ret != SEC_E_OK)
+    {
 	tls_free(tls);
 	return NULL;
     }
@@ -154,23 +155,23 @@ 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(
+    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_SUPPORTED_ALGS, &spc_sa);
-        &(tls->hcred), SECPKG_ATTR_SUPPORTED_ALGS, &spc_sa);
+    if (ret != SEC_E_OK)
-    if (ret != SEC_E_OK) {
+    {
 	tls_free(tls);
 	return NULL;
     }
 
-    ret = tls->sft->QueryCredentialsAttributes(
+    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_CIPHER_STRENGTHS, &spc_cs);
-        &(tls->hcred), SECPKG_ATTR_CIPHER_STRENGTHS, &spc_cs);
+    if (ret != SEC_E_OK)
-    if (ret != SEC_E_OK) {
+    {
 	tls_free(tls);
 	return NULL;
     }
 
-    ret = tls->sft->QueryCredentialsAttributes(
+    ret = tls->sft->QueryCredentialsAttributes(&(tls->hcred), SECPKG_ATTR_SUPPORTED_PROTOCOLS, &spc_sp);
-        &(tls->hcred), SECPKG_ATTR_SUPPORTED_PROTOCOLS, &spc_sp);
+    if (ret != SEC_E_OK)
-    if (ret != SEC_E_OK) {
+    {
 	tls_free(tls);
 	return NULL;
     }
@@ -209,8 +210,6 @@ void tls_free(tls_t *tls)
 
 int tls_set_credentials(tls_t *tls, const char *cafilename)
 {
-    UNUSED(tls);
-    UNUSED(cafilename);
     return -1;
 }
 
@@ -226,10 +225,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 |
+    ctxtreq = ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT
-              ISC_REQ_CONFIDENTIALITY | ISC_RET_EXTENDED_ERROR |
+	    | ISC_REQ_CONFIDENTIALITY | ISC_RET_EXTENDED_ERROR
-              ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_STREAM |
+	    | ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_STREAM
-              ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_INTEGRITY;
+	    | ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_INTEGRITY;
 
     memset(&(sbout[0]), 0, sizeof(sbout[0]));
     sbout[0].BufferType = SECBUFFER_TOKEN;
@@ -252,22 +251,14 @@ int tls_start(tls_t *tls)
     sbdin.cBuffers = 2;
     sbdin.pBuffers = sbin;
 
-    ret = tls->sft->InitializeSecurityContextA(
+    ret = tls->sft->InitializeSecurityContextA(&(tls->hcred), NULL, name, ctxtreq, 0, 0,
-        &(tls->hcred), NULL, name, ctxtreq, 0, 0, NULL, 0, &(tls->hctxt),
+					  NULL, 0, &(tls->hctxt), &sbdout,
-        &sbdout, &ctxtattr, NULL);
+					  &ctxtattr, NULL);
 
+    while (ret == SEC_I_CONTINUE_NEEDED
+	   || ret == SEC_I_INCOMPLETE_CREDENTIALS) {
 	unsigned char *p = sbin[0].pvBuffer;
-    int len = 0;
+	int len = 0, 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 (sbdout.pBuffers[0].cbBuffer) {
 	    unsigned char *writebuff = sbdout.pBuffers[0].pvBuffer;
@@ -276,7 +267,9 @@ int tls_start(tls_t *tls)
 	    sent = sock_write(tls->sock, writebuff, writelen);
 	    if (sent == -1) {
 		tls->lasterror = sock_error();
-            } else {
+	    }
+	    else
+	    {
 		writebuff += sent;
 		writelen -= sent;
 	    }
@@ -318,16 +311,20 @@ int tls_start(tls_t *tls)
 	    if (inbytes > 0) {
 		len += inbytes;
 		p += inbytes;
-            } else {
+	    }
+	    else
+	    {
 	        tls->lasterror = sock_error();
 	    }
+
 	}
 
 	sbin[0].cbBuffer = len;
 
-        ret = tls->sft->InitializeSecurityContextA(
+	ret = tls->sft->InitializeSecurityContextA(&(tls->hcred), &(tls->hctxt), name,
-            &(tls->hcred), &(tls->hctxt), name, ctxtreq, 0, 0, &sbdin, 0,
+					      ctxtreq, 0, 0, &sbdin, 0,
-            &(tls->hctxt), &sbdout, &ctxtattr, NULL);
+					      &(tls->hctxt), &sbdout,
+					      &ctxtattr, NULL);
     }
 
     if (ret == SEC_E_OK) {
@@ -337,7 +334,9 @@ int tls_start(tls_t *tls)
 	    sent = sock_write(tls->sock, writebuff, writelen);
 	    if (sent == -1) {
 		tls->lasterror = sock_error();
-            } else {
+	    }
+	    else
+	    {
 		writebuff += sent;
 		writelen -= sent;
 	    }
@@ -351,21 +350,20 @@ int tls_start(tls_t *tls)
 
     if (ret != SEC_E_OK) {
 	tls->lasterror = ret;
-        xmpp_error(tls->ctx, "TLSS", "Schannel error 0x%lx",
+	xmpp_error(tls->ctx, "TLSS", "Schannel error 0x%lx", (unsigned long)ret);
-                   (unsigned long)ret);
 	return 0;
     }
 
     tls->sft->QueryContextAttributes(&(tls->hctxt), SECPKG_ATTR_STREAM_SIZES,
 				&(tls->spcss));
 
-    tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
+    tls->recvbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage
-                            tls->spcss.cbTrailer;
+			    + tls->spcss.cbTrailer;
     tls->recvbuffer       = xmpp_alloc(tls->ctx, tls->recvbuffermaxlen);
     tls->recvbufferpos    = 0;
 
-    tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage +
+    tls->sendbuffermaxlen = tls->spcss.cbHeader + tls->spcss.cbMaximumMessage
-                            tls->spcss.cbTrailer;
+			    + tls->spcss.cbTrailer;
     tls->sendbuffer       = xmpp_alloc(tls->ctx, tls->sendbuffermaxlen);
     tls->sendbufferpos    = 0;
     tls->sendbufferlen    = 0;
@@ -379,7 +377,6 @@ int tls_start(tls_t *tls)
 
 int tls_stop(tls_t *tls)
 {
-    UNUSED(tls);
     return -1;
 }
 
@@ -390,13 +387,12 @@ int tls_error(tls_t *tls)
 
 int tls_is_recoverable(int error)
 {
-    return (error == SEC_E_OK || error == SEC_E_INCOMPLETE_MESSAGE ||
+    return (error == SEC_E_OK || error == SEC_E_INCOMPLETE_MESSAGE
-            error == WSAEWOULDBLOCK || error == WSAEMSGSIZE ||
+	    || error == WSAEWOULDBLOCK || error == WSAEMSGSIZE
-            error == WSAEINPROGRESS);
+	    || error == WSAEINPROGRESS);
 }
 
-int tls_pending(tls_t *tls)
+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
@@ -417,7 +413,8 @@ 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 (tls->readybufferpos < tls->readybufferlen)
+    {
 	if (len < tls->readybufferlen - tls->readybufferpos) {
 	    bytes = len;
 	} else {
@@ -514,7 +511,8 @@ int tls_read(tls_t *tls, void *const buff, const size_t len)
 	    return -1;
 	} else if (ret == SEC_I_RENEGOTIATE) {
 	    ret = tls_start(tls);
-            if (!ret) {
+	    if (!ret)
+	    {
 		return -1;
 	    }
 
@@ -536,7 +534,8 @@ 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) {
+    if (tls->sendbufferpos < tls->sendbufferlen)
+    {
 	int bytes;
 
 	bytes = sock_write(tls->sock, tls->sendbuffer + tls->sendbufferpos,
@@ -594,22 +593,23 @@ 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) {
+    while (remain > 0)
+    {
 	if (remain > tls->spcss.cbMaximumMessage) {
 	    sbenc[1].cbBuffer = tls->spcss.cbMaximumMessage;
 	} else {
 	    sbenc[1].cbBuffer = remain;
 	}
 
-        sbenc[2].pvBuffer =
+	sbenc[2].pvBuffer = (unsigned char *)sbenc[1].pvBuffer
-            (unsigned char *)sbenc[1].pvBuffer + sbenc[1].cbBuffer;
+			    + sbenc[1].cbBuffer;
         sbenc[2].cbBuffer = tls->spcss.cbTrailer;
 
 	memcpy(sbenc[1].pvBuffer, p, sbenc[1].cbBuffer);
 	p += tls->spcss.cbMaximumMessage;
 
-        tls->sendbufferlen =
+	tls->sendbufferlen = sbenc[0].cbBuffer + sbenc[1].cbBuffer
-            sbenc[0].cbBuffer + sbenc[1].cbBuffer + sbenc[2].cbBuffer;
+			     + sbenc[2].cbBuffer;
 
 	ret = tls->sft->EncryptMessage(&(tls->hctxt), 0, &sbdenc, 0);
 
@@ -637,6 +637,7 @@ int tls_write(tls_t *tls, const void *const buff, const size_t len)
 	if (ret == 0 || (ret == -1 && tls_is_recoverable(tls_error(tls)))) {
 	    return sent;
 	}
+
     }
 
     return sent;

src/util.c

@@ -86,24 +86,8 @@ char *xmpp_strtok_r(char *s, const char *delim, char **saveptr)
  */
 uint64_t time_stamp(void)
 {
-#if defined(_WIN32) || defined(_XBOX_ONE)
+#ifdef _WIN32
-
+    return timeGetTime();
-#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;
 

src/util.h

@@ -18,10 +18,6 @@
 
 #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

@@ -39,10 +39,6 @@ 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'.
  */
@@ -75,10 +71,6 @@ 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
@@ -144,7 +136,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_INCOMING
+} xmpp_conn_type_t;
 
 typedef void (*xmpp_log_handler)(void * const userdata, 
 				 const xmpp_log_level_t level,
@@ -173,10 +170,6 @@ typedef struct _xmpp_stanza_t xmpp_stanza_t;
  *  Trust server's certificate even if it is invalid.
  */
 #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)
 
 /* connect callback */
 typedef enum {
@@ -225,9 +218,6 @@ typedef void (*xmpp_conn_handler)(xmpp_conn_t *const conn,
 				  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);
@@ -242,12 +232,7 @@ 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,
+void xmpp_conn_set_keepalive(xmpp_conn_t * const conn, int timeout, int interval);
-                             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,
@@ -255,10 +240,8 @@ int xmpp_connect_client(xmpp_conn_t *const conn,
 			  xmpp_conn_handler callback,
 			  void * const userdata);
 
-int xmpp_connect_component(xmpp_conn_t *const conn,
+int xmpp_connect_component(xmpp_conn_t * const conn, const char * const server,
-                           const char *const server,
+                           unsigned short port, xmpp_conn_handler callback,
-                           unsigned short port,
-                           xmpp_conn_handler callback,
                            void * const userdata);
 
 int xmpp_connect_raw(xmpp_conn_t * const conn,
@@ -267,24 +250,48 @@ int xmpp_connect_raw(xmpp_conn_t *const conn,
                      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,
+int xmpp_conn_open_stream(xmpp_conn_t * const conn, char **attributes,
-                          char **attributes,
                           size_t attributes_len);
 int xmpp_conn_tls_start(xmpp_conn_t * const conn);
-int xmpp_conn_tls_cafile(xmpp_conn_t *const conn, const char *cafile);
 
 void xmpp_disconnect(xmpp_conn_t * const conn);
 
-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);
 
-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, ...);
 void xmpp_send_raw(xmpp_conn_t * const conn, 
-                   const char *const data,
+		   const char * const data, const size_t len);
-                   const size_t len);
+
+/* server */
+
+/* opaque server object */
+typedef struct _xmpp_server_t xmpp_server_t;
+
+/* server callback */
+typedef enum {
+    XMPP_SERVER_ACCEPT,
+    XMPP_SERVER_OPEN_STREAM,
+    XMPP_SERVER_DISCONNECT,
+    XMPP_SERVER_FAIL
+} xmpp_server_event_t;
+
+typedef void (*xmpp_server_handler)(xmpp_server_t * const srv,
+                                    xmpp_conn_t * const conn,
+                                    const xmpp_server_event_t event,
+                                    const int error,
+                                    void * const userdata);
+
+xmpp_server_t *xmpp_server_new(xmpp_ctx_t * const ctx);
+void xmpp_server_free(xmpp_server_t * const srv);
+int xmpp_server_listen(xmpp_server_t * const srv, unsigned short port,
+                       xmpp_server_handler callback, void * const userdata);
+void xmpp_server_stop(xmpp_server_t * const srv);
 
 /* handlers */
 
-/* if the handler returns false it is removed */
+/* if the handle returns false it is removed */
 typedef int (*xmpp_timed_handler)(xmpp_conn_t * const conn, 
 				  void * const userdata);
 
@@ -295,16 +302,6 @@ void xmpp_timed_handler_add(xmpp_conn_t *const conn,
 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_global_timed_handler)(xmpp_ctx_t *const ctx,
-                                         void *const userdata);
-
-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);
 
 /* if the handler returns false it is removed */
 typedef int (*xmpp_handler)(xmpp_conn_t * const conn,
@@ -317,7 +314,8 @@ void xmpp_handler_add(xmpp_conn_t *const conn,
 		      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_handler_delete(xmpp_conn_t * const conn,
+			 xmpp_handler handler);
 
 void xmpp_id_handler_add(xmpp_conn_t * const conn,
 			 xmpp_handler handler,
@@ -335,7 +333,6 @@ 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);
@@ -346,36 +343,26 @@ 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);
 
-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,
+			char ** const buf, size_t * const buflen);
-                        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_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,
+			       const char **attr, int attrlen);
-                               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);
@@ -385,8 +372,10 @@ const char *xmpp_stanza_get_name(xmpp_stanza_t *const stanza);
 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_name(xmpp_stanza_t *stanza,
-int xmpp_stanza_set_text(xmpp_stanza_t *stanza, const char *const text);
+			 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);
@@ -407,31 +396,21 @@ 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_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,
+xmpp_stanza_t *xmpp_message_new(xmpp_ctx_t *ctx, const char * const type,
-                                const char *const type,
+                                const char * const to, const char * const id);
-                                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);
 
-xmpp_stanza_t *
+xmpp_stanza_t *xmpp_iq_new(xmpp_ctx_t *ctx, const char * const type,
-xmpp_iq_new(xmpp_ctx_t *ctx, const char *const type, const char *const id);
+                           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);
 
 /* jid */
 
 /* these return new strings that must be xmpp_free()'d */
-char *xmpp_jid_new(xmpp_ctx_t *ctx,
+char *xmpp_jid_new(xmpp_ctx_t *ctx, const char *node,
-                   const char *node,
                                     const char *domain,
                                     const char *resource);
 char *xmpp_jid_bare(xmpp_ctx_t *ctx, const char *jid);
@@ -460,8 +439,7 @@ 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,
+void xmpp_sha1_digest(const unsigned char *data, size_t len,
-                      size_t len,
                       unsigned char *digest);
 
 xmpp_sha1_t *xmpp_sha1_new(xmpp_ctx_t *ctx);
@@ -474,14 +452,10 @@ void xmpp_sha1_to_digest(xmpp_sha1_t *sha1, unsigned char *digest);
 
 /* Base64 */
 
-char *
+char *xmpp_base64_encode(xmpp_ctx_t *ctx, const unsigned char *data, size_t len);
-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,
+void xmpp_base64_decode_bin(xmpp_ctx_t *ctx, const char *base64, size_t len,
-                            const char *base64,
+                            unsigned char **out, size_t *outlen);
-                            size_t len,
-                            unsigned char **out,
-                            size_t *outlen);
 
 #ifdef __cplusplus
 }

strophepp.h

@@ -0,0 +1,133 @@
+/* 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

@@ -18,12 +18,11 @@
 
 #include "test.h"
 
-#define fail_unless(expr)                                               \
+#define fail_unless(expr) do {                  \
-    do {                                                                \
     int result = (expr);                        \
     if (!result) {                              \
-            printf("%s:%d: Assertion failed: %s\n", __FILE__, __LINE__, \
+        printf("%s:%d: Assertion failed: %s\n", \
-                   #expr);                                              \
+               __FILE__, __LINE__, #expr);      \
         exit(1);                                \
     }                                           \
 } while (0)
@@ -43,9 +42,6 @@ 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;
 }
@@ -53,8 +49,6 @@ 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;
 }
@@ -62,8 +56,6 @@ 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;
 }
@@ -75,7 +67,9 @@ 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,
+    snprintf(fulldomain, sizeof(fulldomain), "_%s._%s.%s",
-             domain);
+             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'
+    return c <= '9' ? (uint8_t)(c - '0') :
-               ? (uint8_t)(c - '0')
+           c <= 'Z' ? (uint8_t)(c - 'A' + 10) :
-               : c <= 'Z' ? (uint8_t)(c - 'A' + 10) : (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

@@ -18,8 +18,7 @@
 #include "ostypes.h"
 
 #define TEST_MAIN                                           \
-    int main(int argc, char **argv)                             \
+int main(int argc, char **argv) {                           \
-    {                                                           \
     int num_failed;                                         \
     Suite *s = parser_suite();                              \
     SRunner *sr = srunner_create(s);                        \
@@ -52,10 +51,14 @@
     const uint8_t *__v2 = (uint8_t *)(v2);     \
     size_t __len1 = len1;                      \
     size_t __len2 = len2;                      \
-        if (__len1 != __len2 || memcmp(__v1, __v2, __len1) != 0) {     \
+    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("expected: 0x%s\n",             \
-            printf("got:      0x%s\n", test_bin_to_hex(__v2, __len2)); \
+               test_bin_to_hex(__v1, __len1)); \
+        printf("got:      0x%s\n",             \
+               test_bin_to_hex(__v2, __len2)); \
         exit(1);                               \
     }                                          \
 } while (0)

tests/test_base64.c

@@ -17,11 +17,11 @@
 
 #include "test.h"
 
-static const unsigned char test_2_raw[] = {0x14, 0xfb, 0x9c, 0x03,
+static const unsigned char test_2_raw[] =
-                                           0xd9, 0x7e, 0x00};
+    {0x14, 0xfb, 0x9c, 0x03, 0xd9, 0x7e, 0x00};
-static const unsigned char test_4_raw[] = {0xd6, 0x2f, 0x27, 0x49, 0x7e, 0xdd,
+static const unsigned char test_4_raw[] =
-                                           0xf3, 0xd5, 0x41, 0xbc, 0x1b, 0xe9,
+    {0xd6, 0x2f, 0x27, 0x49,  0x7e, 0xdd, 0xf3, 0xd5,
-                                           0xdf, 0xe9, 0xb3, 0x08, 0x00};
+     0x41, 0xbc, 0x1b, 0xe9,  0xdf, 0xe9, 0xb3, 0x08, 0x00};
 
 static const struct {
     char *raw;
@@ -36,11 +36,13 @@ static const struct {
         .base64 = "FPucA9l+",
     },
     {
-        .raw = "From rest and sleep, which but thy pictures be, "
+        .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"
+        .base64 =
+            "RnJvbSByZXN0IGFuZCBzbGVlcCwgd2hpY2ggYnV0IHRoeSBwaWN0dXJl"
             "cyBiZSwgTXVjaCBwbGVhc3VyZTsgdGhlbiBmcm9tIHRoZWUgbXVjaCBt"
             "b3JlIG11c3QgZmxvdywgQW5kIHNvb25lc3Qgb3VyIGJlc3QgbWVuIHdp"
             "dGggdGhlZSBkbyBnbywgUmVzdCBvZiB0aGVpciBib25lcywgYW5kIHNv"
@@ -51,9 +53,11 @@ static const struct {
         .base64 = "1i8nSX7d89VBvBvp3+mzCA==",
     },
     {
-        .raw = "realm=\"chesspark.com\",nonce=\"b243c0d663257a9149999cef2f83"
+        .raw =
+            "realm=\"chesspark.com\",nonce=\"b243c0d663257a9149999cef2f83"
             "a22116559e93\",qop=\"auth\",charset=utf-8,algorithm=md5-sess",
-        .base64 = "cmVhbG09ImNoZXNzcGFyay5jb20iLG5vbmNlPSJiMjQzYzBkNjYzMjU3"
+        .base64 =
+            "cmVhbG09ImNoZXNzcGFyay5jb20iLG5vbmNlPSJiMjQzYzBkNjYzMjU3"
             "YTkxNDk5OTljZWYyZjgzYTIyMTE2NTU5ZTkzIixxb3A9ImF1dGgiLGNo"
             "YXJzZXQ9dXRmLTgsYWxnb3JpdGhtPW1kNS1zZXNz",
     },
@@ -90,30 +94,41 @@ static const struct {
 };
 
 static const unsigned char bin_data[] = {
-    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05,
-    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67, 0x6d, 0x61, 0x69, 0x6c,
+    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x03, 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x6d, 0x61, 0x69, 0x6c, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
+    0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04,
-    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61, 0x6c,
+    0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
-    0x74, 0x34, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67,
-    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00,
+    0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32, 0x04, 0x78, 0x6d, 0x70,
+    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x66, 0x04, 0x61, 0x6c, 0x74, 0x34, 0x04, 0x78,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
-    0x43, 0x00, 0x19, 0x00, 0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
+    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d,
-    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
+    0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,
-    0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
-    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32,
-    0x6c, 0x74, 0x33, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
+    0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06,
-    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
+    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 main(int argc, char *argv[])
 {
     xmpp_ctx_t *ctx;
     unsigned char *udec;

tests/test_ctx.c

@@ -1,6 +1,5 @@
 /* test_ctx.c
-** libstrophe XMPP client library -- test routines for the library run-time
+** libstrophe XMPP client library -- test routines for the library run-time context
-*context
 **
 ** Copyright (C) 2005-2009 Collecta, Inc. 
 **
@@ -24,39 +23,31 @@ static int mem_realloc_called = 0;
 
 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)userdata;
-
     mem_free_called++;
     return free(p);
 }
 
 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,
+void my_logger(void * const userdata, const xmpp_log_level_t level,
-               const xmpp_log_level_t level,
+	       const char * const area, const char * const msg)
-               const char *const area,
-               const char *const msg)
 {
-    if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG &&
+    if (strcmp((char *)userdata, "asdf") == 0 && level == XMPP_LEVEL_DEBUG
-        strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)
+	&& strcmp(area, "test") == 0 && strcmp(msg, "hello") == 0)
 	log_called++;
 }
 
-int main()
+int main(int argc, char **argv)
 {
     xmpp_ctx_t *ctx;
     xmpp_mem_t mymem;
@@ -65,8 +56,7 @@ int main()
     void *testptr1, *testptr2;
 
     ctx = xmpp_ctx_new(NULL, NULL);
-    if (ctx == NULL)
+    if (ctx == NULL) return 1;
-        return 1;
 
     /* destroy context */
     xmpp_ctx_free(ctx);

tests/test_hash.c

@@ -16,15 +16,18 @@
 #include "strophe.h"
 #include "common.h"
 #include "hash.h"
-#include "test.h"
 
 #define TABLESIZE 100
 #define TESTSIZE 500
 
 /* static test data */
-const char *keys[] = {"foo", "bar", "baz", "quux", "xyzzy"};
+const int nkeys = 5;
-const char *values[] = {"wuzzle", "mug", "canonical", "rosebud", "lottery"};
+const char *keys[] = {
-const int nkeys = ARRAY_SIZE(keys);
+  "foo", "bar", "baz", "quux", "xyzzy"
+};
+const char *values[] = {
+  "wuzzle", "mug", "canonical", "rosebud", "lottery"
+};
 
 int main(int argc, char **argv)
 {
@@ -55,7 +58,7 @@ int main(int argc, char **argv)
     }
 
     /* allocate a hash table */
-    table = hash_new(ctx, TABLESIZE, xmpp_free);
+    table = hash_new(ctx, TABLESIZE, NULL);
     if (table == NULL) {
 	/* table allocation failed! */
 	return 1;
@@ -63,9 +66,8 @@ int main(int argc, char **argv)
 
     /* test insertion */
     for (i = 0; i < nkeys; i++) {
-        err = hash_add(table, keys[i], xmpp_strdup(ctx, values[i]));
+	err = hash_add(table, keys[i], (void*)values[i]);
-        if (err)
+	if (err) return err;
-            return err;
     }
 
     /* test key count */
@@ -76,19 +78,15 @@ int main(int argc, char **argv)
 
     /* test replacing old values */
     for (i = 0; i < nkeys; i++) {
-        err = hash_add(table, keys[0], xmpp_strdup(ctx, values[i]));
+        err = hash_add(table, keys[0], (void*)values[i]);
-        if (err)
+        if (err) return err;
-            return err;
+        if (hash_num_keys(table) != nkeys) return 1;
-        if (hash_num_keys(table) != nkeys)
-            return 1;
         result = hash_get(table, keys[0]);
-        if (result == NULL)
+        if (result == NULL) return 1;
-            return 1;
+        if (strcmp(result, values[i]) != 0) 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]));
+    hash_add(table, keys[0], (void*)values[0]);
 
     /* test cloning */
     clone = hash_clone(table);
@@ -133,19 +131,14 @@ int main(int argc, char **argv)
 
     /* test drops */
     hash_drop(clone, keys[2]);
-    if (hash_get(clone, keys[2]) != NULL)
+    if (hash_get(clone, keys[2]) != NULL) return 1;
-        return 1;
     hash_drop(clone, keys[1]);
     hash_drop(clone, keys[4]);
-    if (hash_get(clone, keys[4]) != NULL)
+    if (hash_get(clone, keys[4]) != NULL) return 1;
-        return 1;
+    if (hash_get(clone, keys[1]) != 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)
+    if (hash_get(clone, keys[0]) == NULL) return 1;
-        return 1;
+    if (hash_get(clone, keys[3]) == NULL) return 1;
-    if (hash_get(clone, keys[3]) == NULL)
-        return 1;
 
     /* release our clone */
     hash_release(clone);

tests/test_jid.c

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

tests/test_rand.c

@@ -21,29 +21,14 @@
 #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) { }
-void xmpp_free(const xmpp_ctx_t *const ctx, void *p)
+int xmpp_snprintf (char *str, size_t count, const char *fmt, ...) {
-{
-    (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;
 }
 
@@ -136,8 +121,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,
+        Hash_DRBG_Instantiate(&ctx, entropy_input, entropy_input_len,
-                              nonce_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,51 +19,71 @@
 
 /* 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,
+    0x95, 0xf3, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
-    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65,
+    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x72, 0x04, 0x6b, 0x69, 0x65, 0x76, 0x02, 0x75, 0x61, 0x00, 0x00, 0x21,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a,
-    0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x00, 0x3b,
+    0x61, 0x62, 0x62, 0x65, 0x72, 0x04, 0x6b, 0x69,
-    0x00, 0x16, 0x00, 0x01, 0x00, 0x00, 0x14, 0x66, 0x06, 0x6a, 0x61, 0x62,
+    0x65, 0x76, 0x02, 0x75, 0x61, 0x00, 0x00, 0x21,
-    0x62, 0x65, 0x72, 0x04, 0x6b, 0x69, 0x65, 0x76, 0x02, 0x75, 0x61, 0x00,
+    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,
+    0xf2, 0x98, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02,
-    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65,
+    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x72, 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a,
-    0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x1a, 0x00, 0x1e,
+    0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72,
-    0x00, 0x1e, 0x14, 0x66, 0x07, 0x68, 0x65, 0x72, 0x6d, 0x65, 0x73, 0x32,
+    0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c,
-    0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72, 0x67, 0x00,
+    0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83,
-    0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x1c,
+    0x00, 0x1a, 0x00, 0x1e, 0x00, 0x1e, 0x14, 0x66,
-    0x00, 0x1f, 0x00, 0x1e, 0x14, 0x66, 0x09, 0x68, 0x65, 0x72, 0x6d, 0x65,
+    0x07, 0x68, 0x65, 0x72, 0x6d, 0x65, 0x73, 0x32,
-    0x73, 0x32, 0x76, 0x36, 0x06, 0x6a, 0x61, 0x62, 0x62, 0x65, 0x72, 0x03,
+    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,
+    0xda, 0xa8, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05,
-    0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67, 0x6d, 0x61, 0x69, 0x6c,
+    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x03, 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x05, 0x67,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x6d, 0x61, 0x69, 0x6c, 0x03, 0x63, 0x6f, 0x6d,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
+    0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c, 0x00,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04,
-    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61, 0x6c,
+    0x61, 0x6c, 0x74, 0x31, 0x04, 0x78, 0x6d, 0x70,
-    0x74, 0x34, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
+    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67,
-    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00,
+    0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
-    0x21, 0x00, 0x01, 0x00, 0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
+    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
-    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32, 0x04, 0x78, 0x6d, 0x70,
+    0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14,
-    0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
+    0x66, 0x04, 0x61, 0x6c, 0x74, 0x34, 0x04, 0x78,
-    0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x02,
+    0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f,
-    0x43, 0x00, 0x19, 0x00, 0x05, 0x00, 0x00, 0x14, 0x66, 0x04, 0x78, 0x6d,
+    0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d,
-    0x70, 0x70, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
+    0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00,
-    0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00,
-    0x02, 0x43, 0x00, 0x1e, 0x00, 0x14, 0x00, 0x00, 0x14, 0x66, 0x04, 0x61,
+    0x00, 0x14, 0x66, 0x04, 0x61, 0x6c, 0x74, 0x32,
-    0x6c, 0x74, 0x33, 0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06, 0x67,
+    0x04, 0x78, 0x6d, 0x70, 0x70, 0x01, 0x6c, 0x06,
-    0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00,
+    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[] = {
@@ -99,14 +119,17 @@ static const unsigned char data5[] = {
 };
 /* hacked data2 with two empty-string targets. */
 static const unsigned char data6[] = {
-    0xf2, 0x98, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00,
+    0xf2, 0x98, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02,
-    0x00, 0x0c, 0x5f, 0x78, 0x6d, 0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x5f, 0x78, 0x6d,
-    0x65, 0x6e, 0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a, 0x61,
+    0x70, 0x70, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e,
-    0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x21,
+    0x74, 0x04, 0x5f, 0x74, 0x63, 0x70, 0x06, 0x6a,
-    0x00, 0x01, 0xc0, 0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03,
+    0x61, 0x62, 0x62, 0x65, 0x72, 0x03, 0x6f, 0x72,
-    0x83, 0x00, 0x07, 0x00, 0x1e, 0x00, 0x1e, 0x14, 0x66, 0x00, 0xc0,
+    0x67, 0x00, 0x00, 0x21, 0x00, 0x01, 0xc0, 0x0c,
-    0x0c, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83, 0x00, 0x08,
+    0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x83,
-    0x00, 0x1f, 0x00, 0x1e, 0x14, 0x66, 0xc0, 0x40,
+    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 {
@@ -164,13 +187,12 @@ 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 main(int argc, char **argv)
 {
     xmpp_ctx_t *ctx;
     xmpp_rand_t *rand;
@@ -201,8 +223,8 @@ int main()
         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,
+            printf("fail! got port=%u, but should be %u\n",
-                   (unsigned)tests[i].port);
+                   (unsigned)port, (unsigned)tests[i].port);
             return 1;
         }
         printf("ok\n");

tests/test_sasl.c

@@ -69,8 +69,8 @@ int test_digest_md5(xmpp_ctx_t *ctx)
 {
     char *result;
 
-    result =
+    result = sasl_digest_md5(ctx, challenge_md5,
-        sasl_digest_md5(ctx, challenge_md5, "somenode@somerealm", "secret");
+				"somenode@somerealm", "secret");
     printf("response:\n%s\n", result);
     if (strcmp(response_md5, result)) {
 	/* generated incorrect response to challenge */
@@ -80,33 +80,27 @@ int test_digest_md5(xmpp_ctx_t *ctx)
     return 0;
 }
 
-int main()
+int main(int argc, char *argv[])
 {
     xmpp_ctx_t *ctx;
     int ret;
 
     printf("allocating context... ");   
     ctx = xmpp_ctx_new(NULL, NULL);
-    if (ctx == NULL)
+    if (ctx == NULL) printf("failed to create context\n");
-        printf("failed to create context\n");
+    if (ctx == NULL) return -1;
-    if (ctx == NULL)
-        return -1;
     printf("ok.\n");
 
     printf("testing SASL PLAIN... ");   
     ret = test_plain(ctx);
-    if (ret)
+    if (ret) printf("failed!\n");
-        printf("failed!\n");
+    if (ret) return ret;
-    if (ret)
-        return ret;
     printf("ok.\n");
 
     printf("testing SASL DIGEST-MD5... ");
     ret = test_digest_md5(ctx);
-    if (ret)
+    if (ret) printf("failed!\n");
-        printf("failed!\n");
+    if (ret) return ret;
-    if (ret)
-        return ret;
     printf("ok.\n");
 
     printf("freeing context... ");

tests/test_scram.c

@@ -58,19 +58,19 @@ static const struct {
     },
 };
 
-static void test_df(const struct hash_alg *alg)
+static void test_df(void)
 {
     size_t i;
     const char *s;
-    uint8_t dk[SCRAM_DIGEST_SIZE];
+    uint8_t dk[SHA1_DIGEST_SIZE];
 
-    printf("Derivation function SCRAM_Hi tests for %s.\n", alg->scram_name);
+    printf("Derivation function tests (SCRAM_SHA1_Hi).\n");
     for (i = 0; i < ARRAY_SIZE(df_vectors); ++i) {
         printf("Test #%d: ", (int)i + 1);
-        SCRAM_Hi(alg, (uint8_t *)df_vectors[i].P, df_vectors[i].P_len,
+        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, alg->digest_size);
+        s = test_bin_to_hex(dk, sizeof(dk));
         COMPARE(df_vectors[i].DK, s);
         printf("ok\n");
     }
@@ -101,115 +101,42 @@ static const struct {
     },
 };
 
-static void test_scram(const struct hash_alg *alg)
+static void test_scram(void)
 {
-    uint8_t key[SCRAM_DIGEST_SIZE];
+    uint8_t key[SHA1_DIGEST_SIZE];
-    uint8_t sign[SCRAM_DIGEST_SIZE];
+    uint8_t sign[SHA1_DIGEST_SIZE];
     uint8_t salt[256];
     size_t salt_len;
     char auth[512];
     const char *s;
     size_t i;
-    size_t j;
+    int j;
 
-    printf("SCRAM_ClientKey and SCRAM_ClientSignature tests for %s.\n",
+    printf("SCRAM_SHA1_ClientKey and SCRAM_SHA1_ClientSignature tests.\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,
+        snprintf(auth, sizeof(auth), "%s,%s,%s",
-                 scram_vectors[i].challenge, scram_vectors[i].response);
+                 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_ClientKey(alg, (uint8_t *)scram_vectors[i].password,
+        SCRAM_SHA1_ClientKey((uint8_t *)scram_vectors[i].password,
-                        strlen(scram_vectors[i].password), salt, salt_len,
+                             strlen(scram_vectors[i].password),
-                        scram_vectors[i].i, key);
+                             salt, salt_len, scram_vectors[i].i, key);
-        SCRAM_ClientSignature(alg, key, (uint8_t *)auth, strlen(auth), sign);
+        SCRAM_SHA1_ClientSignature(key, (uint8_t *)auth, strlen(auth), sign);
-        for (j = 0; j < alg->digest_size; j++) {
+        for (j = 0; j < SHA1_DIGEST_SIZE; j++) {
             sign[j] ^= key[j];
         }
-        s = test_bin_to_hex(sign, alg->digest_size);
+        s = test_bin_to_hex(sign, SHA1_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,
+    test_df();
-        .key_len = sizeof(hmac_key1),
+    test_scram();
-        .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)
-{
-    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,11 +12,13 @@
 
 /* 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",
+static char *test_results[] = {
+    "A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
     "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
     "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F",
     "AD5B3FDB CB526778 C2839D2F 151EA753 995E26A0"};
@@ -37,9 +39,9 @@ static void digest_to_hex(const uint8_t *digest, char *output)
     *(c - 1) = '\0';
 }
 
-int main()
+int main(int argc, char** argv)
 {
-    size_t k;
+    int k;
     SHA1_CTX context;
     uint8_t digest[20];
     char output[80];

tests/test_sha256.c

@@ -1,44 +0,0 @@
-/* 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

@@ -1,65 +0,0 @@
-/* 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

@@ -20,14 +20,38 @@ int main(void)
 {
   char buf1[LONG_STRING];
   char buf2[LONG_STRING];
-    char *fp_fmt[] = {"%-1.5f",  "%1.5f",  "%123.9f", "%10.5f", "% 10.5f",
+  char *fp_fmt[] = {
-                      "%+22.9f", "%+4.9f", "%01.3f",  "%4f",    "%3.1f",
+    "%-1.5f",
-                      "%3.2f",   "%.0f",   "%.1f",    NULL};
+    "%1.5f",
-    double fp_nums[] = {-1.5,  134.21, 91340.2, 341.1234, 0203.9, 0.96,
+    "%123.9f",
-                        0.996, 0.9996, 1.996,   4.136,    0};
+    "%10.5f",
-    char *int_fmt[] = {"%-1.5d", "%1.5d",   "%123.9d",  "%5.5d",
+    "% 10.5f",
-                       "%10.5d", "% 10.5d", "%+22.33d", "%01.3d",
+    "%+22.9f",
-                       "%4d",    "0x%x",    "0x%04x",   NULL};
+    "%+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;
@@ -36,12 +60,13 @@ int main(void)
   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++) {
+    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)) {
+      if (strcmp (buf1, buf2))
-                printf("xmpp_snprintf doesn't match Format: "
+      {
-                       "%s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
+	printf("xmpp_snprintf doesn't match Format: %s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
 	    fp_fmt[x], buf1, buf2);
 	fail++;
       }
@@ -49,12 +74,13 @@ int main(void)
     }
 
   for (x = 0; int_fmt[x] != NULL ; x++)
-        for (y = 0; int_nums[y] != 0; y++) {
+    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)) {
+      if (strcmp (buf1, buf2))
-                printf("xmpp_snprintf doesn't match Format: "
+      {
-                       "%s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
+	printf("xmpp_snprintf doesn't match Format: %s\n\txmpp_snprintf = %s\n\tsprintf  = %s\n",
 	    int_fmt[x], buf1, buf2);
 	fail++;
       }

tests/test_sock.c

@@ -23,24 +23,19 @@ int wait_for_connect(sock_t sock)
     fd_set wfds, efds;
     int ret;
 
-    FD_ZERO(&wfds);
+    FD_ZERO(&wfds); FD_SET(sock, &wfds);
-    FD_SET(sock, &wfds);
+    FD_ZERO(&efds); FD_SET(sock, &efds);
-    FD_ZERO(&efds);
-    FD_SET(sock, &efds);
 
     ret = select(sock + 1, NULL, &wfds, &efds, NULL);
-    if (ret <= 0)
+    if (ret <= 0) return -1;
-        return -1;
 
-    if (FD_ISSET(sock, &efds))
+    if (FD_ISSET(sock, &efds)) return 0;
-        return 0;
+    if (FD_ISSET(sock, &wfds)) return 1;
-    if (FD_ISSET(sock, &wfds))
-        return 1;
 
     return -1;
 }
 
-int main()
+int main(int argc, char **argv)
 {
     sock_t sock;
     int err;

tests/test_stanza.c

@@ -1,131 +0,0 @@
-/* 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

@@ -20,16 +20,6 @@
 
 #include "test.h" /* ARRAY_SIZE */
 
-/* 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
-#endif /* _MSC_VER */
-
 static int test_strtok_r(void)
 {
     const char *test = "-abc-=-def--";
@@ -75,8 +65,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>",
+        printf("strdup: '%s', xmpp_strdup: '%s'\n",
-               s2 ? s2 : "<NULL>");
+               s1 ? s1 : "<NULL>", s2 ? s2 : "<NULL>");
     }
 
     free(s1);

travis/before_script.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ "x$LIBRESSL" = "xyes" ]; then
-    cd "$HOME"
-    git clone https://github.com/libressl-portable/portable.git libressl-git
-    cd libressl-git
-    if [ -n "$LIBRESSL_COMMIT" ]; then
-        git checkout "$LIBRESSL_COMMIT"
-    fi
-    ./autogen.sh
-    ./configure --prefix="$HOME/libressl"
-    make -j"$(nproc)"
-    make install
-fi