From: Carlos Alberto Lopez Perez <clopez@igalia.com>
Date: Sun, 5 Aug 2012 23:45:51 +0000 (+0200)
Subject: Fix XMPP code detection on s_client starttls xmpp
X-Git-Tag: master-post-reformat~1207
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e48c77572a9a96a301e362a3646cd3cc7eca0f9;p=oweals%2Fopenssl.git

Fix XMPP code detection on s_client starttls xmpp

 * Some XMPP Servers (OpenFire) use double quotes.
 * This makes s_client starttls work with this servers.
 * Tested with OpenFire servers from http://xmpp.net/ ::

     openssl s_client -connect coderollers.com:5222 -starttls xmpp
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 61ad29134b..c38c42e037 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1673,7 +1673,8 @@ SSL_set_tlsext_status_ids(con, ids);
 		    "xmlns='jabber:client' to='%s' version='1.0'>", host);
 		seen = BIO_read(sbio,mbuf,BUFSIZZ);
 		mbuf[seen] = 0;
-		while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'"))
+		while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'") &&
+				!strstr(mbuf, "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\""))
 			{
 			if (strstr(mbuf, "/stream:features>"))
 				goto shut;