diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-20 17:52:35 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-22 11:56:45 +0200 |
| commit | 912c258fc921fd100b5da3dc25773ecc507891b4 (patch) | |
| tree | 496cca33841fb116ae2de624a6e78b5ede165565 /ssl/ssl_ciph.c | |
| parent | 82c78ee480346f6a2e88a7fa4964ab090b0d8b69 (diff) | |
| download | openssl-912c258fc921fd100b5da3dc25773ecc507891b4.zip openssl-912c258fc921fd100b5da3dc25773ecc507891b4.tar.gz openssl-912c258fc921fd100b5da3dc25773ecc507891b4.tar.bz2 | |
Have load_buildtin_compression in ssl/ssl_ciph.c return RUN_ONCE result
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 11 |
1 files 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; |