merge 1.11.2

This commit is contained in:
Alex Fabijanic
2022-04-16 21:10:45 +02:00
12 changed files with 138 additions and 51 deletions

View File

@@ -157,12 +157,10 @@ void SecureSocketImpl::connectSSL(bool performHandshake)
}
SSL_set_bio(_pSSL, pBIO, pBIO);
#if OPENSSL_VERSION_NUMBER >= 0x0908060L && !defined(OPENSSL_NO_TLSEXT)
if (!_peerHostName.empty())
{
SSL_set_tlsext_host_name(_pSSL, _peerHostName.c_str());
}
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
if(_pContext->ocspStaplingResponseVerificationEnabled())