adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Csocket to 0119a006bdfb6223a1a86d48b02efee87d11b721

Browse Source
This commit is contained in:
Edoardo Spadolini
2015-01-02 23:36:36 +01:00
parent 56f0d3bcbf
commit cac9da4951
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Csocket.h
+3
View File
@@ -859,6 +859,8 @@ public:
void DisableSSLProtocols( u_int uDisableOpts ) { m_uDisableProtocols = uDisableOpts; }
//! allow disabling compression
void DisableSSLCompression() { m_bNoSSLCompression = true; }
//! select the ciphers in server-preferred order
void FollowSSLCipherServerPreference() { m_bSSLCipherServerPreference = true; }
//! Set the cipher type ( openssl cipher [to see ciphers available] )
void SetCipher( const CS_STRING & sCipher );
const CS_STRING & GetCipher() const;
@@ -1186,6 +1188,7 @@ private:
uint32_t m_iRequireClientCertFlags;
u_int m_uDisableProtocols;
bool m_bNoSSLCompression;
bool m_bSSLCipherServerPreference;
FPCertVerifyCB m_pCerVerifyCB;
src/Csocket.cpp
+11 -2
View File
@@ -1041,6 +1041,7 @@ void Csock::Copy( const Csock & cCopy )
#ifdef HAVE_LIBSSL
m_bNoSSLCompression = cCopy.m_bNoSSLCompression;
m_bSSLCipherServerPreference = cCopy.m_bSSLCipherServerPreference;
m_uDisableProtocols = cCopy.m_uDisableProtocols;
m_iRequireClientCertFlags = cCopy.m_iRequireClientCertFlags;
m_sSSLBuffer = cCopy.m_sSSLBuffer;
@@ -1433,6 +1434,10 @@ bool Csock::ConfigureCTXOptions( SSL_CTX * pCTX )
if( m_bNoSSLCompression )
uCTXOptions |= SSL_OP_NO_COMPRESSION;
#endif /* SSL_OP_NO_COMPRESSION */
#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
if( m_bSSLCipherServerPreference )
uCTXOptions |= SSL_OP_CIPHER_SERVER_PREFERENCE;
#endif /* SSL_OP_CIPHER_SERVER_PREFERENCE */
if( uCTXOptions )
SSL_CTX_set_options( pCTX, uCTXOptions );
}
@@ -1708,7 +1713,7 @@ SSL_CTX * Csock::SetupServerCTX()
// Presumably PEM_read_DHparams failed, as there was no DH structure. Clearing those errors here so they are removed off the stack
ERR_clear_error();
}
#ifndef OPENSSL_NO_ECDH
// Errors for the following block are non-fatal (ECDHE is nice to have
// but not a requirement)
#if defined( SSL_CTX_set_ecdh_auto )
@@ -1725,8 +1730,11 @@ SSL_CTX * Csock::SetupServerCTX()
EC_KEY_free( ecdh );
}
else
{
ERR_clear_error();
#endif
}
#endif /* SSL_CTX_set_tmp_ecdh */
#endif /* OPENSSL_NO_ECDH */
if( !ConfigureCTXOptions( pCTX ) )
{
@@ -2992,6 +3000,7 @@ void Csock::Init( const CS_STRING & sHostname, uint16_t uPort, int iTimeout )
m_iRequireClientCertFlags = 0;
m_uDisableProtocols = 0;
m_bNoSSLCompression = false;
m_bSSLCipherServerPreference = false;
#endif /* HAVE_LIBSSL */
m_iTcount = 0;
m_iReadSock = CS_INVALID_SOCK;