aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-01-22 16:20:26 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-01-22 16:39:01 +0100
commitd6c4695dcd3b2eb73594b9d2891c585fcbaf7f6a (patch)
tree212ed28b9ea11ffb83095125413817e3c2e42210
parent261208d4327902cc8f814ed112cc476fe75b5637 (diff)
BoringSSL: no PKCS12 support nor ERR_remove_state
-rw-r--r--lib/vtls/openssl.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 5bccd6dce..2d6ad2dd9 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -106,8 +106,10 @@
#undef HAVE_ENGINE_LOAD_FOUR_ARGS
#endif
-#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && defined(HAVE_OPENSSL_PKCS12_H)
-/* OpenSSL has PKCS 12 support */
+#if (OPENSSL_VERSION_NUMBER >= 0x00903001L) && \
+ defined(HAVE_OPENSSL_PKCS12_H) && \
+ !defined(OPENSSL_IS_BORINGSSL)
+/* OpenSSL has PKCS 12 support, BoringSSL does not */
#define HAVE_PKCS12_SUPPORT
#else
/* OpenSSL/SSLEay does not have PKCS12 support */
@@ -131,7 +133,10 @@
#define X509_STORE_set_flags(x,y) Curl_nop_stmt
#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
#endif