diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 14:39:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-11 12:12:23 +0100 |
| commit | c48ffbcca1d0213c6bcbe85de7bb5dd23c76438d (patch) | |
| tree | bcc8cd093087c7c10c681f343e4b072588430416 /ssl/ssl_conf.c | |
| parent | e92519b5a6ad5fa1ca36316dd9256e65dcb2c6db (diff) | |
SSL: refactor all SSLfatal() calls
Since SSLfatal() doesn't take a function code any more, we drop that
argument everywhere. Also, we convert all combinations of SSLfatal()
and ERR_add_data() to an SSLfatal_data() call.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13316)
Diffstat (limited to 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 13fcb074d5..96fddfd4cc 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -872,17 +872,14 @@ int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value) return 2; if (rv == -2) return -2; - if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS) { - ERR_raise(ERR_LIB_SSL, SSL_R_BAD_VALUE); - ERR_add_error_data(4, "cmd=", cmd, ", value=", value); - } + if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS) + ERR_raise_data(ERR_LIB_SSL, SSL_R_BAD_VALUE, + "cmd=%s, value=%s", cmd, value); return 0; } - if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS) { - ERR_raise(ERR_LIB_SSL, SSL_R_UNKNOWN_CMD_NAME); - ERR_add_error_data(2, "cmd=", cmd); - } + if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS) + ERR_raise_data(ERR_LIB_SSL, SSL_R_UNKNOWN_CMD_NAME, "cmd=%s", cmd); return -2; } |