Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:13.2
qt-creator
system-botan-lib.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File system-botan-lib.diff of Package qt-creator
diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri index 6055e91..4b715c0 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -1,57 +1,2 @@ -INCLUDEPATH *= $$PWD/.. -HEADERS += $$PWD/botan.h - -equals(USE_SYSTEM_BOTAN, 1) { - DEFINES += USE_SYSTEM_BOTAN - CONFIG += link_pkgconfig - PKGCONFIG += botan-1.10 -} else { - -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 - -CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64 - -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_EXCEPTIONS_ON = -EHs - QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 - DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS - } 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 -fpermissive -finline-functions -Wno-long-long - QMAKE_CXXFLAGS += -fPIC -fpermissive -finline-functions -Wno-long-long - QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04 -} - -linux*|freebsd* { - LIBS += -lrt $$QMAKE_LIBS_DYNLOAD -} -} +INCLUDEPATH *= /usr/include/botan-1.10 +LIBS *= -lbotan-1.10 diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp index 19a6282..3a888ee 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp @@ -37,6 +37,11 @@ #include "sshpacket_p.h" #include <botan/botan.h> +#include <botan/cbc.h> +#include <botan/dsa.h> +#include <botan/pkcs8.h> +#include <botan/pubkey.h> +#include <botan/rsa.h> #include <QDebug> #include <QList> diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h index fbf7a22..fcb62ee 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h @@ -31,9 +31,11 @@ #define SSHCRYPTOFACILITY_P_H #include <botan/botan.h> +#include <botan/hmac.h> #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 700b268..7e34f9f 100644 --- a/src/libs/ssh/sshkeyexchange.cpp +++ b/src/libs/ssh/sshkeyexchange.cpp @@ -36,6 +36,12 @@ #include "sshincomingpacket_p.h" #include <botan/botan.h> +#include <botan/dh.h> +#include <botan/dl_group.h> +#include <botan/dsa.h> +#include <botan/pem.h> +#include <botan/pubkey.h> +#include <botan/rsa.h> #ifdef CREATOR_SSH_DEBUG #include <iostream> diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp index 3a943bc..f5aea35 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp @@ -35,6 +35,11 @@ #include "sshpacket_p.h" #include <botan/botan.h> +#include <botan/der_enc.h> +#include <botan/dsa.h> +#include <botan/pem.h> +#include <botan/pkcs8.h> +#include <botan/rsa.h> #include <QDateTime> #include <QInputDialog> diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h index 2f6953f..7570acc 100644 --- a/src/libs/ssh/sshkeypasswordretriever_p.h +++ b/src/libs/ssh/sshkeypasswordretriever_p.h @@ -30,6 +30,7 @@ #define KEYPASSWORDRETRIEVER_H #include <botan/botan.h> +#include <botan/ui.h> #include <string>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor