Merge RP1A.191114.001
Change-Id: I684562a842a971da71dffa946e9f5f8f7761badd
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 760758d..d016a4b 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -114,6 +114,10 @@
#define OPENSSL_NO_SSL2
#endif
+#if defined(OPENSSL_IS_BORINGSSL)
+#define CONF_modules_free()
+#endif
+
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
!(defined(LIBRESSL_VERSION_NUMBER) && \
LIBRESSL_VERSION_NUMBER < 0x20700000L)
@@ -2828,6 +2832,10 @@
if(SSL_CONN_CONFIG(verifystatus))
SSL_set_tlsext_status_type(BACKEND->handle, TLSEXT_STATUSTYPE_ocsp);
#endif
+#ifdef OPENSSL_IS_BORINGSSL
+ if(SSL_CONN_CONFIG(verifystatus))
+ SSL_enable_ocsp_stapling(BACKEND->handle);
+#endif /* OPENSSL_IS_BORINGSSL */
#if defined(OPENSSL_IS_BORINGSSL) && defined(ALLOW_RENEG)
SSL_set_renegotiate_mode(BACKEND->handle, ssl_renegotiate_freely);
@@ -4024,6 +4032,9 @@
static bool Curl_ossl_cert_status_request(void)
{
+#ifdef OPENSSL_IS_BORINGSSL
+ return TRUE;
+#endif
#if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \
!defined(OPENSSL_NO_OCSP)
return TRUE;