adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Csocket to 5746796ca55d21fa185caf7c58d015f650b77768

Browse Source
This commit is contained in:
Alexey Sokolov
2014-11-26 21:36:17 +00:00
parent abb0ca5bd3
commit c94a8137de
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Csocket.h
+1 -1
View File
@@ -1178,7 +1178,7 @@ private:
void FREE_SSL();
void FREE_CTX();
void ConfigureCTXOptions( SSL_CTX * pCTX );
bool ConfigureCTXOptions( SSL_CTX * pCTX );
#endif /* HAVE_LIBSSL */
src/Csocket.cpp
+15 -5
View File
@@ -1382,10 +1382,16 @@ bool Csock::AcceptSSL()
}
#ifdef HAVE_LIBSSL
void Csock::ConfigureCTXOptions( SSL_CTX * pCTX )
bool Csock::ConfigureCTXOptions( SSL_CTX * pCTX )
{
if( pCTX )
{
if( SSL_CTX_set_cipher_list( pCTX, m_sCipherType.c_str() ) <= 0 )
{
CS_DEBUG( "Could not assign cipher [" << m_sCipherType << "]" );
return( false );
}
long uCTXOptions = 0;
if( m_uDisableProtocols > 0 )
{
@@ -1415,6 +1421,7 @@ void Csock::ConfigureCTXOptions( SSL_CTX * pCTX )
if( uCTXOptions )
SSL_CTX_set_options( pCTX, uCTXOptions );
}
return true;
}
#endif /* HAVE_LIBSSL */
@@ -1521,7 +1528,12 @@ bool Csock::SSLClientSetup()
}
}
ConfigureCTXOptions( m_ssl_ctx );
if( !ConfigureCTXOptions( m_ssl_ctx ) )
{
SSL_CTX_free( m_ssl_ctx );
m_ssl_ctx = NULL;
return( false );
}
m_ssl = SSL_new( m_ssl_ctx );
if( !m_ssl )
@@ -1701,13 +1713,11 @@ SSL_CTX * Csock::SetupServerCTX()
ERR_clear_error();
#endif
if( SSL_CTX_set_cipher_list( pCTX, m_sCipherType.c_str() ) <= 0 )
if( !ConfigureCTXOptions( pCTX ) )
{
CS_DEBUG( "Could not assign cipher [" << m_sCipherType << "]" );
SSL_CTX_free( pCTX );
return( NULL );
}
ConfigureCTXOptions( pCTX );
return( pCTX );
}
#endif /* HAVE_LIBSSL */