mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
b13342e933
ERR_func_error_string() essentially returns NULL, and since all function codes are now removed for all intents and purposes, this function has fallen out of use and cannot be modified to suit the data, since its only function is to interpret an error code. To compensate for the loss of error code, we instead provide new functions that extracts the function name strings from an error record: - ERR_get_error_func() - ERR_peek_error_func() - ERR_peek_last_error_func() Similarly, the once all encompasing functions ERR_peek_last_error_line_data(), ERR_peek_error_line_data() and ERR_get_error_line_data() lack the capability of getting the function name string, so we deprecate those and add these functions to replace them: - ERR_get_error_all() - ERR_peek_error_all() - ERR_peek_last_error_all() Finally, we adjust a few lines of code that used the now deprecated functions. Fixes #9756 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9756)
84 lines
2.2 KiB
C
84 lines
2.2 KiB
C
/*
|
|
* Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/opensslconf.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "testutil.h"
|
|
|
|
#if defined(OPENSSL_SYS_WINDOWS)
|
|
# include <windows.h>
|
|
#else
|
|
# include <errno.h>
|
|
#endif
|
|
|
|
/* Test that querying the error queue preserves the OS error. */
|
|
static int preserves_system_error(void)
|
|
{
|
|
#if defined(OPENSSL_SYS_WINDOWS)
|
|
SetLastError(ERROR_INVALID_FUNCTION);
|
|
ERR_get_error();
|
|
return TEST_int_eq(GetLastError(), ERROR_INVALID_FUNCTION);
|
|
#else
|
|
errno = EINVAL;
|
|
ERR_get_error();
|
|
return TEST_int_eq(errno, EINVAL);
|
|
#endif
|
|
}
|
|
|
|
/* Test that calls to ERR_add_error_[v]data append */
|
|
static int vdata_appends(void)
|
|
{
|
|
const char *data;
|
|
|
|
CRYPTOerr(0, ERR_R_MALLOC_FAILURE);
|
|
ERR_add_error_data(1, "hello ");
|
|
ERR_add_error_data(1, "world");
|
|
ERR_peek_error_data(&data, NULL);
|
|
return TEST_str_eq(data, "hello world");
|
|
}
|
|
|
|
static int raised_error(void)
|
|
{
|
|
const char *f, *data;
|
|
int l;
|
|
unsigned long e;
|
|
|
|
/*
|
|
* When OPENSSL_NO_ERR or OPENSSL_NO_FILENAMES, no file name or line
|
|
* number is saved, so no point checking them.
|
|
*/
|
|
#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
|
|
const char *file;
|
|
int line;
|
|
|
|
file = __FILE__;
|
|
line = __LINE__ + 2; /* The error is generated on the ERR_raise_data line */
|
|
#endif
|
|
ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR,
|
|
"calling exit()");
|
|
if (!TEST_ulong_ne(e = ERR_get_error_all(&f, &l, NULL, &data, NULL), 0)
|
|
|| !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)
|
|
#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
|
|
|| !TEST_int_eq(l, line)
|
|
|| !TEST_str_eq(f, file)
|
|
#endif
|
|
|| !TEST_str_eq(data, "calling exit()"))
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
int setup_tests(void)
|
|
{
|
|
ADD_TEST(preserves_system_error);
|
|
ADD_TEST(vdata_appends);
|
|
ADD_TEST(raised_error);
|
|
return 1;
|
|
}
|