diff options
| author | Pauli <pauli@openssl.org> | 2021-07-06 18:50:11 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-07-06 20:14:36 +1000 |
| commit | 561e5cda7b7139c665dd9d2f39058b4081da54d2 (patch) | |
| tree | 84d61a844e2e1625b833c057af869e1c25ecd90e | |
| parent | ef1e0242a9aec5210845df86162c0b9219ff0f11 (diff) | |
err: remove ERR_GET_FUNC()
This is problematic in 3.0 because the function codes are all defined as zero.
This leads to either every error matching or no error ever matching. Both
are problematic for users. The OTC vote resolved to remove this function
completely.
Fixes #15946
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16004)
| -rw-r--r-- | include/openssl/err.h.in | 5 | ||||
| -rw-r--r-- | util/other.syms | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in index 306656a2c1..7ca0b970a1 100644 --- a/include/openssl/err.h.in +++ b/include/openssl/err.h.in @@ -247,11 +247,6 @@ static ossl_unused ossl_inline int ERR_GET_LIB(unsigned long errcode) return (errcode >> ERR_LIB_OFFSET) & ERR_LIB_MASK; } -static ossl_unused ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused) -{ - return 0; -} - static ossl_unused ossl_inline int ERR_GET_RFLAGS(unsigned long errcode) { if (ERR_SYSTEM_ERROR(errcode)) diff --git a/util/other.syms b/util/other.syms index cf3455bcca..38aaacd6cf 100644 --- a/util/other.syms +++ b/util/other.syms @@ -234,7 +234,6 @@ DTLS_get_link_min_mtu define DTLS_set_link_mtu define ENGINE_cleanup define deprecated 1.1.0 ERR_FATAL_ERROR define -ERR_GET_FUNC define ERR_GET_LIB define ERR_GET_REASON define ERR_PACK define |