mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

security/openssl: Fix xmpp STARTTLS

Browse Source 
- Add (refactored) patch from master branch

PR:		219805
Submitted by:	Alexey <fbsd98816551@avksrv.org>
This commit is contained in:
Bernard Spil 2017-06-10 13:24:10 +00:00
parent 8476bd873d
commit 47f81ad26b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=443087
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
security/openssl/files/patch-apps_s__client.c Normal file
View File

@ -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);