Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2012-11-16 13:43:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2012-09-25 14:28:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2012-11-16 13:43:56.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Nov 8 16:20:23 UTC 2012 - [email protected] + +- Update to 2.6.0 (final) + * Added experimental support for Android (enable the plugin in Help > About Plugins) + * Introduced "Kits" that supersede the previous "Targets". They bundle + the settings for the target device, compiler, debugger, Qt version and + more into a user definable, reusable setting. + * Added highlighting of missing files in the resource editor + * Fixed that several settings where saved every few seconds even without changes + * Worked around a problem in the KDE file dialog that prevented selecting qmake + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/2.6/dist/changes-2.6.0 + for the complete changelog + +------------------------------------------------------------------- +Sun Nov 4 11:11:38 UTC 2012 - [email protected] + +- Update to 2.6.0-rc + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/2.6/dist/changes-2.6.0 + for the complete changelog +- Add revert-6f7ce3f4.diff This upstream commit fixes a macos misbehaviour + but breaks the build when building qt-creator with a system botan +- License update: SUSE-LGPL-2.1-with-digia-exception-1.1 + +------------------------------------------------------------------- Old: ---- qt-creator-2.6.0-beta-src.tar.gz New: ---- qt-creator-2.6.0-src.tar.gz revert-6f7ce3f4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.OJb6vd/_old 2012-11-16 13:43:58.000000000 +0100 +++ /var/tmp/diff_new_pack.OJb6vd/_new 2012-11-16 13:43:58.000000000 +0100 @@ -17,17 +17,18 @@ Name: qt-creator -Version: 2.5.82 +Version: 2.6.0 Release: 0 Summary: Lightweight IDE -License: SUSE-LGPL-2.1-with-nokia-exception-1.1 +License: SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Tools/IDE Url: http://www.qtsoftware.com/developer/qt-creator/ -%define rversion 2.6.0-beta -Source: http://get.qt.nokia.com/qtcreator/%{name}-%{rversion}-src.tar.gz +%define rversion 2.6.0 +Source: http://releases.qt-project.org/qtcreator/%{rversion}/%{name}-%{rversion}-src.tar.gz Source1: qtcreator.desktop Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff +Patch3: revert-6f7ce3f4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # depends on private headers and therefore needs the exact Qt version %requires_eq libqt4-x11 @@ -66,6 +67,7 @@ %patch1 -p1 %endif %patch2 +%patch3 -p1 -R %build %if "%{_lib}"=="lib64" @@ -120,8 +122,9 @@ %{_bindir}/qtcreator %{_bindir}/qtcreator_process_stub %{_bindir}/qtpromaker +%{_bindir}/sdktool %{_datadir}/applications/qtcreator.desktop -%{_datadir}/icons/hicolor/*/apps/qtcreator.png +%{_datadir}/icons/hicolor/*/apps/QtProject-qtcreator.png %{_datadir}/qtcreator/ %{_libdir}/qtcreator/ ++++++ hardcoded-runpath.diff ++++++ --- /var/tmp/diff_new_pack.OJb6vd/_old 2012-11-16 13:43:58.000000000 +0100 +++ /var/tmp/diff_new_pack.OJb6vd/_new 2012-11-16 13:43:58.000000000 +0100 @@ -1,6 +1,6 @@ ---- src/qtcreatorplugin.pri.old 2012-09-12 02:13:04.229836044 +0200 -+++ src/qtcreatorplugin.pri 2012-09-12 02:13:31.987487083 +0200 -@@ -81,13 +81,7 @@ +--- src/qtcreatorplugin.pri.old 2012-10-23 12:37:09.532924177 +0200 ++++ src/qtcreatorplugin.pri 2012-10-23 12:37:19.843798022 +0200 +@@ -91,13 +91,7 @@ QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ } } else:linux-* { ++++++ qt-creator-2.6.0-beta-src.tar.gz -> qt-creator-2.6.0-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/qt-creator/qt-creator-2.6.0-beta-src.tar.gz /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator-2.6.0-src.tar.gz differ: char 5, line 1 ++++++ qtcreator.desktop ++++++ --- /var/tmp/diff_new_pack.OJb6vd/_old 2012-11-16 13:43:58.000000000 +0100 +++ /var/tmp/diff_new_pack.OJb6vd/_new 2012-11-16 13:43:58.000000000 +0100 @@ -4,7 +4,7 @@ Name=Qt Creator GenericName=C++ IDE for developing Qt applications X-KDE-StartupNotify=true -Icon=qtcreator +Icon=QtProject-qtcreator Terminal=false Categories=Qt;Development;IDE; MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource; ++++++ revert-6f7ce3f4.diff ++++++ commit 6f7ce3f48e2ac4ebe5e04492b11d3a70bed37fb2 Author: Christian Kandeler <[email protected]> Date: Fri Sep 28 15:54:10 2012 +0200 SSH: Work around issue with dynamic_cast. It has been observed that on MacOs, a dynamic_cast from Botan::Public_Key to Botan::RSA_PublicKey reproducibly fails even though it should definitely succeed. This happens with both gcc and clang on different Macs, but on no other platform. The problem could not be reproduced with an example project. The workaround is to move the allocation of the respective object from the client side to the Botan library itself. In addition, the following actions were taken to guard against similar problems in the future: - Also move to Botan the allocations of all other objects that are potentially dynamically cast. - Use shared pointers for these objects, so the deallocation also happens inside Botan. Change-Id: Ie595a56a239a41e2629b6ff631de59910b8244dd Reviewed-by: Eike Ziller <[email protected]> diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp index 000c3ea..4431ce1 100644 --- a/src/libs/3rdparty/botan/botan.cpp +++ b/src/libs/3rdparty/botan/botan.cpp @@ -47182,3 +47182,44 @@ u32bit version_minor() { return BOTAN_VERSION_MINOR; } u32bit version_patch() { return BOTAN_VERSION_PATCH; } } + +namespace Botan { +PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n) +{ + return PublicKeyPtr(new RSA_PublicKey(e, n)); +} + +PublicKeyPtr createDsaPublicKey(const DL_Group &group, const BigInt &y) +{ + return PublicKeyPtr(new DSA_PublicKey(group, y)); +} + +PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator &rng, const BigInt &p, const BigInt &q, + const BigInt &e, const BigInt &d, const BigInt &n) +{ + return PrivateKeyPtr(new RSA_PrivateKey(rng, p, q, e, d, n)); +} + +PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator &rng, size_t bits, size_t exp) +{ + return PrivateKeyPtr(new RSA_PrivateKey(rng, bits, exp)); +} + +PrivateKeyPtr createDsaPrivateKey(RandomNumberGenerator &rng, const DL_Group &group, + const BigInt &private_key) +{ + return PrivateKeyPtr(new DSA_PrivateKey(rng, group, private_key)); +} + +PrivateKeyPtr loadPkcs8PrivateKey(DataSource& source, RandomNumberGenerator& rng, + const User_Interface& ui) +{ + return PrivateKeyPtr(PKCS8::load_key(source, rng, ui)); +} + +DhPrivateKeyPtr createDhPrivateKey(RandomNumberGenerator &rng, const DL_Group &grp, const BigInt &x) +{ + return DhPrivateKeyPtr(new DH_PrivateKey(rng, grp, x)); +} + +} diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h index a073890..13ec9fd 100644 --- a/src/libs/3rdparty/botan/botan.h +++ b/src/libs/3rdparty/botan/botan.h @@ -9,6 +9,7 @@ #define BOTAN_AMALGAMATION_H__ #include <QtGlobal> +#include <QSharedPointer> #include <iosfwd> #include <map> @@ -16181,7 +16182,26 @@ class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode SecureVector<byte> state; size_t position; }; +} + +namespace Botan { +typedef QSharedPointer<Public_Key> PublicKeyPtr; +BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n); +BOTAN_DLL PublicKeyPtr createDsaPublicKey(const DL_Group& group, const BigInt& y); + +typedef QSharedPointer<Private_Key> PrivateKeyPtr; +BOTAN_DLL PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator& rng, const BigInt& p, + const BigInt& q, const BigInt& e, const BigInt& d = 0, const BigInt& n = 0); +BOTAN_DLL PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator& rng, size_t bits, + size_t exp = 65537); +BOTAN_DLL PrivateKeyPtr createDsaPrivateKey(RandomNumberGenerator& rng, const DL_Group& group, + const BigInt& private_key = 0); +BOTAN_DLL PrivateKeyPtr loadPkcs8PrivateKey(DataSource& source, RandomNumberGenerator& rng, + const User_Interface& ui); +typedef QSharedPointer<DH_PrivateKey> DhPrivateKeyPtr; +BOTAN_DLL DhPrivateKeyPtr createDhPrivateKey(RandomNumberGenerator& rng, const DL_Group& grp, + const BigInt& x = 0); } diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp index 3e1b697..868a64b 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp @@ -218,16 +218,14 @@ bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &p try { Pipe pipe; pipe.process_msg(convertByteArray(privKeyFileContents), privKeyFileContents.size()); - Private_Key * const key = PKCS8::load_key(pipe, m_rng, SshKeyPasswordRetriever()); - if (DSA_PrivateKey * const dsaKey = dynamic_cast<DSA_PrivateKey *>(key)) { + const PrivateKeyPtr authKey = loadPkcs8PrivateKey(pipe, m_rng, SshKeyPasswordRetriever()); + if (DSA_PrivateKey * const dsaKey = dynamic_cast<DSA_PrivateKey *>(authKey.data())) { m_authKeyAlgoName = SshCapabilities::PubKeyDss; - m_authKey.reset(dsaKey); pubKeyParams << dsaKey->group_p() << dsaKey->group_q() << dsaKey->group_g() << dsaKey->get_y(); allKeyParams << pubKeyParams << dsaKey->get_x(); - } else if (RSA_PrivateKey * const rsaKey = dynamic_cast<RSA_PrivateKey *>(key)) { + } else if (RSA_PrivateKey * const rsaKey = dynamic_cast<RSA_PrivateKey *>(authKey.data())) { m_authKeyAlgoName = SshCapabilities::PubKeyRsa; - m_authKey.reset(rsaKey); pubKeyParams << rsaKey->get_e() << rsaKey->get_n(); allKeyParams << pubKeyParams << rsaKey->get_p() << rsaKey->get_q() << rsaKey->get_d(); @@ -235,6 +233,7 @@ bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &p qWarning("%s: Unexpected code flow, expected success or exception.", Q_FUNC_INFO); return false; } + m_authKey = authKey; } catch (const Botan::Exception &ex) { error = QLatin1String(ex.what()); return false; @@ -291,15 +290,13 @@ bool SshEncryptionFacility::createAuthenticationKeyFromOpenSSL(const QByteArray if (m_authKeyAlgoName == SshCapabilities::PubKeyDss) { BigInt p, q, g, y, x; sequence.decode (p).decode (q).decode (g).decode (y).decode (x); - DSA_PrivateKey * const dsaKey = new DSA_PrivateKey(m_rng, DL_Group(p, q, g), x); - m_authKey.reset(dsaKey); + m_authKey = createDsaPrivateKey(m_rng, DL_Group(p, q, g), x); pubKeyParams << p << q << g << y; allKeyParams << pubKeyParams << x; } else { BigInt p, q, e, d, n; sequence.decode(n).decode(e).decode(d).decode(p).decode(q); - RSA_PrivateKey * const rsaKey = new RSA_PrivateKey(m_rng, p, q, e, d, n); - m_authKey.reset(rsaKey); + m_authKey = createRsaPrivateKey(m_rng, p, q, e, d, n); pubKeyParams << e << n; allKeyParams << pubKeyParams << p << q << d; } diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h index 5b22429..afd85fb 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h @@ -117,7 +117,7 @@ private: QByteArray m_authKeyAlgoName; QByteArray m_authPubKeyBlob; QByteArray m_cachedPrivKeyContents; - QScopedPointer<Botan::Private_Key> m_authKey; + QSharedPointer<Botan::Private_Key> m_authKey; mutable Botan::AutoSeeded_RNG m_rng; }; diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp index c11201c..0c0fea6 100644 --- a/src/libs/ssh/sshkeyexchange.cpp +++ b/src/libs/ssh/sshkeyexchange.cpp @@ -136,8 +136,7 @@ bool SshKeyExchange::sendDhInitPacket(const SshIncomingPacket &serverKexInit) kexInitParams.compressionAlgorithmsServerToClient.names); AutoSeeded_RNG rng; - m_dhKey.reset(new DH_PrivateKey(rng, - DL_Group(botanKeyExchangeAlgoName(keyAlgo)))); + m_dhKey = createDhPrivateKey(rng, DL_Group(botanKeyExchangeAlgoName(keyAlgo))); m_serverKexInitPayload = serverKexInit.payLoad(); m_sendFacility.sendKeyDhInitPacket(m_dhKey->get_y()); @@ -184,28 +183,24 @@ void SshKeyExchange::sendNewKeysPacket(const SshIncomingPacket &dhReply, printData("H", m_h); #endif // CREATOR_SSH_DEBUG - QScopedPointer<Public_Key> sigKey; - QScopedPointer<PK_Verifier> verifier; + QSharedPointer<Public_Key> publicKey; + QByteArray algorithm; if (m_serverHostKeyAlgo == SshCapabilities::PubKeyDss) { const DL_Group group(reply.parameters.at(0), reply.parameters.at(1), reply.parameters.at(2)); - DSA_PublicKey * const dsaKey - = new DSA_PublicKey(group, reply.parameters.at(3)); - sigKey.reset(dsaKey); - verifier.reset(new PK_Verifier(*dsaKey, botanEmsaAlgoName(SshCapabilities::PubKeyDss))); + publicKey = createDsaPublicKey(group, reply.parameters.at(3)); + algorithm = SshCapabilities::PubKeyDss; } else if (m_serverHostKeyAlgo == SshCapabilities::PubKeyRsa) { - RSA_PublicKey * const rsaKey - = new RSA_PublicKey(reply.parameters.at(1), reply.parameters.at(0)); - sigKey.reset(rsaKey); - verifier.reset(new PK_Verifier(*rsaKey, botanEmsaAlgoName(SshCapabilities::PubKeyRsa))); + publicKey = createRsaPublicKey(reply.parameters.at(1), reply.parameters.at(0)); + algorithm = SshCapabilities::PubKeyRsa; } else { Q_ASSERT(!"Impossible: Neither DSS nor RSA!"); } const byte * const botanH = convertByteArray(m_h); const Botan::byte * const botanSig = convertByteArray(reply.signatureBlob); - if (!verifier->verify_message(botanH, m_h.size(), botanSig, - reply.signatureBlob.size())) { + if (!PK_Verifier(*publicKey, botanEmsaAlgoName(algorithm)).verify_message(botanH, m_h.size(), + botanSig, reply.signatureBlob.size())) { throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_KEY_EXCHANGE_FAILED, "Invalid signature in SSH_MSG_KEXDH_REPLY packet."); } diff --git a/src/libs/ssh/sshkeyexchange_p.h b/src/libs/ssh/sshkeyexchange_p.h index ea3e599..e8d27b6 100644 --- a/src/libs/ssh/sshkeyexchange_p.h +++ b/src/libs/ssh/sshkeyexchange_p.h @@ -33,6 +33,7 @@ #include <QByteArray> #include <QScopedPointer> +#include <QSharedPointer> namespace Botan { class DH_PrivateKey; @@ -71,7 +72,7 @@ private: QByteArray m_serverId; QByteArray m_clientKexInitPayload; QByteArray m_serverKexInitPayload; - QScopedPointer<Botan::DH_PrivateKey> m_dhKey; + QSharedPointer<Botan::DH_PrivateKey> m_dhKey; QByteArray m_k; QByteArray m_h; QByteArray m_serverHostKeyAlgo; diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp index ef28c05..5aefdd9 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp @@ -60,9 +60,9 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke AutoSeeded_RNG rng; KeyPtr key; if (m_type == Rsa) - key = KeyPtr(new RSA_PrivateKey(rng, keySize)); + key = createRsaPrivateKey(rng, keySize); else - key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::DSA_Kosherizer, keySize))); + key = createDsaPrivateKey(rng, DL_Group(rng, DL_Group::DSA_Kosherizer, keySize)); switch (format) { case Pkcs8: generatePkcs8KeyStrings(key, rng); ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.OJb6vd/_old 2012-11-16 13:43:58.000000000 +0100 +++ /var/tmp/diff_new_pack.OJb6vd/_new 2012-11-16 13:43:58.000000000 +0100 @@ -1,29 +1,61 @@ diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri -index 20832c1..4b715c0 100644 +index 1088c99..4b715c0 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri -@@ -1,2 +1,2 @@ +@@ -1,46 +1,2 @@ -INCLUDEPATH *= $$PWD/.. --LIBS *= -l$$qtLibraryName(Botan) +-HEADERS += $$PWD/botan.h +-SOURCES += $$PWD/botan.cpp +- +-CONFIG += exceptions +- +-DEPENDPATH += . +- +-DEFINES += BOTAN_DLL= +-unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ +- BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \ +- BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO +-*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \ +- BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \ +- BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER +-macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN +-*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC +-*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG +-*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL +- +-win32 { +- DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \ +- BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \ +- BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \ +- BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \ +- BOTAN_HAS_MUTEX_WIN32 +- +- win32-msvc* { +- QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 +- DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S +- } else { +- QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long +- QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long +- } +- LIBS += -ladvapi32 -luser32 +-} +- +-unix:*-g++* { +- QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long +- QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long +- QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04 +-} +- +-linux*|freebsd* { +- LIBS += -lrt +-} +INCLUDEPATH *= /usr/include/botan-1.10 +LIBS *= -lbotan-1.10 -diff --git a/src/libs/libs.pro b/src/libs/libs.pro -index 5eaf471..9a1da2d 100644 ---- a/src/libs/libs.pro -+++ b/src/libs/libs.pro -@@ -5,7 +5,6 @@ QT += core gui - # aggregation and extensionsystem are directly in src.pro - # because of dependencies of app - SUBDIRS = \ -- 3rdparty \ - utils \ - utils/process_stub.pro \ - languageutils \ diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp -index 3e1b697..e17aaca 100644 +index 1d6913e..323e7d9 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp -@@ -38,6 +38,11 @@ +@@ -37,6 +37,11 @@ #include "sshpacket_p.h" #include <botan/botan.h> @@ -36,10 +68,10 @@ #include <QDebug> #include <QList> diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h -index 5b22429..a3a7b1a 100644 +index 5995294..a8963ea 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h -@@ -32,6 +32,7 @@ +@@ -31,9 +31,11 @@ #define SSHABSTRACTCRYPTOFACILITY_P_H #include <botan/botan.h> @@ -47,11 +79,15 @@ #include <QByteArray> #include <QScopedPointer> ++#include <QSharedPointer> + + namespace QSsh { + namespace Internal { diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp -index c11201c..93538a2 100644 +index 6627ff9..a44c79c 100644 --- a/src/libs/ssh/sshkeyexchange.cpp +++ b/src/libs/ssh/sshkeyexchange.cpp -@@ -37,6 +37,12 @@ +@@ -36,6 +36,12 @@ #include "sshincomingpacket_p.h" #include <botan/botan.h> @@ -65,10 +101,10 @@ #ifdef CREATOR_SSH_DEBUG #include <iostream> diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp -index ef28c05..ca42f56 100644 +index e6aa967..598a9b7 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp -@@ -35,6 +35,11 @@ +@@ -34,6 +34,11 @@ #include "sshpacket_p.h" #include <botan/botan.h> @@ -81,10 +117,10 @@ #include <QDateTime> #include <QInputDialog> diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h -index 0bd0413..fb5201f 100644 +index cfb86e1..3971c4e 100644 --- a/src/libs/ssh/sshkeypasswordretriever_p.h +++ b/src/libs/ssh/sshkeypasswordretriever_p.h -@@ -31,6 +31,7 @@ +@@ -30,6 +30,7 @@ #define KEYPASSWORDRETRIEVER_H #include <botan/botan.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
