~ubuntu-branches/ubuntu/oneiric/inspircd/oneiric-security

Viewing changes to src/modules/extra/m_ssl_openssl.cpp

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2008-11-15 20:39:50 UTC
mfrom: (1.1.4 upstream) (3.1.2 sid)
Revision ID: james.westby@ubuntu.com-20081115203950-uv1pf98x2vkon7se

Tags: 1.1.21+dfsg-1ubuntu1

* Merge from debian unstable, remaining changes: (LP: #298418)
- debian/patches/04_include-limits-h.dpatch:
+ Explicitly include limits.h for gcc 4.3.

files added:
include/socketengine_poll.h

src/socketengine_poll.cpp

files modified:
conf/inspircd.quotes.example

configure

debian/changelog

debian/control

docs/inspircd.conf.example

include/inspircd.h

src/cmd_info.cpp

src/cmd_rehash.cpp

src/cmd_topic.cpp

src/cmd_userhost.cpp

src/configreader.cpp

src/helperfuncs.cpp

src/inspircd.cpp

src/inspsocket.cpp

src/modes/umode_o.cpp

src/modules/extra/m_ldapauth.cpp

src/modules/extra/m_mysql.cpp

src/modules/extra/m_sqlv2.h

src/modules/extra/m_ssl_gnutls.cpp

src/modules/extra/m_ssl_openssl.cpp

src/modules/extra/m_ziplink.cpp

src/modules/m_chanprotect.cpp

src/modules/m_customtitle.cpp

src/modules/m_ident.cpp

src/modules/m_jumpserver.cpp

src/modules/m_override.cpp

src/modules/m_restrictchans.cpp

src/modules/m_services.cpp

src/modules/m_spanningtree/main.cpp

src/modules/m_spanningtree/main.h

src/modules/m_spanningtree/treesocket1.cpp

src/modules/m_spanningtree/treesocket2.cpp

src/modules/m_sslmodes.cpp

src/modules/m_svshold.cpp

src/modules/m_swhois.cpp

src/modules/m_taxonomy.cpp

src/modules/m_userip.cpp

src/socket.cpp

src/socketengine_epoll.cpp

src/socketengine_select.cpp

src/users.cpp

src/version.sh

win/inspircdVC80.vcproj

Show diffs side-by-side

added added

removed removed

src/modules/extra/m_ssl_openssl.cpp

148

ctx = SSL_CTX_new( SSLv23_server_method() );

149

clictx = SSL_CTX_new( SSLv23_client_method() );

150

151

SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);

152

SSL_CTX_set_mode(clictx, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);

153

151

154

SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);

152

155

SSL_CTX_set_verify(clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);

153

156

525

528

{

526

529

memcpy(buffer, session->inbuf, count);

527

530

// Move the stuff left in inbuf to the beginning of it

528

memcpy(session->inbuf, session->inbuf + count, (session->inbufoffset - count));

531

memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count));

529

532

// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.

530

533

session->inbufoffset -= count;

531

534

// Insp uses readresult as the count of how much data there is in buffer, so:

Older »