From 0deea8000c606404c4956f137f00d242c951a063 Mon Sep 17 00:00:00 2001
From: Stu Tomlinson <stu@nosnilmot.com>
Date: Wed, 22 Jan 2020 18:10:58 +0000
Subject: [PATCH] Fix XMPP starttls

'-xmpphost' option required in combination with '-starttls xmpp' was missing
in determine_optimal_proto()

Also tweaked a couple of log messages
---
 testssl.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testssl.sh b/testssl.sh
index 6db87d9..b44425f 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -10218,13 +10218,13 @@ starttls_imap_dialog() {
 }
 
 starttls_xmpp_dialog() {
-     debugme echo "=== starting imap XMPP dialog ==="
+     debugme echo "=== starting xmpp STARTTLS dialog ==="
      [[ -z $XMPP_HOST ]] && XMPP_HOST="$NODE"
 
      starttls_io "<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client' to='"$XMPP_HOST"' version='1.0'>"  'starttls(.*)features'  1 &&
      starttls_io "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"  '<proceed'  1
      local ret=$?
-     debugme echo "=== finished XMPP STARTTLS dialog with ${ret} ==="
+     debugme echo "=== finished xmpp STARTTLS dialog with ${ret} ==="
      return $ret
 }
 
@@ -18349,7 +18349,7 @@ determine_optimal_proto() {
                     -ssl2)   "$HAS_SSL2" || continue ;;
                     *) ;;
                esac
-               $OPENSSL s_client $(s_client_options "$STARTTLS_OPTIMAL_PROTO $BUGS -connect "$NODEIP:$PORT" $PROXY -msg -starttls $1" $SNI) </dev/null >$TMPFILE 2>>$ERRFILE
+               $OPENSSL s_client $(s_client_options "$STARTTLS_OPTIMAL_PROTO $BUGS -connect "$NODEIP:$PORT" $PROXY -msg $STARTTLS" $SNI) </dev/null >$TMPFILE 2>>$ERRFILE
                if sclient_auth $? $TMPFILE; then
                     all_failed=false
                     add_tls_offered "${proto/-/}" yes