From c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 19 Jul 2016 19:42:11 +0200 Subject: Change all our uses of CRYPTO_THREAD_run_once to use RUN_ONCE instead That way, we have a way to check if the init function was successful or not. Reviewed-by: Kurt Roeckx --- ssl/ssl_ciph.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ssl/ssl_ciph.c') diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 2fc4309a91..2a54f9d44d 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -46,6 +46,7 @@ #include #include #include "ssl_locl.h" +#include "internal/thread_once.h" #define SSL_ENC_DES_IDX 0 #define SSL_ENC_3DES_IDX 1 @@ -479,7 +480,7 @@ static int sk_comp_cmp(const SSL_COMP *const *a, const SSL_COMP *const *b) return ((*a)->id - (*b)->id); } -static void do_load_builtin_compressions(void) +DEFINE_RUN_ONCE_STATIC(do_load_builtin_compressions) { SSL_COMP *comp = NULL; COMP_METHOD *method = COMP_zlib(); @@ -498,12 +499,12 @@ static void do_load_builtin_compressions(void) } } CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); + return 1; } static void load_builtin_compressions(void) { - CRYPTO_THREAD_run_once(&ssl_load_builtin_comp_once, - do_load_builtin_compressions); + RUN_ONCE(&ssl_load_builtin_comp_once, do_load_builtin_compressions); } #endif -- cgit v1.2.3