diff options
author | Richard Levitte <levitte@openssl.org> | 2019-09-04 22:04:08 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-09-12 17:59:52 +0200 |
commit | b13342e933c507c4ce0eda0a0193339a111f27a5 (patch) | |
tree | 27251f00624c771cd42e0f649513ef8330659a40 /util | |
parent | 06ff79bd773d0b4214e4b6a8a1332a3355b17742 (diff) |
Modernise the ERR functionality further (new functions and deprecations)
ERR_func_error_string() essentially returns NULL, and since all
function codes are now removed for all intents and purposes, this
function has fallen out of use and cannot be modified to suit the
data, since its only function is to interpret an error code.
To compensate for the loss of error code, we instead provide new
functions that extracts the function name strings from an error
record:
- ERR_get_error_func()
- ERR_peek_error_func()
- ERR_peek_last_error_func()
Similarly, the once all encompasing functions
ERR_peek_last_error_line_data(), ERR_peek_error_line_data() and
ERR_get_error_line_data() lack the capability of getting the function
name string, so we deprecate those and add these functions to replace
them:
- ERR_get_error_all()
- ERR_peek_error_all()
- ERR_peek_last_error_all()
Finally, we adjust a few lines of code that used the now deprecated
functions.
Fixes #9756
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9756)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 07469a1f26..cadc4a57ba 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -515,7 +515,7 @@ DH_generate_parameters 526 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_0 BN_set_negative 527 3_0_0 EXIST::FUNCTION: i2d_TS_RESP_bio 528 3_0_0 EXIST::FUNCTION:TS ASYNC_WAIT_CTX_set_wait_fd 529 3_0_0 EXIST::FUNCTION: -ERR_func_error_string 530 3_0_0 EXIST::FUNCTION: +ERR_func_error_string 530 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 ASN1_STRING_data 531 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0 X509_CRL_add1_ext_i2d 532 3_0_0 EXIST::FUNCTION: i2d_TS_TST_INFO 533 3_0_0 EXIST::FUNCTION:TS @@ -757,7 +757,7 @@ EVP_rc5_32_12_16_cfb64 775 3_0_0 EXIST::FUNCTION:RC5 PKCS7_dataVerify 776 3_0_0 EXIST::FUNCTION: PKCS7_SIGNER_INFO_free 777 3_0_0 EXIST::FUNCTION: PKCS7_add_attrib_smimecap 778 3_0_0 EXIST::FUNCTION: -ERR_peek_last_error_line_data 779 3_0_0 EXIST::FUNCTION: +ERR_peek_last_error_line_data 779 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 EVP_PKEY_meth_set_sign 780 3_0_0 EXIST::FUNCTION: ASN1_i2d_bio 781 3_0_0 EXIST::FUNCTION: DSA_verify 782 3_0_0 EXIST::FUNCTION:DSA @@ -969,7 +969,7 @@ DH_get_default_method 993 3_0_0 EXIST::FUNCTION:DH PEM_proc_type 994 3_0_0 EXIST::FUNCTION: BIO_printf 995 3_0_0 EXIST::FUNCTION: a2i_IPADDRESS 996 3_0_0 EXIST::FUNCTION: -ERR_peek_error_line_data 997 3_0_0 EXIST::FUNCTION: +ERR_peek_error_line_data 997 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 ERR_unload_strings 998 3_0_0 EXIST::FUNCTION: SEED_cfb128_encrypt 999 3_0_0 EXIST::FUNCTION:SEED ASN1_BIT_STRING_it 1000 3_0_0 EXIST::FUNCTION: @@ -1554,7 +1554,7 @@ SRP_VBASE_free 1588 3_0_0 EXIST::FUNCTION:SRP PKCS7_add0_attrib_signing_time 1589 3_0_0 EXIST::FUNCTION: X509_STORE_set_flags 1590 3_0_0 EXIST::FUNCTION: UI_get0_output_string 1591 3_0_0 EXIST::FUNCTION: -ERR_get_error_line_data 1592 3_0_0 EXIST::FUNCTION: +ERR_get_error_line_data 1592 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 CTLOG_get0_name 1593 3_0_0 EXIST::FUNCTION:CT ASN1_TBOOLEAN_it 1594 3_0_0 EXIST::FUNCTION: RC2_set_key 1595 3_0_0 EXIST::FUNCTION:RC2 @@ -4753,3 +4753,12 @@ EVP_PKEY_CTX_get_params 4869 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_gettable_params 4870 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_settable_params 4871 3_0_0 EXIST::FUNCTION: EVP_CIPHER_CTX_tag_length 4872 3_0_0 EXIST::FUNCTION: +ERR_get_error_func 4873 3_0_0 EXIST::FUNCTION: +ERR_get_error_data 4874 3_0_0 EXIST::FUNCTION: +ERR_get_error_all 4875 3_0_0 EXIST::FUNCTION: +ERR_peek_error_func 4876 3_0_0 EXIST::FUNCTION: +ERR_peek_error_data 4877 3_0_0 EXIST::FUNCTION: +ERR_peek_error_all 4878 3_0_0 EXIST::FUNCTION: +ERR_peek_last_error_func 4879 3_0_0 EXIST::FUNCTION: +ERR_peek_last_error_data 4880 3_0_0 EXIST::FUNCTION: +ERR_peek_last_error_all 4881 3_0_0 EXIST::FUNCTION: |