summaryrefslogtreecommitdiffstats
path: root/crypto/cpt_err.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-09-04 21:45:56 +0200
committerRichard Levitte <levitte@openssl.org>2019-09-12 17:59:52 +0200
commit0cd1b144f99e9aabea15a158bd567cba81592039 (patch)
treefbe4e57019f33d5a8006b10fdb3339fada6bb33a /crypto/cpt_err.c
parentBIO_f_zlib: Properly handle BIO_CTRL_PENDING and BIO_CTRL_WPENDING calls. (diff)
downloadopenssl-0cd1b144f99e9aabea15a158bd567cba81592039.tar.xz
openssl-0cd1b144f99e9aabea15a158bd567cba81592039.zip
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 <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9756)
Diffstat (limited to 'crypto/cpt_err.c')
-rw-r--r--crypto/cpt_err.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index 012f181d2a..0028b329a3 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -52,7 +52,7 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
int ERR_load_CRYPTO_strings(void)
{
#ifndef OPENSSL_NO_ERR
- if (ERR_func_error_string(CRYPTO_str_reasons[0].error) == NULL)
+ if (ERR_reason_error_string(CRYPTO_str_reasons[0].error) == NULL)
ERR_load_strings_const(CRYPTO_str_reasons);
#endif
return 1;