Commit 4e48c775 authored by Carlos Alberto Lopez Perez's avatar Carlos Alberto Lopez Perez Committed by Ben Laurie
Browse files

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
parent dece3209

apps/s_client.c

+2 −1
Original line number Diff line number Diff line
@@ -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;