Commit 912c258f authored by Richard Levitte's avatar Richard Levitte
Browse files

Have load_buildtin_compression in ssl/ssl_ciph.c return RUN_ONCE result 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 82c78ee4

ssl/ssl_ciph.c

+8 −3
Original line number Diff line number Diff line
@@ -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;