SF.net SVN: gar:[26171] csw/mgar/pkg/openssl1/branches/lts102

[rmottola at users.sourceforge.net]

Revision: 26171
          http://sourceforge.net/p/gar/code/26171
Author:   rmottola
Date:     2017-04-30 16:17:38 +0000 (Sun, 30 Apr 2017)
Log Message:
-----------
openssl1/branches/lts102: import some patches from oracle

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/branches/lts102/Makefile
    csw/mgar/pkg/openssl1/branches/lts102/checksums

Added Paths:
-----------
    csw/mgar/pkg/openssl1/branches/lts102/files/050-segfault_configfile.patch
    csw/mgar/pkg/openssl1/branches/lts102/files/051-segfault_export.patch

Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-04-28 15:08:25 UTC (rev 26170)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-04-30 16:17:38 UTC (rev 26171)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 1.0.2h
+VERSION = 1.0.2j
 GARTYPE = v2
 # Since version 1.0.0, soname is fixed and does not follow the minor releases
 SONAME=1.0.0
@@ -141,6 +141,9 @@
 PATCHFILES += 049-use-srln.patch
 #PATCHFILES += 046-weak-ciphers.patch
 
+PATCHFILES += 050-segfault_configfile.patch
+PATCHFILES += 051-segfault_export.patch
+
 LICENSE = LICENSE
 
 ##### Build and installation information #####

Modified: csw/mgar/pkg/openssl1/branches/lts102/checksums
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-04-28 15:08:25 UTC (rev 26170)
+++ csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-04-30 16:17:38 UTC (rev 26171)
@@ -1 +1 @@
-9392e65072ce4b614c1392eefc1f23d0  openssl-1.0.2h.tar.gz
+96322138f0b69e61b7212bc53d5e912b  openssl-1.0.2j.tar.gz

Added: csw/mgar/pkg/openssl1/branches/lts102/files/050-segfault_configfile.patch
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/files/050-segfault_configfile.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/branches/lts102/files/050-segfault_configfile.patch	2017-04-30 16:17:38 UTC (rev 26171)
@@ -0,0 +1,55 @@
+# This patch was developed in house.
+# The issue is fixed in the OpenSSL 1.1 release by the upstream,
+# but the code base has changed and the same fix can't be applied
+# without major code change.
+--- a/apps/ts.c	2016-06-21 13:43:24.299079900 -0700
++++ b/apps/ts.c	2016-06-21 14:06:28.055910010 -0700
+@@ -299,6 +299,9 @@
+             goto usage;
+         /* Load the config file for possible policy OIDs. */
+         conf = load_config_file(configfile);
++	 if (conf == NULL) {
++            goto cleanup;
++        }
+         ret = !query_command(data, digest, md, policy, no_nonce, cert,
+                              in, out, text);
+         break;
+@@ -401,6 +404,7 @@
+         else
+             BIO_printf(bio_err, "error on line %ld of config file "
+                        "'%s'\n", errorline, configfile);
++        goto errexit;
+     }
+ 
+     if (conf != NULL) {
+@@ -410,18 +414,27 @@
+         p = NCONF_get_string(conf, NULL, ENV_OID_FILE);
+         if (p != NULL) {
+             BIO *oid_bio = BIO_new_file(p, "r");
+-            if (!oid_bio)
++            if (!oid_bio) {
+                 ERR_print_errors(bio_err);
+-            else {
++                goto errexit;
++            } else {
+                 OBJ_create_objects(oid_bio);
+                 BIO_free_all(oid_bio);
+             }
+         } else
+             ERR_clear_error();
+-        if (!add_oid_section(bio_err, conf))
++        if (!add_oid_section(bio_err, conf)) {
+             ERR_print_errors(bio_err);
++            goto errexit;
++        }
+     }
+     return conf;
++
++errexit:
++    if (conf != NULL) {
++	NCONF_free(conf);
++    }
++    return (NULL);
+ }
+ 
+ /*

Added: csw/mgar/pkg/openssl1/branches/lts102/files/051-segfault_export.patch
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/files/051-segfault_export.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/branches/lts102/files/051-segfault_export.patch	2017-04-30 16:17:38 UTC (rev 26171)
@@ -0,0 +1,17 @@
+# This patch addresses multiple segmentation faults:
+# Pull Requests submitted to the upstream:
+#   https://github.com/openssl/openssl/pull/1243
+# Fixed by upstream:
+#   
+--- a/apps/s_client.c	Tue May  3 06:44:42 2016
++++ b/apps/s_client.c	Wed May  4 15:11:00 2016
+@@ -2633,7 +2633,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)
+ #endif
+ 
+     SSL_SESSION_print(bio, SSL_get_session(s));
+-    if (keymatexportlabel != NULL) {
++    if ((SSL_get_session(s) != NULL) &&
++        (keymatexportlabel != NULL)) {
+         BIO_printf(bio, "Keying material exporter:\n");
+         BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);
+         BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.