diff options
author | Rich Salz <rsalz@akamai.com> | 2019-06-11 21:42:42 +0200 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-07-22 16:24:56 +0200 |
commit | 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (patch) | |
tree | 22bf3958a3b0046ae690e57dd5eaad90c6fcf25a /test/errtest.c | |
parent | Allocate DRBG additional data pool from non-secure memory (diff) | |
download | openssl-56c3a135b239f4c8ccfdbbb1668880d4c39d5b87.tar.xz openssl-56c3a135b239f4c8ccfdbbb1668880d4c39d5b87.zip |
Add ERR_put_func_error, and use it.
Change SYSerr to have the function name; remove SYS_F_xxx defines
Add a test and documentation.
Use get_last_socket_err, which removes some ifdef's in OpenSSL code.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9072)
Diffstat (limited to 'test/errtest.c')
-rw-r--r-- | test/errtest.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/test/errtest.c b/test/errtest.c index df222da6f6..88ff860092 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -44,9 +44,28 @@ static int vdata_appends(void) return TEST_str_eq(data, "hello world"); } +/* Test that setting a platform error sets the right values. */ +static int platform_error(void) +{ + const char *file = __FILE__, *f, *data; + const int line = __LINE__; + int l; + unsigned long e; + + ERR_put_func_error(ERR_LIB_SYS, "exit", ERR_R_INTERNAL_ERROR, file, line); + if (!TEST_ulong_ne(e = ERR_get_error_line_data(&f, &l, &data, NULL), 0) + || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR) + || !TEST_int_eq(l, line) + || !TEST_str_eq(f, file) + || !TEST_str_eq(data, "calling function exit")) + return 0; + return 1; +} + int setup_tests(void) { ADD_TEST(preserves_system_error); ADD_TEST(vdata_appends); + ADD_TEST(platform_error); return 1; } |