summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-07-24 13:25:56 +0200
committerRichard Levitte <levitte@openssl.org>2019-07-31 06:44:45 +0200
commitadd8c8e9647a71cc755dea22490e2075e342624b (patch)
tree5189711696c4c1b4bc9d6357fbfa00854012ae76 /util
parentERR: Implement the macros ERR_raise() and ERR_raise_data() and use them (diff)
downloadopenssl-add8c8e9647a71cc755dea22490e2075e342624b.tar.xz
openssl-add8c8e9647a71cc755dea22490e2075e342624b.zip
ERR: Remove ERR_put_func_error() and reimplement ERR_put_error() as a macro
Also, deprecate ERR_put_error() Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/9452)
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num4
-rw-r--r--util/private.num1
2 files changed, 3 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index da7395c9cb..a6c5097e1c 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -998,7 +998,7 @@ OPENSSL_LH_get_down_load 1023 3_0_0 EXIST::FUNCTION:
EVP_md4 1024 3_0_0 EXIST::FUNCTION:MD4
X509_set_subject_name 1025 3_0_0 EXIST::FUNCTION:
i2d_PKCS8PrivateKey_nid_bio 1026 3_0_0 EXIST::FUNCTION:
-ERR_put_error 1027 3_0_0 EXIST::FUNCTION:
+ERR_put_error 1027 3_0_0 NOEXIST::FUNCTION:
ERR_add_error_data 1028 3_0_0 EXIST::FUNCTION:
X509_ALGORS_it 1029 3_0_0 EXIST::FUNCTION:
MD5_Update 1030 3_0_0 EXIST::FUNCTION:MD5
@@ -4690,7 +4690,7 @@ EVP_KEYMGMT_up_ref 4795 3_0_0 EXIST::FUNCTION:
EVP_KEYMGMT_free 4796 3_0_0 EXIST::FUNCTION:
EVP_KEYMGMT_provider 4797 3_0_0 EXIST::FUNCTION:
X509_PUBKEY_dup 4798 3_0_0 EXIST::FUNCTION:
-ERR_put_func_error 4799 3_0_0 EXIST::FUNCTION:
+ERR_put_func_error 4799 3_0_0 NOEXIST::FUNCTION:
EVP_MD_name 4800 3_0_0 EXIST::FUNCTION:
EVP_CIPHER_name 4801 3_0_0 EXIST::FUNCTION:
EVP_MD_provider 4802 3_0_0 EXIST::FUNCTION:
diff --git a/util/private.num b/util/private.num
index 3c00589c9b..82cb72e606 100644
--- a/util/private.num
+++ b/util/private.num
@@ -195,6 +195,7 @@ ERR_GET_LIB define
ERR_GET_REASON define
ERR_PACK define
ERR_free_strings define deprecated 1.1.0
+ERR_put_error define deprecated 3.0
ERR_load_crypto_strings define deprecated 1.1.0
ERR_raise define
ERR_raise_data define