diff --git a/telldus-gui/Plugins/Live/CMakeLists.txt b/telldus-gui/Plugins/Live/CMakeLists.txt index 7afa0a3e..18d607ac 100644 --- a/telldus-gui/Plugins/Live/CMakeLists.txt +++ b/telldus-gui/Plugins/Live/CMakeLists.txt @@ -34,9 +34,6 @@ CONFIGURE_FILE( INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/parsed/) -FIND_PACKAGE(QCA REQUIRED) -SET( Plugin_LIBRARIES ${QCA_LIBRARY} ) - SET(TELLDUS_LIVE_PUBLIC_KEY "" CACHE STRING "Telldus Live! public key") SET(TELLDUS_LIVE_PRIVATE_KEY "" CACHE STRING "Telldus Live! private key") SET(TELLDUS_LIVE_URI "https://api.telldus.com/server/assign" CACHE STRING "Telldus Live! Connection URI") diff --git a/telldus-gui/Plugins/Live/LiveObject.cpp b/telldus-gui/Plugins/Live/LiveObject.cpp index bf75d4ad..dc36ebb3 100644 --- a/telldus-gui/Plugins/Live/LiveObject.cpp +++ b/telldus-gui/Plugins/Live/LiveObject.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -18,7 +17,6 @@ public: bool registered; QUrl registerUrl; QString uuid, hashMethod; - QCA::Initializer qcaInit; QNetworkAccessManager *manager; QList serverList; QDateTime serverRefreshTime; @@ -36,12 +34,6 @@ LiveObject::LiveObject( QScriptEngine *engine, QObject * parent ) { d = new PrivateData; d->hashMethod = "sha1"; - foreach(QString hash, QStringList() << "sha512" << "sha256") { - if (QCA::isSupported(hash.toUtf8())) { - d->hashMethod = hash; - break; - } - } d->registered = false; d->socket = new QSslSocket(this); d->socket->setProtocol( QSsl::TlsV1 ); @@ -264,14 +256,6 @@ void LiveObject::serverAssignReply( QNetworkReply *r ) { } QByteArray LiveObject::signatureForMessage( const QByteArray &message ) { - if (QCA::isSupported(d->hashMethod.toUtf8())) { - QCA::Hash signature(d->hashMethod); - signature.update(message); - signature.update(TELLDUS_LIVE_PRIVATE_KEY); - return signature.final().toByteArray().toHex(); - } - - //Fallback to builtin function QCryptographicHash signature( QCryptographicHash::Sha1 ); signature.addData(message); signature.addData(TELLDUS_LIVE_PRIVATE_KEY);