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_ciph.c | |
| parent | 98d132cf6a879faf0147aa83ea0c07ff326260ed (diff) | |
| download | openssl-380a522f689252e7f19e0c44ea49461ec7bd040f.zip openssl-380a522f689252e7f19e0c44ea49461ec7bd040f.tar.gz openssl-380a522f689252e7f19e0c44ea49461ec7bd040f.tar.bz2 | |
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_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index be33ff3..f05e86f 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -371,7 +371,7 @@ static uint32_t disabled_mac_mask; static uint32_t disabled_mkey_mask; static uint32_t disabled_auth_mask; -void ssl_load_ciphers(void) +int ssl_load_ciphers(void) { size_t i; const ssl_cipher_table *t; @@ -396,13 +396,16 @@ void ssl_load_ciphers(void) disabled_mac_mask |= t->mask; } else { int tmpsize = EVP_MD_size(md); - OPENSSL_assert(tmpsize >= 0); + if (!ossl_assert(tmpsize >= 0)) + return 0; ssl_mac_secret_size[i] = tmpsize; } } /* Make sure we can access MD5 and SHA1 */ - OPENSSL_assert(ssl_digest_methods[SSL_MD_MD5_IDX] != NULL); - OPENSSL_assert(ssl_digest_methods[SSL_MD_SHA1_IDX] != NULL); + if (!ossl_assert(ssl_digest_methods[SSL_MD_MD5_IDX] != NULL)) + return 0; + if (!ossl_assert(ssl_digest_methods[SSL_MD_SHA1_IDX] != NULL)) + return 0; disabled_mkey_mask = 0; disabled_auth_mask = 0; @@ -460,6 +463,8 @@ void ssl_load_ciphers(void) if ((disabled_auth_mask & (SSL_aGOST01 | SSL_aGOST12)) == (SSL_aGOST01 | SSL_aGOST12)) disabled_mkey_mask |= SSL_kGOST; + + return 1; } #ifndef OPENSSL_NO_COMP |