Remove the use of the ERR_GET_FUNC() macro.
The ERR_GET_FUNC() macro was removed in OpenSSL 3.0 [1]:
[[[
Removal of function code from the error codes
The function code part of the error code is now always set to 0. For that
reason the ERR_GET_FUNC() macro was removed. Applications must resolve the
error codes only using the library number and the reason code.
]]]
Remove its two current usages since there is no replacement for this concept in
the newer versions of OpenSSL.
[1] https://www.openssl.org/docs/man3.0/man7/migration_guide.html
Patch by: Denis Kovalchuk <denis.kovalchuk{_AT_}visualsvn.com>
* buckets/ssl_buckets.c:
(status_from_ssl_error): Remove ERR_GET_FUNC() from comment.
(ssl_need_client_cert): Do not log the function code of an error.
* test/MockHTTPinC/MockHTTP_server.c:
(sslHandshake): Do not log the function code of an error.
git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1901937 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
index 1b28560..901ddb6 100644
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -1027,7 +1027,6 @@
} else {
/*unsigned long l = ERR_peek_error();
int lib = ERR_GET_LIB(l);
- int func = ERR_GET_FUNC(l);
int reason = ERR_GET_REASON(l);*/
/* ### Detect more specific errors?
@@ -1654,8 +1653,7 @@
}
else {
serf__log(LOGLVL_ERROR, LOGCOMP_SSL, __FILE__, ctx->config,
- "OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
- ERR_GET_FUNC(err),
+ "OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
ERR_GET_REASON(err));
PKCS12_free(p12);
bio_meth_free(biom);
diff --git a/test/MockHTTPinC/MockHTTP_server.c b/test/MockHTTPinC/MockHTTP_server.c
index df89250..ceba318 100644
--- a/test/MockHTTPinC/MockHTTP_server.c
+++ b/test/MockHTTPinC/MockHTTP_server.c
@@ -3036,7 +3036,6 @@
default:
{
int lib = ERR_GET_LIB(l);
- int func = ERR_GET_FUNC(l);
int reason = ERR_GET_REASON(l);
if (lib == ERR_LIB_SSL
@@ -3050,8 +3049,8 @@
}
_mhLog(MH_VERBOSE, cctx->skt,
- "SSL Error %d: Library=%d, Function=%d, Reason=%d",
- ssl_err, lib, func, reason);
+ "SSL Error %d: Library=%d, Reason=%d",
+ ssl_err, lib, reason);
#if MH_VERBOSE
ERR_print_errors_fp(stderr);
#endif
