[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  434b58457c8cca4d09f77a1774d6d2c446604bae (commit)
       via  c7944cf1f6b5656435bad65488e8415a4ed1339e (commit)
       via  a60c151a7d478b74ae88186aca251d17b84a1e2f (commit)
      from  00f5263b78910da233ed0258bf8ea8fd1758abbc (commit)


- Log -----------------------------------------------------------------
commit 434b58457c8cca4d09f77a1774d6d2c446604bae
Author: Marcus Meissner <meissner at suse.de>
Date:   Wed Nov 4 15:00:12 2015 +0100

    mark openssl configuration as loaded at end of OPENSSL_config
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at akamai.com>
    
    GH: #466

commit c7944cf1f6b5656435bad65488e8415a4ed1339e
Author: Quanah Gibson-Mount <quanah at zimbra.com>
Date:   Sun Nov 22 21:35:15 2015 -0600

    Fix grammar errors
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at akamai.com>
    
    GH: #481

commit a60c151a7d478b74ae88186aca251d17b84a1e2f
Author: Pascal Cuoq <cuoq at trust-in-soft.com>
Date:   Mon Nov 23 00:13:15 2015 +0100

    ssl3_free(): Return if it wasn't created
    
    If somewhere in SSL_new() there is a memory allocation failure, ssl3_free() can
    get called with s->s3 still being NULL.
    
    Patch also provided by Willy Tarreau <wtarreau at haproxy.com>
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Viktor Dukhovni <openssl-users at dukhovni.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c        | 8 ++++----
 crypto/conf/conf_sap.c | 1 +
 ssl/s3_lib.c           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index d90124d..e3ab42b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1513,8 +1513,8 @@ int s_client_main(int argc, char **argv)
             BIO_free(fbio);
             if (!foundit)
                 BIO_printf(bio_err,
-                           "didn't found starttls in server response,"
-                           " try anyway...\n");
+                           "didn't find starttls in server response,"
+                           " trying anyway...\n");
             BIO_printf(sbio, "STARTTLS\r\n");
             BIO_read(sbio, sbuf, BUFSIZZ);
         }
@@ -1551,8 +1551,8 @@ int s_client_main(int argc, char **argv)
             BIO_free(fbio);
             if (!foundit)
                 BIO_printf(bio_err,
-                           "didn't found STARTTLS in server response,"
-                           " try anyway...\n");
+                           "didn't find STARTTLS in server response,"
+                           " trying anyway...\n");
             BIO_printf(sbio, ". STARTTLS\r\n");
             BIO_read(sbio, sbuf, BUFSIZZ);
         }
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 308989b..58b0a1b 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -92,6 +92,7 @@ void OPENSSL_config(const char *config_name)
                                CONF_MFLAGS_DEFAULT_SECTION |
                                CONF_MFLAGS_IGNORE_MISSING_FILE);
 #endif
+    openssl_configured = 1;
 }
 
 void OPENSSL_no_config()
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index f40b143..5ad9863 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3880,7 +3880,7 @@ int ssl3_new(SSL *s)
 
 void ssl3_free(SSL *s)
 {
-    if (s == NULL)
+    if (s == NULL || s->s3 == NULL)
         return;
 
     ssl3_cleanup_key_block(s);