diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-09-04 21:45:56 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-12 17:59:52 +0200 |
| commit | 0cd1b144f99e9aabea15a158bd567cba81592039 (patch) | |
| tree | fbe4e57019f33d5a8006b10fdb3339fada6bb33a /crypto/pkcs12 | |
| parent | 6beb8b39ba8e4cb005c1fcd2586ba19e17f04b95 (diff) | |
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/pkcs12')
| -rw-r--r-- | crypto/pkcs12/pk12err.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c index c9fd1d7fe9..c3ad2bf708 100644 --- a/crypto/pkcs12/pk12err.c +++ b/crypto/pkcs12/pk12err.c @@ -56,7 +56,7 @@ static const ERR_STRING_DATA PKCS12_str_reasons[] = { int ERR_load_PKCS12_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(PKCS12_str_reasons[0].error) == NULL) + if (ERR_reason_error_string(PKCS12_str_reasons[0].error) == NULL) ERR_load_strings_const(PKCS12_str_reasons); #endif return 1; |