Commit f2ad762c authored by Adam Simpkins's avatar Adam Simpkins Committed by Facebook Github Bot

update OpenSSLPortabilityTest to work with old OpenSSL versions

Summary:
Update OpenSSLPortabilityTest to work with older OpenSSL versions that do not
have the ASN1_TIME_diff() function.

Reviewed By: anirudhvr

Differential Revision: D6843333

fbshipit-source-id: 1d9cb104676296170df28fda9285c76680f8ef92
parent bfed8ebb
......@@ -51,6 +51,7 @@
#cmakedefine FOLLY_HAVE_PWRITEV 1
#cmakedefine FOLLY_HAVE_CLOCK_GETTIME 1
#cmakedefine FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK 1
#cmakedefine FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF 1
#cmakedefine FOLLY_HAVE_IFUNC 1
#cmakedefine FOLLY_HAVE_STD__IS_TRIVIALLY_COPYABLE 1
......
include(CheckCXXSourceCompiles)
include(CheckIncludeFileCXX)
include(CheckFunctionExists)
find_package(Boost 1.51.0 MODULE
COMPONENTS
......@@ -63,6 +64,9 @@ endif()
find_package(OpenSSL MODULE REQUIRED)
list(APPEND FOLLY_LINK_LIBRARIES ${OPENSSL_LIBRARIES})
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${OPENSSL_INCLUDE_DIR})
list(APPEND CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_function_exists(ASN1_TIME_diff FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF)
find_package(PThread MODULE)
set(FOLLY_HAVE_PTHREAD ${LIBPTHREAD_FOUND})
......
......@@ -96,12 +96,16 @@ TEST(OpenSSLPortabilityTest, TestX509RevokedApi) {
EXPECT_EQ(0, ASN1_INTEGER_cmp(serial, retrieved_serial));
#if FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF
int diff_days;
int diff_secs;
ASN1_TIME_diff(&diff_days, &diff_secs, revocation_date, retrieved_date);
EXPECT_EQ(0, diff_days);
EXPECT_EQ(0, diff_secs);
#else
(void)revocation_date;
(void)retrieved_date;
#endif
ASN1_INTEGER_free(serial);
ASN1_TIME_free(revocation_date);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment