From 3d518d3d813da40195ff9fe5f4567ab9f09ddcc9 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Wed, 27 May 2020 12:10:52 +1000 Subject: [PATCH] Fix errtest for older compilers Some older compilers use "unknown function" if they dont support __func, so the test using ERR_PUT_error needed to compensate for this when comparing against the expected value. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/11967) --- test/errtest.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/errtest.c b/test/errtest.c index cc2f6612d1..9adf4ca917 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "testutil.h" @@ -24,17 +25,20 @@ static int test_print_error_format(void) { - static const char expected[] = - ":error::system library:test_print_error_format:Operation not permitted:" + static const char expected_format[] = + ":error::system library:%s:Operation not permitted:" # ifndef OPENSSL_NO_FILENAMES "errtest.c:30:"; # else ":0:"; # endif + char expected[256]; char *out = NULL, *p = NULL; int ret = 0, len; BIO *bio = NULL; + BIO_snprintf(expected, sizeof(expected), expected_format, OPENSSL_FUNC); + if (!TEST_ptr(bio = BIO_new(BIO_s_mem()))) return 0; -- 2.25.1