diff options
| author | Adam <adam@sigterm.info> | 2014-02-22 13:46:36 -0500 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2014-02-22 13:46:36 -0500 |
| commit | 1db5c555d6ecf26ab15931c1a3db208fbb94a171 (patch) | |
| tree | 819721aba945accfbd37bc590c96e13503cce2d1 | |
| parent | e42684ac39a7ff122ed00d25867a045349a8f9f7 (diff) | |
| parent | bb1b015103f88f9165fee7254287355d867b96ad (diff) | |
Merge pull request #58 from attilamolnar/2.0+gnutlsdep
[WIP] Make m_ssl_gnutls work with at least GnuTLS v2.8
| -rw-r--r-- | modules/extra/m_ssl_gnutls.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp index 002015f5f..a96a8c40d 100644 --- a/modules/extra/m_ssl_gnutls.cpp +++ b/modules/extra/m_ssl_gnutls.cpp @@ -349,7 +349,7 @@ ClientSocket *SSLSocketIO::Accept(ListenSocket *s) throw SocketException("Unable to initialize SSL socket"); me->cred.SetupSession(io->sess); - gnutls_transport_set_int(io->sess, newsock); + gnutls_transport_set_ptr(io->sess, reinterpret_cast<gnutls_transport_ptr_t>(newsock)); newsocket->flags[SF_ACCEPTING] = true; this->FinishAccept(newsocket); @@ -453,7 +453,7 @@ SocketFlag SSLSocketIO::FinishConnect(ConnectionSocket *s) if (gnutls_init(&io->sess, GNUTLS_CLIENT) != GNUTLS_E_SUCCESS) throw SocketException("Unable to initialize SSL socket"); me->cred.SetupSession(io->sess); - gnutls_transport_set_int(io->sess, s->GetFD()); + gnutls_transport_set_ptr(io->sess, reinterpret_cast<gnutls_transport_ptr_t>(s->GetFD())); } int ret = gnutls_handshake(io->sess); |