diff options
| author | Matt Caswell <matt@openssl.org> | 2017-05-19 09:35:19 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-05-22 14:00:19 +0100 |
| commit | 380a522f689252e7f19e0c44ea49461ec7bd040f (patch) | |
| tree | 81a5820773c28b57d18610fea28e4b5dd074b18c /ssl/ssl_init.c | |
| parent | 98d132cf6a879faf0147aa83ea0c07ff326260ed (diff) | |
Replace instances of OPENSSL_assert() with soft asserts in libssl
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3496)
Diffstat (limited to 'ssl/ssl_init.c')
| -rw-r--r-- | ssl/ssl_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index b286a98dec..1d9b799658 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -96,7 +96,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base) SSL_COMP_get_compression_methods(); #endif /* initialize cipher/digest methods table */ - ssl_load_ciphers(); + if (!ssl_load_ciphers()) + return 0; #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: " |