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 /test | |
| 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 'test')
| -rw-r--r-- | test/cmp_ctx_test.c | 10 | ||||
| -rw-r--r-- | test/cmp_server_test.c | 2 | ||||
| -rw-r--r-- | test/errtest.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c index 72972fbaca..76c8c4613b 100644 --- a/test/cmp_ctx_test.c +++ b/test/cmp_ctx_test.c @@ -143,7 +143,7 @@ static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture) res = 0; # ifndef OPENSSL_NO_STDIO - CMPerr(0, CMP_R_MULTIPLE_SAN_SOURCES); + ERR_raise(ERR_LIB_CMP, CMP_R_MULTIPLE_SAN_SOURCES); OSSL_CMP_CTX_print_errors(ctx); /* should print above error to STDERR */ # endif @@ -153,9 +153,9 @@ static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture) if (!TEST_true(ctx->log_cb == msg_total_size_log_cb)) { res = 0; } else { - CMPerr(0, CMP_R_INVALID_ARGS); + ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS); base_err_msg_size = strlen("INVALID_ARGS"); - CMPerr(0, CMP_R_NULL_ARGUMENT); + ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); base_err_msg_size += strlen("NULL_ARGUMENT"); expected_size = base_err_msg_size; ossl_cmp_add_error_data("data1"); /* should prepend separator " : " */ @@ -168,7 +168,7 @@ static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture) if (!TEST_int_eq(msg_total_size, expected_size)) res = 0; - CMPerr(0, CMP_R_INVALID_ARGS); + ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS); base_err_msg_size = strlen("INVALID_ARGS") + strlen(" : "); expected_size = base_err_msg_size; while (expected_size < 4096) { /* force split */ @@ -498,7 +498,7 @@ static X509_STORE *X509_STORE_new_1(void) #define RET_IF_NULL_ARG(ctx, ret) \ if (ctx == NULL) { \ - CMPerr(0, CMP_R_NULL_ARGUMENT); \ + ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \ return ret; \ } diff --git a/test/cmp_server_test.c b/test/cmp_server_test.c index d2a34695c3..8d0e1de759 100644 --- a/test/cmp_server_test.c +++ b/test/cmp_server_test.c @@ -55,7 +55,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx, STACK_OF(X509) **chainOut, STACK_OF(X509) **caPubs) { - CMPerr(0, dummy_errorCode); + ERR_raise(ERR_LIB_CMP, dummy_errorCode); return NULL; } diff --git a/test/errtest.c b/test/errtest.c index e8c7d44306..443bd0a57d 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -111,7 +111,7 @@ static int vdata_appends(void) { const char *data; - CRYPTOerr(0, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); ERR_add_error_data(1, "hello "); ERR_add_error_data(1, "world"); ERR_peek_error_data(&data, NULL); |