Date: Sat, 10 Jun 2017 13:24:10 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443087 - head/security/openssl/files Message-ID: <201706101324.v5ADOAcc086467@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Jun 10 13:24:10 2017 New Revision: 443087 URL: https://svnweb.freebsd.org/changeset/ports/443087 Log: security/openssl: Fix xmpp STARTTLS - Add (refactored) patch from master branch PR: 219805 Submitted by: Alexey <fbsd98816551@avksrv.org> Added: head/security/openssl/files/patch-apps_s__client.c (contents, props changed) Added: head/security/openssl/files/patch-apps_s__client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openssl/files/patch-apps_s__client.c Sat Jun 10 13:24:10 2017 (r443087) @@ -0,0 +1,22 @@ +From 4e48c77572a9a96a301e362a3646cd3cc7eca0f9 Mon Sep 17 00:00:00 2001 +From: Carlos Alberto Lopez Perez <clopez@igalia.com> +Date: Mon, 6 Aug 2012 01:45:51 +0200 +Subject: [PATCH] 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 +--- apps/s_client.c.orig 2017-05-25 12:54:38 UTC ++++ apps/s_client.c +@@ -1663,7 +1663,8 @@ int MAIN(int argc, char **argv) + seen = BIO_read(sbio, mbuf, BUFSIZZ); + mbuf[seen] = 0; + while (!strstr +- (mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")) { ++ (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; + seen = BIO_read(sbio, mbuf, BUFSIZZ);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706101324.v5ADOAcc086467>