iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 04:52:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Csocket] Support and default to TLSv1.2

Browse Source 
Updates to 21ac28cc29e9256a21a9aa217e29638360c266d0 of Csocket
This commit is contained in:
Kyle Fuller
2014-04-20 23:35:29 +01:00
parent bc795f03cb
commit 5e90bc380b
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Csocket.cpp
View File

@@ -1355,6 +1355,26 @@ bool Csock::SSLClientSetup()
return( false );
}
break;
case TLS1_2:
#ifdef TLS1_2_VERSION
m_ssl_ctx = SSL_CTX_new( TLSv1_2_client_method() );
if( !m_ssl_ctx )
{
CS_DEBUG( "WARNING: MakeConnection .... TLSv1_2_client_method failed!" );
return( false );
}
break;
#endif
case TLS1_1:
#ifdef TLS1_1_VERSION
m_ssl_ctx = SSL_CTX_new( TLSv1_1_client_method() );
if( !m_ssl_ctx )
{
CS_DEBUG( "WARNING: MakeConnection .... TLSv1_1_client_method failed!" );
return( false );
}
break;
#endif
case TLS1:
m_ssl_ctx = SSL_CTX_new( TLSv1_client_method() );
if( !m_ssl_ctx )
@@ -1452,6 +1472,26 @@ bool Csock::SSLServerSetup()
return( false );
}
break;
case TLS1_2:
#ifdef TLS1_2_VERSION
m_ssl_ctx = SSL_CTX_new( TLSv1_2_server_method() );
if( !m_ssl_ctx )
{
CS_DEBUG( "WARNING: MakeConnection .... TLSv1_2_server_method failed!" );
return( false );
}
break;
#endif
case TLS1_1:
#ifdef TLS1_1_VERSION
m_ssl_ctx = SSL_CTX_new( TLSv1_1_server_method() );
if( !m_ssl_ctx )
{
CS_DEBUG( "WARNING: MakeConnection .... TLSv1_1_server_method failed!" );
return( false );
}
break;
#endif
case TLS1:
m_ssl_ctx = SSL_CTX_new( TLSv1_server_method() );
if( !m_ssl_ctx )
@@ -2711,7 +2751,7 @@ void Csock::Init( const CS_STRING & sHostname, uint16_t uPort, int iTimeout )
m_shostname = sHostname;
m_sbuffer.clear();
m_eCloseType = CLT_DONT;
m_iMethod = SSL23;
m_iMethod = TLS1_2; // Falls though TLSv1.1 and TLSv1 if not available
m_sCipherType = "ALL";
m_iMaxBytes = 0;
m_iMaxMilliSeconds = 0;