Attachment #336062 for bug #439514

Lines 15-20 Link Here

(-)src/libs/3rdparty/botan/botan.cpp.orig (+4 lines)
15	#endif	15	#endif
16		16
17		17
		18	#if 0 // Bundled Botan
		19
18	namespace Botan {	20	namespace Botan {
19		21
20	/**	22	/**
Lines 47183-47188 Link Here
47183		47185
47184	}	47186	}
47185		47187
		47188	#endif // Bundled Botan
		47189
47186	namespace Botan {	47190	namespace Botan {
47187	PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n)	47191	PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n)
47188	{	47192	{

Lines 11-16 Link Here

(-)src/libs/3rdparty/botan/botan.h.orig (+16 lines)
11	#include <QtGlobal>	11	#include <QtGlobal>
12	#include <QSharedPointer>	12	#include <QSharedPointer>
13		13
		14	#include <botan/auto_rng.h>
		15	#include <botan/cbc.h>
		16	#include <botan/der_enc.h>
		17	#include <botan/dh.h>
		18	#include <botan/dsa.h>
		19	#include <botan/hmac.h>
		20	#include <botan/init.h>
		21	#include <botan/lookup.h>
		22	#include <botan/pem.h>
		23	#include <botan/pk_filts.h>
		24	#include <botan/rsa.h>
		25
		26	#if 0 // Bundled Botan
		27
14	#include <iosfwd>	28	#include <iosfwd>
15	#include <map>	29	#include <map>
16	#include <exception>	30	#include <exception>
Lines 16184-16189 Link Here
16184	};	16198	};
16185	}	16199	}
16186		16200
		16201	#endif // Bundled Botan
		16202
16187	namespace Botan {	16203	namespace Botan {
16188	typedef QSharedPointer<Public_Key> PublicKeyPtr;	16204	typedef QSharedPointer<Public_Key> PublicKeyPtr;
16189	BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n);	16205	BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n);





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 \

Return to bug 439514

Lines 6-23 Link Here

(-)src/libs/3rdparty/botan/botan.pri.orig (-12 lines)
6		6
7	DEPENDPATH += .	7	DEPENDPATH += .
8		8
9	DEFINES += BOTAN_DLL=
10	unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
11	BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
12	BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
13	linux:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
14	BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
15	BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
16	macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
17	g++:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
18	clang:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
19	icc:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
20
21	win32 {	9	win32 {
22	DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \	10	DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
23	BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \	11	BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \