| 1 | --- src/libs/3rdparty/botan/botan.cpp.orig 2012-12-17 17:18:37.000000000 +0100 |
| 2 | +++ src/libs/3rdparty/botan/botan.cpp 2013-01-16 23:31:13.000000000 +0100 |
| 3 | @@ -15,6 +15,8 @@ |
| 4 | #endif |
| 5 | |
| 6 | |
| 7 | +#if 0 // Bundled Botan |
| 8 | + |
| 9 | namespace Botan { |
| 10 | |
| 11 | /** |
| 12 | @@ -47183,6 +47185,8 @@ |
| 13 | |
| 14 | } |
| 15 | |
| 16 | +#endif // Bundled Botan |
| 17 | + |
| 18 | namespace Botan { |
| 19 | PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n) |
| 20 | { |
| 21 | --- src/libs/3rdparty/botan/botan.h.orig 2012-12-17 17:18:37.000000000 +0100 |
| 22 | +++ src/libs/3rdparty/botan/botan.h 2013-01-16 23:09:47.000000000 +0100 |
| 23 | @@ -11,6 +11,20 @@ |
| 24 | #include <QtGlobal> |
| 25 | #include <QSharedPointer> |
| 26 | |
| 27 | +#include <botan/auto_rng.h> |
| 28 | +#include <botan/cbc.h> |
| 29 | +#include <botan/der_enc.h> |
| 30 | +#include <botan/dh.h> |
| 31 | +#include <botan/dsa.h> |
| 32 | +#include <botan/hmac.h> |
| 33 | +#include <botan/init.h> |
| 34 | +#include <botan/lookup.h> |
| 35 | +#include <botan/pem.h> |
| 36 | +#include <botan/pk_filts.h> |
| 37 | +#include <botan/rsa.h> |
| 38 | + |
| 39 | +#if 0 // Bundled Botan |
| 40 | + |
| 41 | #include <iosfwd> |
| 42 | #include <map> |
| 43 | #include <exception> |
| 44 | @@ -16184,6 +16198,8 @@ |
| 45 | }; |
| 46 | } |
| 47 | |
| 48 | +#endif // Bundled Botan |
| 49 | + |
| 50 | namespace Botan { |
| 51 | typedef QSharedPointer<Public_Key> PublicKeyPtr; |
| 52 | BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n); |
| 53 | --- src/libs/3rdparty/botan/botan.pri.orig 2012-12-17 17:18:37.000000000 +0100 |
| 54 | +++ src/libs/3rdparty/botan/botan.pri 2013-01-16 22:50:26.000000000 +0100 |
| 55 | @@ -6,18 +6,6 @@ |
| 56 | |
| 57 | DEPENDPATH += . |
| 58 | |
| 59 | -DEFINES += BOTAN_DLL= |
| 60 | -unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ |
| 61 | - BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \ |
| 62 | - BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO |
| 63 | -*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \ |
| 64 | - BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \ |
| 65 | - BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER |
| 66 | -macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN |
| 67 | -*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC |
| 68 | -*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG |
| 69 | -*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL |
| 70 | - |
| 71 | win32 { |
| 72 | DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \ |
| 73 | BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \ |