moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 14:05:03 -05:00
Code Issues Releases Wiki Activity

BoringSSL: no PKCS12 support nor ERR_remove_state

Browse Source
This commit is contained in:
Daniel Stenberg 2015-01-22 16:20:26 +01:00
parent 261208d432
commit d6c4695dcd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vtls/openssl.c
View File

@ -106,8 +106,10 @@
#undef HAVE_ENGINE_LOAD_FOUR_ARGS #undef HAVE_ENGINE_LOAD_FOUR_ARGS
#endif #endif
#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H) #if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && \
/* OpenSSL has PKCS 12 support */ defined(HAVE_OPENSSL_PKCS12_H) && \
!defined(OPENSSL_IS_BORINGSSL)
/* OpenSSL has PKCS 12 support, BoringSSL does not */
#define HAVE_PKCS12_SUPPORT #define HAVE_PKCS12_SUPPORT
#else #else
/* OpenSSL/SSLEay does not have PKCS12 support */ /* OpenSSL/SSLEay does not have PKCS12 support */
@ -131,7 +133,10 @@
#define X509_STORE_set_flags(x,y) Curl_nop_stmt #define X509_STORE_set_flags(x,y) Curl_nop_stmt
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #ifdef OPENSSL_IS_BORINGSSL
/* BoringSSL has no ERR_remove_state() */
#define ERR_remove_state(x)
#elif (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define HAVE_ERR_REMOVE_THREAD_STATE 1 #define HAVE_ERR_REMOVE_THREAD_STATE 1
#endif #endif