Mercurial > pidgin.yaz
changeset 19215:ab91044a914e
- Move ssl-gnutls x509 registration until after GnuTLS itself is inited
to guarantee that it is ready to use when registered
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Mon, 13 Aug 2007 19:38:49 +0000 |
| parents | 058bfbc4befe |
| children | ab7cd6c95b2f |
| files | libpurple/plugins/ssl/ssl-gnutls.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/ssl/ssl-gnutls.c Mon Aug 13 19:29:33 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Mon Aug 13 19:38:49 2007 +0000 @@ -925,10 +925,6 @@ plugin_load(PurplePlugin *plugin) { #ifdef HAVE_GNUTLS - /* Register that we're providing an X.509 CertScheme */ - /* @TODO : error checking */ - purple_certificate_register_scheme( &x509_gnutls ); - if(!purple_ssl_get_ops()) { purple_ssl_set_ops(&ssl_ops); } @@ -936,6 +932,10 @@ /* Init GNUTLS now so others can use it even if sslconn never does */ ssl_gnutls_init_gnutls(); + /* Register that we're providing an X.509 CertScheme */ + /* @TODO : error checking */ + purple_certificate_register_scheme( &x509_gnutls ); + return TRUE; #else return FALSE;