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/051-segfault_export.patch
author Ronald Jordan <ron.jordan@oracle.com>
Wed, 26 Oct 2016 13:19:33 -0700
branchs11u3-sru
changeset 7163 ee09edbd5876
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:
7163
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     1
 
# This patch addresses multiple segmentation faults:
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     2
 
# Pull Requests submitted to the upstream:
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     3
 
#   https://github.com/openssl/openssl/pull/1243
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     4
 
# Fixed by upstream:
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     5
 
#
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     6
 
--- a/apps/s_client.c	Tue May  3 06:44:42 2016
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     7
 
+++ b/apps/s_client.c	Wed May  4 15:11:00 2016
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     8
 
@@ -2633,7 +2633,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
     9
 
 #endif
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    10
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    11
 
     SSL_SESSION_print(bio, SSL_get_session(s));
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    12
 
-    if (keymatexportlabel != NULL) {
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    13
 
+    if ((SSL_get_session(s) != NULL) &&
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    14
 
+        (keymatexportlabel != NULL)) {
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    15
 
         BIO_printf(bio, "Keying material exporter:\n");
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    16
 
         BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);
ee09edbd5876 24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff changeset 
    17
 
         BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);
upstream/oracle/userland-gate