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 Ronald Jordan <ron.jordan@oracle.com>
Wed, 26 Oct 2016 13:19:33 -0700
branchs11u3-sru
changeset 7163 ee09edbd5876
parent 6728 components/openssl/openssl-1.0.1/patches/47_xmpp_detection.patch@bac15af72b19
permissions -rw-r--r--
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2 20358335 memory leak in libcrypto 21297601 32-bit FIPS openssl(1) should link to the mediator link 21791492 Workaround to suppress the link check error should be removed 22021385 openssl ts sub-command dumps core 22021787 openssl s_client sub-command dumps core 22445522 openssl makefile contains undeclared dependency on rsync 22859741 Update OpenSSL FIPS module to 2.0.12 23230454 Use DES3 for pkcs12 certificate encryption 23285559 ssh libcrypto`solaris_locking_setup() atfork handler calls malloc() 24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init 24943813 problem in LIBRARY/OPENSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6728
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     1
 
# The patch is based on the following commit from the upstream:
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     2
 
# https://github.com/openssl/openssl/commit/4e48c77572a9a96a301e362a3646cd3cc7eca0f9
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     3
 
# The fix is patched until the new version becomes available
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     4
 
# from the upstream.
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     5
 
--- a/apps/s_client.c
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     6
 
+++ b/apps/s_client.c
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     7
 
@@ -1640,8 +1640,8 @@
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     8
 
                    "xmlns='jabber:client' to='%s' version='1.0'>", host);
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     9
 
         seen = BIO_read(sbio, mbuf, BUFSIZZ);
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    10
 
         mbuf[seen] = 0;
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    11
 
-        while (!strstr
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    12
 
-               (mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")) {
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    13
 
+        while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'") &&
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    14
 
+               !strstr(mbuf, "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"")) {
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    15
 
             if (strstr(mbuf, "/stream:features>"))
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    16
 
                 goto shut;
bac15af72b19 24528111 problem in LIBRARY/OPENSSL
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    17
 
             seen = BIO_read(sbio, mbuf, BUFSIZZ);
upstream/oracle/userland-gate