diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-19 19:42:11 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-19 23:49:54 +0200 |
| commit | c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e (patch) | |
| tree | e4e16df15de0263a21427c92ae21d20dc98e3c19 /ssl/ssl_ciph.c | |
| parent | 925d17f3ee4b7f7881fa77a31524ecd9f1305242 (diff) | |
| download | openssl-c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e.zip openssl-c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e.tar.gz openssl-c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e.tar.bz2 | |
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 <kurt@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 2fc4309..2a54f9d 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -46,6 +46,7 @@ #include <openssl/engine.h> #include <openssl/crypto.h> #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 |