mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-17 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

openssl: Disable OCSP in old versions of OpenSSL

Browse Source 
Versions of OpenSSL prior to v0.9.8h do not support the necessary
functions for OCSP stapling.
This commit is contained in:
Steve Holme 2015-02-09 20:58:33 +00:00
parent 7eebf9a3fb
commit d771b44e53
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vtls/openssl.c
View File

@ -1323,7 +1323,8 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
return result; return result;
} }
#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \
!defined(HAVE_BORINGSSL)
static CURLcode verifystatus(struct connectdata *conn, static CURLcode verifystatus(struct connectdata *conn,
struct ssl_connect_data *connssl) struct ssl_connect_data *connssl)
{ {
@ -2060,7 +2061,8 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \
!defined(HAVE_BORINGSSL)
if(data->set.ssl.verifystatus) if(data->set.ssl.verifystatus)
SSL_set_tlsext_status_type(connssl->handle, TLSEXT_STATUSTYPE_ocsp); SSL_set_tlsext_status_type(connssl->handle, TLSEXT_STATUSTYPE_ocsp);
#endif #endif
@ -2748,7 +2750,8 @@ static CURLcode servercert(struct connectdata *conn,
infof(data, "\t SSL certificate verify ok.\n"); infof(data, "\t SSL certificate verify ok.\n");
} }
#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \
!defined(HAVE_BORINGSSL)
if(data->set.ssl.verifystatus) { if(data->set.ssl.verifystatus) {
result = verifystatus(conn, connssl); result = verifystatus(conn, connssl);
if(result) { if(result) {
@ -3202,7 +3205,8 @@ void Curl_ossl_md5sum(unsigned char *tmp, /* input */
bool Curl_ossl_cert_status_request(void) bool Curl_ossl_cert_status_request(void)
{ {
#if !defined(HAVE_BORINGSSL) && !defined(OPENSSL_NO_TLSEXT) #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_NO_TLSEXT) && \
!defined(HAVE_BORINGSSL)
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;