Author: kotkov
Date: Thu May 18 09:31:26 2023
New Revision: 1909902
URL: http://svn.apache.org/viewvc?rev=1909902&view=rev
Log:
On the '1.3.x' branch: Merge r1901937 from trunk:
* r1901937
Remove the use of ERR_GET_FUNC() to allow building against OpenSSL 3.
Justification:
Serf should work with OpenSSL 3.
Branch: ^/serf/branches/1.3.x-r1901937
Votes:
+1: kotkov, ivan
Modified:
serf/branches/1.3.x/ (props changed)
serf/branches/1.3.x/STATUS
serf/branches/1.3.x/buckets/ssl_buckets.c
Propchange: serf/branches/1.3.x/
------------------------------------------------------------------------------
Merged /serf/trunk:r1901937
Merged /serf/branches/1.3.x-r1901937:r1909250-1909901
Modified: serf/branches/1.3.x/STATUS
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/STATUS?rev=1909902&r1=1909901&r2=1909902&view=diff
==============================================================================
--- serf/branches/1.3.x/STATUS (original)
+++ serf/branches/1.3.x/STATUS Thu May 18 09:31:26 2023
@@ -35,14 +35,6 @@ Candidate changes:
this point for the 1.3.x branch
- Seems to only be required for LibreSSL, not OpenSSL)
- * r1901937
- Remove the use of ERR_GET_FUNC() to allow building against OpenSSL 3.
- Justification:
- Serf should work with OpenSSL 3.
- Branch: ^/serf/branches/1.3.x-r1901937
- Votes:
- +1: kotkov, ivan
-
* r1902208, r1902304
Rework BIO control handlers to support BIO_CTRL_EOF and to properly respond
to unknown control values.
Modified: serf/branches/1.3.x/buckets/ssl_buckets.c
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/buckets/ssl_buckets.c?rev=1909902&r1=1909901&r2=1909902&view=diff
==============================================================================
--- serf/branches/1.3.x/buckets/ssl_buckets.c (original)
+++ serf/branches/1.3.x/buckets/ssl_buckets.c Thu May 18 09:31:26 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);
