diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 12:18:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-11 12:12:11 +0100 |
| commit | 6849b73ccc38ea95e4b9d50b01e1c94f5ce8bca7 (patch) | |
| tree | 2e5ab6caac3ebc00a6b9fba694aefd666d439799 /ssl/ssl_mcnf.c | |
| parent | 9787b5b81fd9ca41427fa7b89de4d9518e988f6a (diff) | |
| download | openssl-new-6849b73ccc38ea95e4b9d50b01e1c94f5ce8bca7.tar.gz | |
Convert all {NAME}err() in ssl/ to their corresponding ERR_raise() call
This was done using util/err-to-raise
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13316)
Diffstat (limited to 'ssl/ssl_mcnf.c')
| -rw-r--r-- | ssl/ssl_mcnf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c index 82003ba69e..2b8ef12592 100644 --- a/ssl/ssl_mcnf.c +++ b/ssl/ssl_mcnf.c @@ -32,7 +32,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) OSSL_LIB_CTX *libctx = NULL; if (s == NULL && ctx == NULL) { - SSLerr(SSL_F_SSL_DO_CONFIG, ERR_R_PASSED_NULL_PARAMETER); + ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER); goto err; } @@ -40,7 +40,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) name = "system_default"; if (!conf_ssl_name_find(name, &idx)) { if (!system) { - SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_INVALID_CONFIGURATION_NAME); + ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_CONFIGURATION_NAME); ERR_add_error_data(2, "name=", name); } goto err; @@ -74,9 +74,9 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system) rv = SSL_CONF_cmd(cctx, cmdstr, arg); if (rv <= 0) { if (rv == -2) - SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_UNKNOWN_COMMAND); + ERR_raise(ERR_LIB_SSL, SSL_R_UNKNOWN_COMMAND); else - SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_BAD_VALUE); + ERR_raise(ERR_LIB_SSL, SSL_R_BAD_VALUE); ERR_add_error_data(6, "section=", name, ", cmd=", cmdstr, ", arg=", arg); goto err; |