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)

diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index 306656a2c102e23245575e54418b93feb4fb7dc9..7ca0b970a1b2c603b84277d1d6f772aeeddc8ebb 100644 (file)
--- 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 cf3455bcca02eff2adb00703a97779eba6ebc497..38aaacd6cfcaf1d7280d40b93f91a559528679ca 100644 (file)
--- 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