From 0cd1b144f99e9aabea15a158bd567cba81592039 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 4 Sep 2019 21:45:56 +0200 Subject: util/mkerr.pl: make it not depend on the function code The output C code was made to use ERR_func_error_string() to see if a string table was already loaded or not. Since this function returns NULL always, this check became useless. Change it to use ERR_reason_error_string() instead, as there's no reason to believe we will get rid of reason strings, ever. To top it off, we rebuild all affected C sources. Fixes #9756 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9756) --- crypto/ui/ui_err.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/ui') diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c index 7d6352b25b..2b564f71be 100644 --- a/crypto/ui/ui_err.c +++ b/crypto/ui/ui_err.c @@ -39,7 +39,7 @@ static const ERR_STRING_DATA UI_str_reasons[] = { int ERR_load_UI_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(UI_str_reasons[0].error) == NULL) + if (ERR_reason_error_string(UI_str_reasons[0].error) == NULL) ERR_load_strings_const(UI_str_reasons); #endif return 1; -- cgit v1.2.3