diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 12:23:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-13 09:35:02 +0100 |
| commit | 9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2 (patch) | |
| tree | e82c26569e5a952980e65a746af920beed602aab /crypto/conf/conf_ssl.c | |
| parent | 31a6b52f6db009c639c67387a707dd235f29a430 (diff) | |
Convert all {NAME}err() in crypto/ to their corresponding ERR_raise() call
This includes error reporting for libcrypto sub-libraries in surprising
places.
This was done using util/err-to-raise
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13318)
Diffstat (limited to 'crypto/conf/conf_ssl.c')
| -rw-r--r-- | crypto/conf/conf_ssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index 5b949be616..6512dda132 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -69,9 +69,9 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) cmd_lists = NCONF_get_section(cnf, ssl_conf_section); if (sk_CONF_VALUE_num(cmd_lists) <= 0) { if (cmd_lists == NULL) - CONFerr(CONF_F_SSL_MODULE_INIT, CONF_R_SSL_SECTION_NOT_FOUND); + ERR_raise(ERR_LIB_CONF, CONF_R_SSL_SECTION_NOT_FOUND); else - CONFerr(CONF_F_SSL_MODULE_INIT, CONF_R_SSL_SECTION_EMPTY); + ERR_raise(ERR_LIB_CONF, CONF_R_SSL_SECTION_EMPTY); ERR_add_error_data(2, "section=", ssl_conf_section); goto err; } @@ -88,10 +88,10 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf) if (sk_CONF_VALUE_num(cmds) <= 0) { if (cmds == NULL) - CONFerr(CONF_F_SSL_MODULE_INIT, + ERR_raise(ERR_LIB_CONF, CONF_R_SSL_COMMAND_SECTION_NOT_FOUND); else - CONFerr(CONF_F_SSL_MODULE_INIT, + ERR_raise(ERR_LIB_CONF, CONF_R_SSL_COMMAND_SECTION_EMPTY); ERR_add_error_data(4, "name=", sect->name, ", value=", sect->value); goto err; |