Author: ivan
Date: Tue Apr 25 16:10:55 2023
New Revision: 1909406
URL: http://svn.apache.org/viewvc?rev=1909406&view=rev
Log:
Do not include openssl/applink.c: we do not use _fp() OpenSSL API since
r1909252.
* CMakeLists.txt
* SConstruct
(): Do not test for openssl/applink.c.
* test/test_ssl.c
(): Do not include openssl/applink.c.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/SConstruct
serf/trunk/test/test_ssl.c
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1909406&r1=1909405&r2=1909406&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Tue Apr 25 16:10:55 2023
@@ -243,7 +243,6 @@ CheckFunctionMacro("OPENSSL_malloc_init"
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES}
${SERF_STANDARD_LIBRARIES})
CheckFunctionMacro("SSL_library_init" "SERF_HAVE_OPENSSL_SSL_LIBRARY_INIT"
"openssl/ssl.h"
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_LIBRARIES}
${SERF_STANDARD_LIBRARIES})
-CheckHeader("openssl/applink.c" "SERF_HAVE_OPENSSL_APPLINK_C"
${OPENSSL_INCLUDE_DIR})
CheckHeader("stdbool.h" "HAVE_STDBOOL_H=1")
CheckType("OSSL_HANDSHAKE_STATE" "openssl/ssl.h"
"SERF_HAVE_OSSL_HANDSHAKE_STATE" ${OPENSSL_INCLUDE_DIR})
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1909406&r1=1909405&r2=1909406&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Tue Apr 25 16:10:55 2023
@@ -507,8 +507,6 @@ else:
# Check for OpenSSL functions which are only available in some of
# the versions we support. Also handles forks like LibreSSL.
conf = Configure(env)
-if conf.CheckCHeader('openssl/applink.c'):
- env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_APPLINK_C'])
if not conf.CheckFunc('BIO_set_init', '#include <openssl/crypto.h>'):
env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
if not conf.CheckFunc('X509_STORE_get0_param', '#include <openssl/crypto.h>'):
Modified: serf/trunk/test/test_ssl.c
URL:
http://svn.apache.org/viewvc/serf/trunk/test/test_ssl.c?rev=1909406&r1=1909405&r2=1909406&view=diff
==============================================================================
--- serf/trunk/test/test_ssl.c (original)
+++ serf/trunk/test/test_ssl.c Tue Apr 25 16:10:55 2023
@@ -35,19 +35,6 @@
#include <openssl/ocsp.h>
#endif
-#if defined(WIN32) && defined(_DEBUG) && defined(SERF_HAVE_OPENSSL_APPLINK_C)
-/* Include this file to allow running a Debug build of serf with a Release
- build of OpenSSL. Note: his file is not available on OpenSSL 1.1.x. */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(push)
-#pragma warning(disable: 4152)
-#endif
-#include <openssl/applink.c>
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(pop)
-#endif
-#endif
-
/* Test setting up the openssl library. */
static void test_ssl_init(CuTest *tc)
{
