[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/jabber
From: Detlev Casanova <detlev.casanova () gmail ! com>
Date: 2008-05-20 15:10:46
Message-ID: 1211296246.537653.24870.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 810376 by casanova:
* Trusted certificates must be set before creating the TLS Handler.
* This should solve bug #154940. Waiting for feedbacks before closing the bug \
report.
M +5 -8 jabberclient.cpp
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberclient.cpp #810375:810376
@@ -25,6 +25,7 @@
#include <QTimer>
#include <QRegExp>
#include <QtCrypto>
+#include <QDir>
#include <bsocket.h>
#include <filetransfer.h>
@@ -646,15 +647,11 @@
if ( QCA::isSupported ("tls") )
{
d->jabberTLS = new QCA::TLS;
- d->jabberTLSHandler = new XMPP::QCATLSHandler ( d->jabberTLS );
+ d->jabberTLS->setTrustedCertificates(QCA::systemStore());
+ d->jabberTLSHandler = new QCATLSHandler(d->jabberTLS);
+ d->jabberTLSHandler->setXMPPCertCheck(true);
- {
- using namespace XMPP;
- QObject::connect ( d->jabberTLSHandler, SIGNAL ( tlsHandshaken() ), this, SLOT ( \
slotTLSHandshaken () ) );
- }
-
- if( QCA::haveSystemStore() )
- d->jabberTLS->setTrustedCertificates( QCA::systemStore() );
+ QObject::connect ( d->jabberTLSHandler, SIGNAL ( tlsHandshaken() ), SLOT ( \
slotTLSHandshaken () ) ); }
/*
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic