aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl_gnutls.c
Commit message (Collapse)AuthorAgeLines
* Merging mainline, which includes a huge msnp13 merge.Wilmer van der Gaast2010-10-02-0/+4
|\ | | | | | | | | | | 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-0/+4
| |
* | First step in this merge. Mostly a bzr merge and then a cleanup of conflictsWilmer van der Gaast2010-08-24-3/+8
|\ \ | |/ |/| | | | | and parts I want to/have to redo (because of ui-fix).
| * merge in latest trunkSven Moritz Hallberg2008-07-17-0/+6
| |\
| * | explicitly initialize ssl in order to avoid gnutls and libotr fighting over ↵Sven Moritz Hallberg2008-02-17-3/+8
| | | | | | | | | | | | 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-0/+6
|/
* Checking conn->xcred before trying to clean it up since GnuTLS doesn'tWilmer van der Gaast2007-12-12-2/+4
| | | | | seem to check for NULL pointers here. (Closes #257)
* Some changes to get rid of compiler warnings. (And disabling strictWilmer van der Gaast2007-11-22-1/+9
| | | | | aliasing because there are too many warnings about it. :-P)
* Added starttls code to ssl_openssl.c so GnuTLS isn't the only supportedWilmer van der Gaast2006-10-19-2/+0
| | | | | SSL module in this branch anymore.
* No more double free()/crashes when trying to set up an SSL connection toWilmer van der Gaast2006-10-02-6/+18
| | | | | | | a non-SSL server, and better handling of TLS connection setup by initializing the TLS session from a callback function (which guarantees a valid return value from ssl_starttls() before any error callback could be called).
* Added support for SSL- and TLS-connections. Checking of the "tls" userWilmer van der Gaast2006-09-24-15/+30
| | | | | | setting has to be finished, plus an ssl_starttls() function for the other SSL libraries (this code will only compile with GnuTLS for now).
* Moving all generic files to lib/ instead of having some in / and some inWilmer van der Gaast2006-06-25-0/+206
protocols/, and adding RC4 code.