[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  912c258fc921fd100b5da3dc25773ecc507891b4 (commit)
      from  82c78ee480346f6a2e88a7fa4964ab090b0d8b69 (commit)


- Log -----------------------------------------------------------------
commit 912c258fc921fd100b5da3dc25773ecc507891b4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jul 20 17:52:35 2016 +0200

    Have load_buildtin_compression in ssl/ssl_ciph.c return RUN_ONCE result
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/ssl_ciph.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 2a54f9d..2f036c3 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -502,9 +502,9 @@ DEFINE_RUN_ONCE_STATIC(do_load_builtin_compressions)
     return 1;
 }
 
-static void load_builtin_compressions(void)
+static int load_builtin_compressions(void)
 {
-    RUN_ONCE(&ssl_load_builtin_comp_once, do_load_builtin_compressions);
+    return RUN_ONCE(&ssl_load_builtin_comp_once, do_load_builtin_compressions);
 }
 #endif
 
@@ -521,7 +521,12 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
     if (comp != NULL) {
         SSL_COMP ctmp;
 #ifndef OPENSSL_NO_COMP
-        load_builtin_compressions();
+        if (!load_builtin_compressions()) {
+            /*
+             * Currently don't care, since a failure only means that
+             * ssl_comp_methods is NULL, which is perfectly OK
+             */
+        }
 #endif
         *comp = NULL;
         ctmp.id = s->compress_meth;