Author: kotkov
Date: Wed Apr 19 16:58:42 2023
New Revision: 1909251
URL: http://svn.apache.org/viewvc?rev=1909251&view=rev
Log:
On the '1.3.x-r1901937' branch: Merge r1901937 from trunk (Remove the use
of the ERR_GET_FUNC() macro, which was removed in OpenSSL 3.0).
This required resolving a text conflict in buckets/ssl_buckets.c.
Modified:
serf/branches/1.3.x-r1901937/ (props changed)
serf/branches/1.3.x-r1901937/buckets/ssl_buckets.c
Propchange: serf/branches/1.3.x-r1901937/
------------------------------------------------------------------------------
Merged /serf/trunk:r1901937
Modified: serf/branches/1.3.x-r1901937/buckets/ssl_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x-r1901937/buckets/ssl_buckets.c?rev=1909251&r1=1909250&r2=1909251&view=diff
==============================================================================
--- serf/branches/1.3.x-r1901937/buckets/ssl_buckets.c (original)
+++ serf/branches/1.3.x-r1901937/buckets/ssl_buckets.c Wed Apr 19 16:58:42 2023
@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl
return 0;
}
else {
- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
- ERR_GET_FUNC(err),
+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
ERR_GET_REASON(err));
PKCS12_free(p12);
bio_meth_free(biom);