From: Richard Levitte <levitte@openssl.org>
Date: Wed, 20 Jul 2016 15:52:35 +0000 (+0200)
Subject: Have load_buildtin_compression in ssl/ssl_ciph.c return RUN_ONCE result
X-Git-Tag: OpenSSL_1_1_0-pre6~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=912c258fc921fd100b5da3dc25773ecc507891b4;p=oweals%2Fopenssl.git

Have load_buildtin_compression in ssl/ssl_ciph.c return RUN_ONCE result

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 2a54f9d44d..2f036c324f 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;