From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 22 Jan 2015 15:20:26 +0000 (+0100)
Subject: BoringSSL: no PKCS12 support nor ERR_remove_state
X-Git-Tag: curl-7_41_0~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6c4695dcd3b2eb73594b9d2891c585fcbaf7f6a;p=curl

BoringSSL: no PKCS12 support nor ERR_remove_state
---

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