diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 16:14:00 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-13 09:35:31 +0100 |
| commit | a150f8e1fcc38752fef4d7c75d765d8efc7d46d6 (patch) | |
| tree | f7f62c9a5d8407d8b17820fbef67378aa7b9ddbb /crypto/cmp/cmp_client.c | |
| parent | 9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2 (diff) | |
CRYPTO: refactor ERR_raise()+ERR_add_error_data() to ERR_raise_data()
This is not done absolutely everywhere, as there are places where
the use of ERR_add_error_data() is quite complex, but at least the
simple cases are done.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13318)
Diffstat (limited to 'crypto/cmp/cmp_client.c')
| -rw-r--r-- | crypto/cmp/cmp_client.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index dd974413c0..c19eea818f 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -169,9 +169,9 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req, ctx->msg_timeout = msg_timeout; /* restore original value */ if (*rep == NULL) { - ERR_raise(ERR_LIB_CMP, CMP_R_TRANSFER_ERROR); /* or receiving response */ - ERR_add_error_data(2, "request sent: ", req_type_str); - ERR_add_error_data(2, ", expected response: ", expected_type_str); + ERR_raise_data(ERR_LIB_CMP, CMP_R_TRANSFER_ERROR, /* or receiving response */ + "request sent: %s, expected response: %s", + req_type_str, expected_type_str); return 0; } @@ -633,11 +633,14 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid, /* not throwing failure earlier as transfer_cb may call ERR_clear_error() */ if (fail_info != 0) { - ERR_raise(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED); - ERR_add_error_data(2, "rejecting newly enrolled cert with subject: ", + if (txt == NULL) + ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED, + "rejecting newly enrolled cert with subject: %s", subj); - if (txt != NULL) - ERR_add_error_txt("; ", txt); + else + ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED, + "rejecting newly enrolled cert with subject: %s; %s", + subj, txt); ret = 0; } OPENSSL_free(subj); |