aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl_openssl.c
Commit message (Collapse)AuthorAgeLines
* GnuTLS now also needs ssl_pending() implemented. Bug #860.Wilmer van der Gaast2011-11-14-9/+0
|
* Merging mainline, which includes a huge msnp13 merge.Wilmer van der Gaast2010-10-02-1/+28
|\ | | | | | | | | | | Not 100% sure about the OpenSSL merge, should double check that but I'm currently offline.
| * Some general cleanup, plus fixing a bug in the memberlist parsing code:Wilmer van der Gaast2010-08-21-2/+2
| | | | | | | | | | | | the lists can come in in any order, so parse it *completely* before showing auth requests.
| * OpenSSL fixes + debugging.Wilmer van der Gaast2010-08-13-5/+9
| |
| * Implement MSNP15 SSO (Sadistic Sign-On).Wilmer van der Gaast2010-08-11-0/+24
| |
* | First step in this merge. Mostly a bzr merge and then a cleanup of conflictsWilmer van der Gaast2010-08-24-2/+7
|\ \ | |/ |/| | | | | and parts I want to/have to redo (because of ui-fix).
| * merge in latest trunkSven Moritz Hallberg2008-07-17-4/+19
| |\
| * | minor bugfixesSven Moritz Hallberg2008-07-16-1/+1
| | |
| * | explicitly initialize ssl in order to avoid gnutls and libotr fighting over ↵Sven Moritz Hallberg2008-02-17-2/+7
| | | | | | | | | | | | the global state of libgcrypt
* | | Make purple use BitlBee's event handling API. Since the APIs never reallyWilmer van der Gaast2009-10-11-2/+2
| |/ |/| | | | | | | | | | | | | | | | | diverged too much this is fairly transparent. I did rename and redefine GAIM_INPUT_* variables to really make it work without adding another stupid layer in between. One problem left, the new libpurple input API doesn't care about return values. Fixing that in the next CL.
* | Fixed stalling issue with OpenSSL and Jabber (#368).Wilmer van der Gaast2008-03-23-4/+19
|/
* Added starttls code to ssl_openssl.c so GnuTLS isn't the only supportedWilmer van der Gaast2006-10-19-40/+77
| | | | | SSL module in this branch anymore.
* Moving all generic files to lib/ instead of having some in / and some inWilmer van der Gaast2006-06-25-0/+221
protocols/, and adding RC4 code.