Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/common/patches/054-xmpp-detection.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Mon, 29 Aug 2016 13:44:04 -0700
changeset 6708 4e02cfefe7e9
permissions -rw-r--r--
24528111 problem in LIBRARY/OPENSSL 24394794 CRL conversions from DER to PEM format fail for large CRL files. 24513545 XMPP element quoting confusion
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6708
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     1
 
# The patch is based on the following commit from the upstream:
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     2
 
# https://github.com/openssl/openssl/commit/4e48c77572a9a96a301e362a3646cd3cc7eca0f9
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     3
 
# The fix is patched until the new version becomes available
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     4
 
# from the upstream.
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     5
 
--- a/apps/s_client.c
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     6
 
+++ b/apps/s_client.c
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     7
 
@@ -1640,8 +1640,8 @@
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     8
 
                    "xmlns='jabber:client' to='%s' version='1.0'>", host);
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
     9
 
         seen = BIO_read(sbio, mbuf, BUFSIZZ);
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    10
 
         mbuf[seen] = 0;
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    11
 
-        while (!strstr
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    12
 
-               (mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")) {
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    13
 
+        while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'") &&
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    14
 
+               !strstr(mbuf, "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"")) {
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    15
 
             if (strstr(mbuf, "/stream:features>"))
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    16
 
                 goto shut;
4e02cfefe7e9 24528111 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff changeset 
    17
 
             seen = BIO_read(sbio, mbuf, BUFSIZZ);
upstream/oracle/userland-gate