diff options
| author | brnrd <brnrd@FreeBSD.org> | 2017-06-10 21:24:10 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2017-06-10 21:24:10 +0800 |
| commit | 8532f191e869d7f3f15d853357acd0b6d52996d8 (patch) | |
| tree | 57e767d21a25dac65a1c5ed1b88b87c7d6c05362 /security | |
| parent | 288e1398c29cbfc2d613a5be430da027e795740c (diff) | |
| download | freebsd-ports-gnome-8532f191e869d7f3f15d853357acd0b6d52996d8.tar.gz freebsd-ports-gnome-8532f191e869d7f3f15d853357acd0b6d52996d8.tar.zst freebsd-ports-gnome-8532f191e869d7f3f15d853357acd0b6d52996d8.zip | |
security/openssl: Fix xmpp STARTTLS
- Add (refactored) patch from master branch
PR: 219805
Submitted by: Alexey <fbsd98816551@avksrv.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/files/patch-apps_s__client.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/security/openssl/files/patch-apps_s__client.c b/security/openssl/files/patch-apps_s__client.c new file mode 100644 index 000000000000..05ba211a2c54 --- /dev/null +++ b/security/openssl/files/patch-apps_s__client.c @@ -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); |