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

Update to latest Csocket

Browse Source 
Thanks to Imaginos for implementing this. :)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1509 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-05-20 08:10:00 +00:00
parent facb308ca9
commit 37d0c5e58e
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Csocket.cpp
+7 -7
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.98 $
* $Revision: 1.99 $
*/
#include "Csocket.h"
@@ -583,7 +583,6 @@ void Csock::Copy( const Csock & cCopy )
m_bFullsslAccept = cCopy.m_bFullsslAccept;
m_bsslEstablished = cCopy.m_bsslEstablished;
m_bEnableReadLine = cCopy.m_bEnableReadLine;
m_bRequireClientCert = cCopy.m_bRequireClientCert;
m_bPauseRead = cCopy.m_bPauseRead;
m_shostname = cCopy.m_shostname;
m_sbuffer = cCopy.m_sbuffer;
@@ -613,6 +612,7 @@ void Csock::Copy( const Csock & cCopy )
m_bSkipConnect = cCopy.m_bSkipConnect;
#ifdef HAVE_LIBSSL
m_iRequireClientCertFlags = cCopy.m_iRequireClientCertFlags;
m_sSSLBuffer = cCopy.m_sSSLBuffer;
FREE_SSL();
@@ -1164,9 +1164,9 @@ bool Csock::SSLServerSetup()
SSL_set_rfd( m_ssl, m_iReadSock );
SSL_set_wfd( m_ssl, m_iWriteSock );
SSL_set_accept_state( m_ssl );
if ( m_bRequireClientCert )
if ( m_iRequireClientCertFlags )
{
SSL_set_verify( m_ssl, SSL_VERIFY_FAIL_IF_NO_PEER_CERT|SSL_VERIFY_PEER, ( m_pCerVerifyCB ? m_pCerVerifyCB : CertVerifyCB ) );
SSL_set_verify( m_ssl, m_iRequireClientCertFlags, ( m_pCerVerifyCB ? m_pCerVerifyCB : CertVerifyCB ) );
SSL_set_ex_data( m_ssl, GetCsockClassIdx(), this );
}
@@ -1911,8 +1911,8 @@ CS_STRING Csock::GetPeerPubKey()
}
return( sKey );
}
bool Csock::RequiresClientCert() { return( m_bRequireClientCert ); }
void Csock::SetRequiresClientCert( bool bRequiresCert ) { m_bRequireClientCert = bRequiresCert; }
unsigned int Csock::GetRequireClientCertFlags() { return( m_iRequireClientCertFlags ); }
void Csock::SetRequiresClientCert( bool bRequiresCert ) { m_iRequireClientCertFlags = ( bRequiresCert ? SSL_VERIFY_FAIL_IF_NO_PEER_CERT|SSL_VERIFY_PEER : 0 ); }
#endif /* HAVE_LIBSSL */
@@ -2157,6 +2157,7 @@ void Csock::Init( const CS_STRING & sHostname, u_short iport, int itimeout )
#ifdef HAVE_LIBSSL
m_ssl = NULL;
m_ssl_ctx = NULL;
m_iRequireClientCertFlags = 0;
#endif /* HAVE_LIBSSL */
m_iTcount = 0;
m_iReadSock = -1;
@@ -2178,7 +2179,6 @@ void Csock::Init( const CS_STRING & sHostname, u_short iport, int itimeout )
m_bFullsslAccept = false;
m_bsslEstablished = false;
m_bEnableReadLine = false;
m_bRequireClientCert = false;
m_iMaxStoredBufferLength = 1024;
m_iConnType = INBOUND;
m_iRemotePort = 0;
Csocket.h
+16 -10
View File
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* $Revision: 1.206 $
* $Revision: 1.207 $
*/
// note to compile with win32 need to link to winsock2, using gcc its -lws2_32
@@ -746,8 +746,11 @@ public:
//! Returns The Peers Public Key
CS_STRING GetPeerPubKey();
bool RequiresClientCert();
unsigned int GetRequireClientCertFlags();
//! legacy, deprecated @see SetRequireClientCertFlags
void SetRequiresClientCert( bool bRequiresCert );
//! bitwise flags, 0 means don't require cert, SSL_VERIFY_PEER verifies peers, SSL_VERIFY_FAIL_IF_NO_PEER_CERT will cause the connection to fail if no cert
void SetRequireClientCertFlags( unsigned int iRequireClientCertFlags ) { m_iRequireClientCertFlags = iRequireClientCertFlags; }
#endif /* HAVE_LIBSSL */
@@ -971,7 +974,7 @@ private:
u_short m_iport, m_iRemotePort, m_iLocalPort;
int m_iReadSock, m_iWriteSock, m_itimeout, m_iConnType, m_iMethod, m_iTcount;
bool m_bssl, m_bIsConnected, m_bBLOCK, m_bFullsslAccept;
bool m_bsslEstablished, m_bEnableReadLine, m_bRequireClientCert, m_bPauseRead;
bool m_bsslEstablished, m_bEnableReadLine, m_bPauseRead;
CS_STRING m_shostname, m_sbuffer, m_sSockName, m_sPemFile, m_sCipherType, m_sParentName;
CS_STRING m_sSend, m_sPemPass, m_sLocalIP, m_sRemoteIP;
ECloseType m_eCloseType;
@@ -988,6 +991,7 @@ private:
SSL *m_ssl;
SSL_CTX *m_ssl_ctx;
SSL_METHOD *m_ssl_method;
unsigned int m_iRequireClientCertFlags;
FPCertVerifyCB m_pCerVerifyCB;
@@ -1116,7 +1120,7 @@ public:
m_iAFrequire = CSSockAddr::RAF_ANY;
#ifdef HAVE_LIBSSL
m_sCipher = "HIGH";
m_bRequiresClientCert = false;
m_iRequireCertFlags = 0;
#endif /* HAVE_LIBSSL */
}
virtual ~CSListener() {}
@@ -1132,7 +1136,7 @@ public:
const CS_STRING & GetCipher() const { return( m_sCipher ); }
const CS_STRING & GetPemLocation() const { return( m_sPemLocation ); }
const CS_STRING & GetPemPass() const { return( m_sPemPass ); }
bool GetRequiresClientCert() const { return( m_bRequiresClientCert ); }
unsigned int GetRequireClientCertFlags() const { return( m_iRequireCertFlags ); }
#endif /* HAVE_LIBSSL */
//! sets the port to listen on. Set to 0 to listen on a random port
@@ -1157,8 +1161,10 @@ public:
void SetPemLocation( const CS_STRING & s ) { m_sPemLocation = s; }
//! set the pemfile pass
void SetPemPass( const CS_STRING & s ) { m_sPemPass = s; }
//! set to true if require a client certificate
void SetRequiresClientCert( bool b ) { m_bRequiresClientCert = b; }
//! set to true if require a client certificate (deprecated @see SetRequireClientCertFlags)
void SetRequiresClientCert( bool b ) { m_iRequireCertFlags = ( b ? SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT : 0 ); }
//! bitwise flags, 0 means don't require cert, SSL_VERIFY_PEER verifies peers, SSL_VERIFY_FAIL_IF_NO_PEER_CERT will cause the connection to fail if no cert
void SetRequireClientCertFlags( unsigned int iRequireCertFlags ) { m_iRequireCertFlags = iRequireCertFlags; }
#endif /* HAVE_LIBSSL */
private:
u_short m_iPort;
@@ -1170,7 +1176,7 @@ private:
#ifdef HAVE_LIBSSL
CS_STRING m_sPemLocation, m_sPemPass, m_sCipher;
bool m_bRequiresClientCert;
unsigned int m_iRequireCertFlags;
#endif /* HAVE_LIBSSL */
};
@@ -1318,7 +1324,7 @@ public:
pcSock->SetPemLocation( cListen.GetPemLocation() );
pcSock->SetPemPass( cListen.GetPemPass() );
pcSock->SetCipher( cListen.GetCipher() );
pcSock->SetRequiresClientCert( cListen.GetRequiresClientCert() );
pcSock->SetRequireClientCertFlags( cListen.GetRequireClientCertFlags() );
}
#endif /* HAVE_LIBSSL */
@@ -2065,7 +2071,7 @@ private:
NewpcSock->SetCipher( pcSock->GetCipher() );
NewpcSock->SetPemLocation( pcSock->GetPemLocation() );
NewpcSock->SetPemPass( pcSock->GetPemPass() );
NewpcSock->SetRequiresClientCert( pcSock->RequiresClientCert() );
NewpcSock->SetRequireClientCertFlags( pcSock->GetRequireClientCertFlags() );
bAddSock = NewpcSock->AcceptSSL();
}