MirOTR: Libgcrypt and Libgpg-error update

Libgcrypt 1.4.6 => 1.6.3
Libgpg-error 1.9 => 1.18

git-svn-id: http://svn.miranda-ng.org/main/trunk@12449 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 676 insertions, 1048 deletions

diff --git a/plugins/MirOTR/Libgcrypt/custom/config.h b/plugins/MirOTR/Libgcrypt/custom/config.h
index bdc5407dfc..bee3c5761e 100644
--- a/plugins/MirOTR/Libgcrypt/custom/config.h
+++ b/plugins/MirOTR/Libgcrypt/custom/config.h
@@ -1,437 +1,631 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */

-

-

-#ifndef _GCRYPT_CONFIG_H_INCLUDED

-#define _GCRYPT_CONFIG_H_INCLUDED

-/* need this, because some autoconf tests rely on this (e.g. stpcpy)

- * and it should be used for new programs  */

-#define _GNU_SOURCE  1

-

-

-/* Define if building universal (internal helper macro) */

-#undef AC_APPLE_UNIVERSAL_BUILD

-

-/* Subversion revision used to build this package */

-#undef BUILD_REVISION

-

-/* configure did not test for endianess */

-#undef DISABLED_ENDIAN_CHECK

-

-/* Define if you don't want the default EGD socket name. For details see

-   cipher/rndegd.c */

-#undef EGD_SOCKET_NAME

-

-/* Define to support an HMAC based integrity check */

-#undef ENABLE_HMAC_BINARY_CHECK

-

-/* Enable support for the PadLock engine. */

-#undef ENABLE_PADLOCK_SUPPORT

-

-/* Define to use the GNU C visibility attribute. */

-#undef GCRY_USE_VISIBILITY

-

-/* The default error source for libgcrypt. */

-#undef GPG_ERR_SOURCE_DEFAULT

-

-/* Define to 1 if you have the `atexit' function. */

-#define HAVE_ATEXIT 1

-

-/* Defined if the mlock() call does not work */

-#undef HAVE_BROKEN_MLOCK

-

-/* Defined if a `byte' is typedef'd */

-#undef HAVE_BYTE_TYPEDEF

-

-/* Define to 1 if you have the `clock_gettime' function. */

-#undef HAVE_CLOCK_GETTIME

-

-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you

-   don't. */

-#define HAVE_DECL_SYS_SIGLIST 0

-

-/* defined if the system supports a random device */

-#undef HAVE_DEV_RANDOM

-

-/* Define to 1 if you have the <dlfcn.h> header file. */

-#undef HAVE_DLFCN_H

-

-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */

-#undef HAVE_DOPRNT

-

-/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)

-   with special properties like no file modes */

-#define HAVE_DOSISH_SYSTEM

-

-/* defined if we must run on a stupid file system */

-#define HAVE_DRIVE_LETTERS

-

-/* Define to 1 if you have the `fcntl' function. */

-#undef HAVE_FCNTL

-

-/* Define to 1 if you have the `ftruncate' function. */

-#undef HAVE_FTRUNCATE

-

-/* Define to 1 if you have the `gethrtime' function. */

-#undef HAVE_GETHRTIME

-

-/* Define to 1 if you have the `getpagesize' function. */

-#undef HAVE_GETPAGESIZE

-

-/* Define to 1 if you have the `getrusage' function. */

-#undef HAVE_GETRUSAGE

-

-/* Define to 1 if you have the `gettimeofday' function. */

-#undef HAVE_GETTIMEOFDAY

-

-/* Define to 1 if you have the <inttypes.h> header file. */

-#undef HAVE_INTTYPES_H

-

-/* Define to 1 if you have the `rt' library (-lrt). */

-#undef HAVE_LIBRT

-

-/* Define to 1 if you have the `memmove' function. */

-#define HAVE_MEMMOVE 1

-

-/* Define to 1 if you have the <memory.h> header file. */

-#define HAVE_MEMORY_H 1

-

-/* Defined if the system supports an mlock() call */

-#undef HAVE_MLOCK

-

-/* Define to 1 if you have the `mmap' function. */

-#undef HAVE_MMAP

-

-/* Defined if the GNU Pth is available */

-#undef HAVE_PTH

-

-/* Define to 1 if you have the `raise' function. */

-#define HAVE_RAISE 1

-

-/* Define to 1 if you have the `rand' function. */

-#define HAVE_RAND 1

-

-/* Define to 1 if you have the <stdint.h> header file. */

-#undef HAVE_STDINT_H

-

-/* Define to 1 if you have the <stdlib.h> header file. */

-#define HAVE_STDLIB_H 1

-

-/* Define to 1 if you have the `stpcpy' function. */

-#undef HAVE_STPCPY

-

-/* Define to 1 if you have the `strcasecmp' function. */

-#undef HAVE_STRCASECMP

-

-/* Define to 1 if you have the `strerror' function. */

-#define HAVE_STRERROR 1

-

-/* Define to 1 if you have the `stricmp' function. */

-#define HAVE_STRICMP 1

-

-/* Define to 1 if you have the <strings.h> header file. */

-#undef HAVE_STRINGS_H

-

-/* Define to 1 if you have the <string.h> header file. */

-#define HAVE_STRING_H 1

-

-/* Define to 1 if you have the `strtoul' function. */

-#define HAVE_STRTOUL 1

-

-/* Define to 1 if you have the `sysconf' function. */

-#undef HAVE_SYSCONF

-

-/* Define to 1 if you have the `syslog' function. */

-#undef HAVE_SYSLOG

-

-/* Define to 1 if you have the <sys/capability.h> header file. */

-#undef HAVE_SYS_CAPABILITY_H

-

-/* Define to 1 if you have the <sys/mman.h> header file. */

-#undef HAVE_SYS_MMAN_H

-

-/* Define to 1 if you have the <sys/select.h> header file. */

-#undef HAVE_SYS_SELECT_H

-

-/* Define to 1 if you have the <sys/socket.h> header file. */

-#undef HAVE_SYS_SOCKET_H

-

-/* Define to 1 if you have the <sys/stat.h> header file. */

-#undef HAVE_SYS_STAT_H

-

-/* Define to 1 if you have the <sys/types.h> header file. */

-#undef HAVE_SYS_TYPES_H

-

-/* Defined if a `u16' is typedef'd */

-#undef HAVE_U16_TYPEDEF

-

-/* Defined if a `u32' is typedef'd */

-#undef HAVE_U32_TYPEDEF

-

-/* Define to 1 if the system has the type `uintptr_t'. */

-#undef HAVE_UINTPTR_T

-

-/* Defined if a `ulong' is typedef'd */

-#undef HAVE_ULONG_TYPEDEF

-

-/* Define to 1 if you have the <unistd.h> header file. */

-#undef HAVE_UNISTD_H

-

-/* Defined if a `ushort' is typedef'd */

-#undef HAVE_USHORT_TYPEDEF

-

-/* Define to 1 if you have the `vprintf' function. */

-#define HAVE_VPRINTF 1

-

-/* Defined if we run on a W32 API based system */

-#define HAVE_W32_SYSTEM 1

-

-/* Define to 1 if you have the `wait4' function. */

-#undef HAVE_WAIT4

-

-/* Define to 1 if you have the `waitpid' function. */

-#undef HAVE_WAITPID

-

-/* Define to 1 if you have the <winsock2.h> header file. */

-#define HAVE_WINSOCK2_H 1

-

-/* Define to 1 if you have the <ws2tcpip.h> header file. */

-#define HAVE_WS2TCPIP_H 1

-

-/* Defined if this is not a regular release */

-#undef IS_DEVELOPMENT_VERSION

-

-/* List of available cipher algorithms */

-#define LIBGCRYPT_CIPHERS "arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia"

-

-/* List of available digest algorithms */

-#define LIBGCRYPT_DIGESTS "dsa:elgamal:rsa:ecc"

-

-/* List of available public key cipher algorithms */

-#define LIBGCRYPT_PUBKEY_CIPHERS "crc:md4:md5:rmd160:sha1:sha256:sha512:tiger:whirlpool"

-

-/* Define to use the (obsolete) malloc guarding feature */

-#undef M_GUARD

-

-/* defined to the name of the strong random device */

-#undef NAME_OF_DEV_RANDOM

-

-/* defined to the name of the weaker random device */

-#undef NAME_OF_DEV_URANDOM

-

-/* Define to 1 if your C compiler doesn't accept -c and -o together. */

-#undef NO_MINUS_C_MINUS_O

-

-/* Name of this package */

-#define PACKAGE "libgcrypt-1.4.6.vs"

-

-/* Define to the address where bug reports for this package should be sent. */

-#undef PACKAGE_BUGREPORT

-

-/* Define to the full name of this package. */

-#define PACKAGE_NAME "libgcrypt-1.4.6 built with Visual Studio"

-

-/* Define to the full name and version of this package. */

-#undef PACKAGE_STRING

-

-/* Define to the one symbol short name of this package. */

-#undef PACKAGE_TARNAME

-

-/* Define to the home page for this package. */

-#undef PACKAGE_URL

-

-/* Define to the version of this package. */

-#define PACKAGE_VERSION "1.9"

-

-/* A human readable text with the name of the OS */

-#define PRINTABLE_OS_NAME "Win32"

-

-/* Define as the return type of signal handlers (`int' or `void'). */

-#define RETSIGTYPE void

-

-/* The size of a `unsigned int', as computed by sizeof. */

-#define SIZEOF_UNSIGNED_INT 4

-

-/* The size of a `unsigned long', as computed by sizeof. */

-#define SIZEOF_UNSIGNED_LONG 4

-

-/* The size of a `unsigned long long', as computed by sizeof. */

-#undef SIZEOF_UNSIGNED_LONG_LONG

-

-/* The size of a `unsigned short', as computed by sizeof. */

-#define SIZEOF_UNSIGNED_SHORT 2

-

-/* Define to 1 if you have the ANSI C header files. */

-#define STDC_HEADERS 1

-

-/* Defined if this module should be included */

-#define USE_AES 1

-

-/* Defined if this module should be included */

-#define USE_ARCFOUR 1

-

-/* Defined if this module should be included */

-#define USE_BLOWFISH 1

-

-/* Defined if this module should be included */

-#undef USE_CAMELLIA

-

-/* define if capabilities should be used */

-#undef USE_CAPABILITIES

-

-/* Defined if this module should be included */

-#define USE_CAST5 1

-

-

-/* Defined if this module should be included */

-#define USE_CRC 1

-

-/* Defined if this module should be included */

-#define USE_DES 1

-

-/* Defined if this module should be included */

-#define USE_DSA 1

-

-/* Defined if this module should be included */

-#define USE_ECC 1

-

-/* Defined if this module should be included */

-#define USE_ELGAMAL 1

-

-/* Defined if the GNU Portable Thread Library should be used */

-#undef USE_GNU_PTH

-

-/* Defined if this module should be included */

-#define USE_MD4 1

-

-/* Defined if this module should be included */

-#define USE_MD5 1

-

-/* set this to limit filenames to the 8.3 format */

-#undef USE_ONLY_8DOT3

-

-/* Define to support the experimental random daemon */

-#undef USE_RANDOM_DAEMON

-

-/* Defined if this module should be included */

-#define USE_RFC2268 1

-

-/* Defined if this module should be included */

-#define USE_RMD160 1

-

-/* Defined if the EGD based RNG should be used. */

-#undef USE_RNDEGD

-

-/* Defined if the /dev/random based RNG should be used. */

-#undef USE_RNDLINUX

-

-/* Defined if the default Unix RNG should be used. */

-#undef USE_RNDUNIX

-

-/* Defined if the Windows specific RNG should be used. */

-#define USE_RNDW32 1

-

-/* Defined if this module should be included */

-#define USE_RSA 1

-

-/* Defined if this module should be included */

-#define USE_SEED 1

-

-/* Defined if this module should be included */

-#define USE_SERPENT 1

-

-/* Defined if this module should be included */

-#define USE_SHA1 1

-

-/* Defined if this module should be included */

-#define USE_SHA256 1

-

-/* Defined if this module should be included */

-#define USE_SHA512 1

-

-/* Defined if this module should be included */

-#undef USE_TIGER

-

-/* Defined if this module should be included */

-#define USE_TWOFISH 1

-

-/* Defined if this module should be included */

-#define USE_WHIRLPOOL 1

-

-/* Version of this package */

-#define VERSION "1.4.6"

-

-/* Defined if compiled symbols have a leading underscore */

-#define WITH_SYMBOL_UNDERSCORE 1

-

-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most

-   significant byte first (like Motorola and SPARC, unlike Intel). */

-#if defined AC_APPLE_UNIVERSAL_BUILD

-# if defined __BIG_ENDIAN__

-#  define WORDS_BIGENDIAN 1

-# endif

-#else

-# ifndef WORDS_BIGENDIAN

-#  undef WORDS_BIGENDIAN

-# endif

-#endif

-

-/* To allow the use of Libgcrypt in multithreaded programs we have to use

-    special features from the library. */

-#ifndef _REENTRANT

-# define _REENTRANT 1

-#endif

-

-

-/* Define to empty if `const' does not conform to ANSI C. */

-#define const

-

-/* Define to `__inline__' or `__inline' if that's what the C compiler

-   calls it, or to nothing if 'inline' is not supported under any name.  */

-#ifndef __cplusplus

-//#undef inline

-#define inline __inline

-#endif

-

-/* Define to `unsigned' if <sys/types.h> does not define. */

-// #undef size_t

-

-/* Define to `int' if unavailable. */

-// #define socklen_t int

-/* Define to the type of an unsigned integer type wide enough to hold a

-   pointer, if such a type exists, and if the system does not define it. */

-#undef uintptr_t

-

-// !s0rr0w!

-#define SIZEOF_UINT64_T 8

-#define UINT64_C(C) (C)

-typedef unsigned __int64 uint64_t;

-

-#define _GCRYPT_IN_LIBGCRYPT 1

-

-/* If the configure check for endianness has been disabled, get it from

-   OS macros.  This is intended for making fat binary builds on OS X.  */

-#ifdef DISABLED_ENDIAN_CHECK

-# if defined(__BIG_ENDIAN__)

-#  define WORDS_BIGENDIAN 1

-# elif defined(__LITTLE_ENDIAN__)

-#  undef WORDS_BIGENDIAN

-# else

-#  error "No endianness found"

-# endif

-#endif /*DISABLED_ENDIAN_CHECK*/

-

-/* We basically use the original Camellia source.  Make sure the symbols 

-   properly prefixed.  */

-#define CAMELLIA_EXT_SYM_PREFIX _gcry_

-

-/* This error code is only available with gpg-error 1.7.  Thus

-   we define it here with the usual gcry prefix.  */

-#define GCRY_GPG_ERR_NOT_OPERATIONAL  176

-

-#define snprintf(a,b,c, ...) \

-                 _snprintf (a,b,c, ## __VA_ARGS__)

-

-#define F_OK 0

-

-#endif /*_GCRYPT_CONFIG_H_INCLUDED*/

-

+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+
+#ifndef _GCRYPT_CONFIG_H_INCLUDED
+#define _GCRYPT_CONFIG_H_INCLUDED
+
+/* Enable gpg-error's strerror macro for W32CE.  */
+#define GPG_ERR_ENABLE_ERRNO_MACROS 1
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* GIT commit id revision used to build this package */
+#define BUILD_REVISION "0ff1a27"
+
+/* The time this package was configured for a build */
+#define BUILD_TIMESTAMP "2015-03-20T10:36+0000"
+
+/* configure did not test for endianess */
+/* #undef DISABLED_ENDIAN_CHECK */
+
+/* Define if you don't want the default EGD socket name. For details see
+   cipher/rndegd.c */
+#define EGD_SOCKET_NAME ""
+
+/* Enable support for Intel AES-NI instructions. */
+#define ENABLE_AESNI_SUPPORT 1
+
+/* Enable support for Intel AVX2 instructions. */
+#define ENABLE_AVX2_SUPPORT 1
+
+/* Enable support for Intel AVX instructions. */
+#define ENABLE_AVX_SUPPORT 1
+
+/* Enable support for Intel DRNG (RDRAND instruction). */
+#define ENABLE_DRNG_SUPPORT 1
+
+/* Define to support an HMAC based integrity check */
+/* #undef ENABLE_HMAC_BINARY_CHECK */
+
+/* Enable support for ARM NEON instructions. */
+/* #undef ENABLE_NEON_SUPPORT */
+
+/* Enable support for the PadLock engine. */
+#define ENABLE_PADLOCK_SUPPORT 1
+
+/* Enable support for Intel PCLMUL instructions. */
+#define ENABLE_PCLMUL_SUPPORT 1
+
+/* Define to use the GNU C visibility attribute. */
+/* #undef GCRY_USE_VISIBILITY */
+
+/* The default error source for libgcrypt. */
+#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT
+
+/* Defined if ARM architecture is v6 or newer */
+/* #undef HAVE_ARM_ARCH_V6 */
+
+/* Define to 1 if you have the `atexit' function. */
+#define HAVE_ATEXIT 1
+
+/* Defined if the mlock() call does not work */
+/* #undef HAVE_BROKEN_MLOCK */
+
+/* Defined if compiler has '__builtin_bswap32' intrinsic */
+/* #undef HAVE_BUILTIN_BSWAP32 */
+
+/* Defined if compiler has '__builtin_bswap64' intrinsic */
+/* #undef HAVE_BUILTIN_BSWAP64 */
+
+/* Defined if a `byte' is typedef'd */
+/* #undef HAVE_BYTE_TYPEDEF */
+
+/* Define to 1 if you have the `clock' function. */
+#define HAVE_CLOCK 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* Defined if underlying assembler is compatible with amd64 assembly
+   implementations */
+/* #undef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
+
+/* Defined if underlying assembler is compatible with ARM assembly
+   implementations */
+/* #undef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS */
+
+/* Defined for Alpha platforms */
+/* #undef HAVE_CPU_ARCH_ALPHA */
+
+/* Defined for ARM platforms */
+/* #undef HAVE_CPU_ARCH_ARM */
+
+/* Defined for M68k platforms */
+/* #undef HAVE_CPU_ARCH_M68K */
+
+/* Defined for MIPS platforms */
+/* #undef HAVE_CPU_ARCH_MIPS */
+
+/* Defined for PPC platforms */
+/* #undef HAVE_CPU_ARCH_PPC */
+
+/* Defined for SPARC platforms */
+/* #undef HAVE_CPU_ARCH_SPARC */
+
+/* Defined for the x86 platforms */
+#define HAVE_CPU_ARCH_X86 1
+
+/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
+   don't. */
+#define HAVE_DECL_SYS_SIGLIST 0
+
+/* defined if the system supports a random device */
+/* #undef HAVE_DEV_RANDOM */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
+   with special properties like no file modes */
+#define HAVE_DOSISH_SYSTEM 1
+
+/* defined if we must run on a stupid file system */
+#define HAVE_DRIVE_LETTERS 1
+
+/* Define to 1 if you have the `fcntl' function. */
+/* #undef HAVE_FCNTL */
+
+/* Define to 1 if you have the `flockfile' function. */
+/* #undef HAVE_FLOCKFILE */
+
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define if inline asm memory barrier is supported */
+/* #undef HAVE_GCC_ASM_VOLATILE_MEMORY */
+
+/* Defined if a GCC style "__attribute__ ((aligned (n))" is supported */
+/* #undef HAVE_GCC_ATTRIBUTE_ALIGNED */
+
+/* Defined if inline assembler supports AVX instructions */
+/* #undef HAVE_GCC_INLINE_ASM_AVX */
+
+/* Defined if inline assembler supports AVX2 instructions */
+/* #undef HAVE_GCC_INLINE_ASM_AVX2 */
+
+/* Defined if inline assembler supports BMI2 instructions */
+/* #undef HAVE_GCC_INLINE_ASM_BMI2 */
+
+/* Defined if inline assembler supports NEON instructions */
+/* #undef HAVE_GCC_INLINE_ASM_NEON */
+
+/* Defined if inline assembler supports PCLMUL instructions */
+/* #undef HAVE_GCC_INLINE_ASM_PCLMUL */
+
+/* Defined if inline assembler supports SSSE3 instructions */
+/* #undef HAVE_GCC_INLINE_ASM_SSSE3 */
+
+/* Define to 1 if you have the `gethrtime' function. */
+/* #undef HAVE_GETHRTIME */
+
+/* Define to 1 if you have the `getpagesize' function. */
+/* #undef HAVE_GETPAGESIZE */
+
+/* Define to 1 if you have the `getpid' function. */
+#define HAVE_GETPID 1
+
+/* Define to 1 if you have the `getrusage' function. */
+/* #undef HAVE_GETRUSAGE */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+/* #undef HAVE_GETTIMEOFDAY */
+
+/* Defined if underlying assembler is compatible with Intel syntax assembly
+   implementations */
+#define HAVE_INTEL_SYNTAX_PLATFORM_AS 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the `rt' library (-lrt). */
+/* #undef HAVE_LIBRT */
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Defined if the system supports an mlock() call */
+/* #undef HAVE_MLOCK */
+
+/* Define to 1 if you have the `mmap' function. */
+/* #undef HAVE_MMAP */
+
+/* Defined if the GNU Pth is available */
+/* #undef HAVE_PTH */
+
+/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
+/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */
+
+/* Define if the POSIX multithreading library has read/write locks. */
+/* #undef HAVE_PTHREAD_RWLOCK */
+
+/* Define to 1 if you have the `raise' function. */
+#define HAVE_RAISE 1
+
+/* Define to 1 if you have the `rand' function. */
+#define HAVE_RAND 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+/* #undef HAVE_STPCPY */
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `stricmp' function. */
+#define HAVE_STRICMP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `sysconf' function. */
+/* #undef HAVE_SYSCONF */
+
+/* Define to 1 if you have the `syslog' function. */
+/* #undef HAVE_SYSLOG */
+
+/* Define to 1 if you have the <sys/capability.h> header file. */
+/* #undef HAVE_SYS_CAPABILITY_H */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/msg.h> header file. */
+/* #undef HAVE_SYS_MSG_H */
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+/* #undef HAVE_SYS_SELECT_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+/* #undef HAVE_SYS_SOCKET_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Defined if a `u16' is typedef'd */
+/* #undef HAVE_U16_TYPEDEF */
+
+/* Defined if a `u32' is typedef'd */
+/* #undef HAVE_U32_TYPEDEF */
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
+/* Defined if a `ulong' is typedef'd */
+/* #undef HAVE_ULONG_TYPEDEF */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Defined if a `ushort' is typedef'd */
+/* #undef HAVE_USHORT_TYPEDEF */
+
+/* Defined if variable length arrays are supported */
+/* #undef HAVE_VLA */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Defined if we run on WindowsCE */
+/* #undef HAVE_W32CE_SYSTEM */
+
+/* Defined if we run on a W32 API based system */
+#define HAVE_W32_SYSTEM 1
+
+/* Define to 1 if you have the `wait4' function. */
+/* #undef HAVE_WAIT4 */
+
+/* Define to 1 if you have the `waitpid' function. */
+/* #undef HAVE_WAITPID */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+#define HAVE_WINSOCK2_H 1
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#define HAVE_WS2TCPIP_H 1
+
+/* Defined if this is not a regular release */
+/* #undef IS_DEVELOPMENT_VERSION */
+
+/* List of available cipher algorithms */
+#define LIBGCRYPT_CIPHERS "arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia:idea:salsa20:gost28147"
+
+/* List of available digest algorithms */
+#define LIBGCRYPT_DIGESTS "crc:gostr3411-94:md4:md5:rmd160:sha1:sha256:sha512:tiger:whirlpool:stribog"
+
+/* List of available KDF algorithms */
+#define LIBGCRYPT_KDFS "s2k:pkdf2:scrypt"
+
+/* List of available public key cipher algorithms */
+#define LIBGCRYPT_PUBKEY_CIPHERS "dsa:elgamal:rsa:ecc"
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to use the (obsolete) malloc guarding feature */
+/* #undef M_GUARD */
+
+/* defined to the name of the strong random device */
+#define NAME_OF_DEV_RANDOM "/dev/random"
+
+/* defined to the name of the weaker random device */
+#define NAME_OF_DEV_URANDOM "/dev/urandom"
+
+/* Name of this package */
+#define PACKAGE "libgcrypt"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://bugs.gnupg.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libgcrypt"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libgcrypt 1.6.3"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libgcrypt"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.6.3"
+
+/* A human readable text with the name of the OS */
+#define PRINTABLE_OS_NAME "W32"
+
+/* Define if the pthread_in_use() detection is hard. */
+/* #undef PTHREAD_IN_USE_DETECTION_HARD */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* The size of `unsigned int', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_INT 4
+
+/* The size of `unsigned long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG 4
+
+/* The size of `unsigned long long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG_LONG 8
+
+/* The size of `unsigned short', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_SHORT 2
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Defined if this module should be included */
+#define USE_AES 1
+
+/* Defined if this module should be included */
+#define USE_ARCFOUR 1
+
+/* Defined if this module should be included */
+#define USE_BLOWFISH 1
+
+/* Defined if this module should be included */
+#define USE_CAMELLIA 1
+
+/* define if capabilities should be used */
+/* #undef USE_CAPABILITIES */
+
+/* Defined if this module should be included */
+#define USE_CAST5 1
+
+/* Defined if this module should be included */
+#define USE_CRC 1
+
+/* Defined if this module should be included */
+#define USE_DES 1
+
+/* Defined if this module should be included */
+#define USE_DSA 1
+
+/* Defined if this module should be included */
+#define USE_ECC 1
+
+/* Defined if this module should be included */
+#define USE_ELGAMAL 1
+
+/* Defined if the GNU Portable Thread Library should be used */
+/* #undef USE_GNU_PTH */
+
+/* Defined if this module should be included */
+#define USE_GOST28147 1
+
+/* Defined if this module should be included */
+#define USE_GOST_R_3411_12 1
+
+/* Defined if this module should be included */
+#define USE_GOST_R_3411_94 1
+
+/* Defined if this module should be included */
+#define USE_IDEA 1
+
+/* Defined if this module should be included */
+#define USE_MD4 1
+
+/* Defined if this module should be included */
+#define USE_MD5 1
+
+/* set this to limit filenames to the 8.3 format */
+#define USE_ONLY_8DOT3 1
+
+/* Define if the POSIX multithreading library can be used. */
+/* #undef USE_POSIX_THREADS */
+
+/* Define if references to the POSIX multithreading library should be made
+   weak. */
+/* #undef USE_POSIX_THREADS_WEAK */
+
+/* Define to support the experimental random daemon */
+/* #undef USE_RANDOM_DAEMON */
+
+/* Defined if this module should be included */
+#define USE_RFC2268 1
+
+/* Defined if this module should be included */
+#define USE_RMD160 1
+
+/* Defined if the EGD based RNG should be used. */
+/* #undef USE_RNDEGD */
+
+/* Defined if the /dev/random RNG should be used. */
+/* #undef USE_RNDLINUX */
+
+/* Defined if the default Unix RNG should be used. */
+/* #undef USE_RNDUNIX */
+
+/* Defined if the Windows specific RNG should be used. */
+#define USE_RNDW32 1
+
+/* Defined if the WindowsCE specific RNG should be used. */
+/* #undef USE_RNDW32CE */
+
+/* Defined if this module should be included */
+#define USE_RSA 1
+
+/* Defined if this module should be included */
+#define USE_SALSA20 1
+
+/* Defined if this module should be included */
+#define USE_SCRYPT 1
+
+/* Defined if this module should be included */
+#define USE_SEED 1
+
+/* Defined if this module should be included */
+#define USE_SERPENT 1
+
+/* Defined if this module should be included */
+#define USE_SHA1 1
+
+/* Defined if this module should be included */
+#define USE_SHA256 1
+
+/* Defined if this module should be included */
+#define USE_SHA512 1
+
+/* Define if the old Solaris multithreading library can be used. */
+/* #undef USE_SOLARIS_THREADS */
+
+/* Define if references to the old Solaris multithreading library should be
+   made weak. */
+/* #undef USE_SOLARIS_THREADS_WEAK */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
+/* Defined if this module should be included */
+#define USE_TIGER 1
+
+/* Defined if this module should be included */
+#define USE_TWOFISH 1
+
+/* Defined if this module should be included */
+#define USE_WHIRLPOOL 1
+
+/* Define if the native Windows multithreading API can be used. */
+#define USE_WINDOWS_THREADS 1
+
+/* Version of this package */
+#define VERSION "1.6.3"
+
+/* Defined if compiled symbols have a leading underscore */
+#define WITH_SYMBOL_UNDERSCORE 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* To allow the use of Libgcrypt in multithreaded programs we have to use
+    special features from the library. */
+#ifndef _REENTRANT
+# define _REENTRANT 1
+#endif
+
+
+/* Define to supported assembler block keyword, if plain 'asm' was not
+   supported */
+/* #undef asm */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline
+#endif
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* type to use in place of socklen_t if not defined */
+/* #undef socklen_t */
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
+
+
+#define _GCRYPT_IN_LIBGCRYPT 1
+
+/* If the configure check for endianness has been disabled, get it from
+   OS macros.  This is intended for making fat binary builds on OS X.  */
+#ifdef DISABLED_ENDIAN_CHECK
+# if defined(__BIG_ENDIAN__)
+#  define WORDS_BIGENDIAN 1
+# elif defined(__LITTLE_ENDIAN__)
+/* #  undef WORDS_BIGENDIAN */
+# else
+#  error "No endianness found"
+# endif
+#endif /*DISABLED_ENDIAN_CHECK*/
+
+/* We basically use the original Camellia source.  Make sure the symbols
+   properly prefixed.  */
+#define CAMELLIA_EXT_SYM_PREFIX _gcry_
+
+/* Miranda NG modifications */
+#define GPGRT_ENABLE_ES_MACROS 1
+#include <string.h>
+#define strdup _strdup
+#define stricmp _stricmp
+#define snprintf _snprintf
+#ifdef _WIN64
+#	define __x86_64__ 1
+#else
+#	define __i386__ 1
+#endif
+
+#endif /*_GCRYPT_CONFIG_H_INCLUDED*/
+
diff --git a/plugins/MirOTR/Libgcrypt/custom/config2.h b/plugins/MirOTR/Libgcrypt/custom/config2.h
deleted file mode 100644
index 25c1c83533..0000000000
--- a/plugins/MirOTR/Libgcrypt/custom/config2.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-
-#ifndef _GCRYPT_CONFIG_H_INCLUDED
-#define _GCRYPT_CONFIG_H_INCLUDED
-/* need this, because some autoconf tests rely on this (e.g. stpcpy)
- * and it should be used for new programs  */
-#define _GNU_SOURCE  1
-
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Subversion revision used to build this package */
-#undef BUILD_REVISION
-
-/* configure did not test for endianess */
-#undef DISABLED_ENDIAN_CHECK
-
-/* Define if you don't want the default EGD socket name. For details see
-   cipher/rndegd.c */
-#undef EGD_SOCKET_NAME
-
-/* Define to support an HMAC based integrity check */
-#undef ENABLE_HMAC_BINARY_CHECK
-
-/* Enable support for the PadLock engine. */
-#undef ENABLE_PADLOCK_SUPPORT
-
-/* Define to use the GNU C visibility attribute. */
-#undef GCRY_USE_VISIBILITY
-
-/* The default error source for libgcrypt. */
-#undef GPG_ERR_SOURCE_DEFAULT
-
-/* Define to 1 if you have the `atexit' function. */
-#undef HAVE_ATEXIT
-
-/* Defined if the mlock() call does not work */
-#undef HAVE_BROKEN_MLOCK
-
-/* Defined if a `byte' is typedef'd */
-#undef HAVE_BYTE_TYPEDEF
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_SIGLIST
-
-/* defined if the system supports a random device */
-#undef HAVE_DEV_RANDOM
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2)
-   with special properties like no file modes */
-#undef HAVE_DOSISH_SYSTEM
-
-/* defined if we must run on a stupid file system */
-#undef HAVE_DRIVE_LETTERS
-
-/* Define to 1 if you have the `fcntl' function. */
-#undef HAVE_FCNTL
-
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
-/* Define to 1 if you have the `gethrtime' function. */
-#undef HAVE_GETHRTIME
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-#undef HAVE_LIBRT
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Defined if the system supports an mlock() call */
-#undef HAVE_MLOCK
-
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
-/* Defined if the GNU Pth is available */
-#undef HAVE_PTH
-
-/* Define to 1 if you have the `raise' function. */
-#undef HAVE_RAISE
-
-/* Define to 1 if you have the `rand' function. */
-#undef HAVE_RAND
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the `stricmp' function. */
-#undef HAVE_STRICMP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the `sysconf' function. */
-#undef HAVE_SYSCONF
-
-/* Define to 1 if you have the `syslog' function. */
-#undef HAVE_SYSLOG
-
-/* Define to 1 if you have the <sys/capability.h> header file. */
-#undef HAVE_SYS_CAPABILITY_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Defined if a `u16' is typedef'd */
-#undef HAVE_U16_TYPEDEF
-
-/* Defined if a `u32' is typedef'd */
-#undef HAVE_U32_TYPEDEF
-
-/* Define to 1 if the system has the type `uintptr_t'. */
-#undef HAVE_UINTPTR_T
-
-/* Defined if a `ulong' is typedef'd */
-#undef HAVE_ULONG_TYPEDEF
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Defined if a `ushort' is typedef'd */
-#undef HAVE_USHORT_TYPEDEF
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Defined if we run on a W32 API based system */
-#undef HAVE_W32_SYSTEM
-
-/* Define to 1 if you have the `wait4' function. */
-#undef HAVE_WAIT4
-
-/* Define to 1 if you have the `waitpid' function. */
-#undef HAVE_WAITPID
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#undef HAVE_WINSOCK2_H
-
-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-#undef HAVE_WS2TCPIP_H
-
-/* Defined if this is not a regular release */
-#undef IS_DEVELOPMENT_VERSION
-
-/* List of available cipher algorithms */
-#undef LIBGCRYPT_CIPHERS
-
-/* List of available digest algorithms */
-#undef LIBGCRYPT_DIGESTS
-
-/* List of available public key cipher algorithms */
-#undef LIBGCRYPT_PUBKEY_CIPHERS
-
-/* Define to use the (obsolete) malloc guarding feature */
-#undef M_GUARD
-
-/* defined to the name of the strong random device */
-#undef NAME_OF_DEV_RANDOM
-
-/* defined to the name of the weaker random device */
-#undef NAME_OF_DEV_URANDOM
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of this package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* A human readable text with the name of the OS */
-#undef PRINTABLE_OS_NAME
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* The size of `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* The size of `unsigned long long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_LONG
-
-/* The size of `unsigned short', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Defined if this module should be included */
-#undef USE_AES
-
-/* Defined if this module should be included */
-#undef USE_ARCFOUR
-
-/* Defined if this module should be included */
-#undef USE_BLOWFISH
-
-/* Defined if this module should be included */
-#undef USE_CAMELLIA
-
-/* define if capabilities should be used */
-#undef USE_CAPABILITIES
-
-/* Defined if this module should be included */
-#undef USE_CAST5
-
-/* Defined if this module should be included */
-#undef USE_CRC
-
-/* Defined if this module should be included */
-#undef USE_DES
-
-/* Defined if this module should be included */
-#undef USE_DSA
-
-/* Defined if this module should be included */
-#undef USE_ECC
-
-/* Defined if this module should be included */
-#undef USE_ELGAMAL
-
-/* Defined if the GNU Portable Thread Library should be used */
-#undef USE_GNU_PTH
-
-/* Defined if this module should be included */
-#undef USE_MD4
-
-/* Defined if this module should be included */
-#undef USE_MD5
-
-/* set this to limit filenames to the 8.3 format */
-#undef USE_ONLY_8DOT3
-
-/* Define to support the experimental random daemon */
-#undef USE_RANDOM_DAEMON
-
-/* Defined if this module should be included */
-#undef USE_RFC2268
-
-/* Defined if this module should be included */
-#undef USE_RMD160
-
-/* Defined if the EGD based RNG should be used. */
-#undef USE_RNDEGD
-
-/* Defined if the /dev/random RNG should be used. */
-#undef USE_RNDLINUX
-
-/* Defined if the default Unix RNG should be used. */
-#undef USE_RNDUNIX
-
-/* Defined if the Windows specific RNG should be used. */
-#undef USE_RNDW32
-
-/* Defined if this module should be included */
-#undef USE_RSA
-
-/* Defined if this module should be included */
-#undef USE_SEED
-
-/* Defined if this module should be included */
-#undef USE_SERPENT
-
-/* Defined if this module should be included */
-#undef USE_SHA1
-
-/* Defined if this module should be included */
-#undef USE_SHA256
-
-/* Defined if this module should be included */
-#undef USE_SHA512
-
-/* Defined if this module should be included */
-#undef USE_TIGER
-
-/* Defined if this module should be included */
-#undef USE_TWOFISH
-
-/* Defined if this module should be included */
-#undef USE_WHIRLPOOL
-
-/* Version of this package */
-#undef VERSION
-
-/* Defined if compiled symbols have a leading underscore */
-#undef WITH_SYMBOL_UNDERSCORE
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* To allow the use of Libgcrypt in multithreaded programs we have to use
-    special features from the library. */
-#ifndef _REENTRANT
-# define _REENTRANT 1
-#endif
-
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* type to use in place of socklen_t if not defined */
-#undef socklen_t
-
-/* Define to the type of an unsigned integer type wide enough to hold a
-   pointer, if such a type exists, and if the system does not define it. */
-#undef uintptr_t
-
-
-#define _GCRYPT_IN_LIBGCRYPT 1
-
-/* If the configure check for endianness has been disabled, get it from
-   OS macros.  This is intended for making fat binary builds on OS X.  */
-#ifdef DISABLED_ENDIAN_CHECK
-# if defined(__BIG_ENDIAN__)
-#  define WORDS_BIGENDIAN 1
-# elif defined(__LITTLE_ENDIAN__)
-#  undef WORDS_BIGENDIAN
-# else
-#  error "No endianness found"
-# endif
-#endif /*DISABLED_ENDIAN_CHECK*/
-
-/* We basically use the original Camellia source.  Make sure the symbols 
-   properly prefixed.  */
-#define CAMELLIA_EXT_SYM_PREFIX _gcry_
-
-/* This error code is only available with gpg-error 1.7.  Thus
-   we define it here with the usual gcry prefix.  */
-#define GCRY_GPG_ERR_NOT_OPERATIONAL  176
-
-
-#endif /*_GCRYPT_CONFIG_H_INCLUDED*/
-
diff --git a/plugins/MirOTR/Libgcrypt/custom/libgcrypt-1.2.2.def b/plugins/MirOTR/Libgcrypt/custom/libgcrypt-1.2.2.def
deleted file mode 100644
index f149e99d7d..0000000000
--- a/plugins/MirOTR/Libgcrypt/custom/libgcrypt-1.2.2.def
+++ /dev/null
@@ -1,183 +0,0 @@
-

-LIBRARY libgcrypt

-

-EXPORTS

-		gcry_ac_close				@1

-		gcry_ac_data_clear			@2

-		gcry_ac_data_copy			@3

-		gcry_ac_data_decrypt		@4

-		gcry_ac_data_destroy		@5

-		gcry_ac_data_encrypt		@6

-		gcry_ac_data_get_index		@7

-		gcry_ac_data_get_name		@8

-		gcry_ac_data_length			@9

-		gcry_ac_data_new			@10

-		gcry_ac_data_set			@11

-		gcry_ac_data_sign			@12

-		gcry_ac_data_verify			@13

-		gcry_ac_flags				@14

-		gcry_ac_id_to_name			@15

-		gcry_ac_key_data_get		@16

-		gcry_ac_key_destroy			@17

-		gcry_ac_key_generate_specs	@18

-		gcry_ac_key_get_grip		@19

-		gcry_ac_key_get_nbits		@20

-		gcry_ac_key_init			@21

-		gcry_ac_key_pair_destroy	@22

-		gcry_ac_key_pair_extract	@23

-		gcry_ac_key_pair_generate	@24

-		gcry_ac_key_test			@25

-		gcry_ac_name_to_id			@26

-		gcry_ac_open				@27

-		gcry_calloc					@28

-		gcry_calloc_secure			@29

-		gcry_check_version			@30

-		gcry_cipher_algo_info		@31

-		gcry_cipher_algo_name		@32

-		gcry_cipher_close			@33

-		gcry_cipher_ctl				@34

-		gcry_cipher_decrypt			@35

-		gcry_cipher_encrypt			@36

-		gcry_cipher_get_algo_blklen	@37

-		gcry_cipher_get_algo_keylen	@38

-		gcry_cipher_info			@39

-		gcry_cipher_list			@40

-		gcry_cipher_map_name		@41

-		gcry_cipher_mode_from_oid	@42

-		gcry_cipher_open			@43

-		gcry_cipher_register		@44

-		gcry_cipher_unregister		@45

-		gcry_control				@46

-		gcry_create_nonce			@47

-		gcry_err_code_from_errno	@48

-		gcry_err_code_to_errno		@49

-		gcry_err_make_from_errno	@50

-		gcry_error_from_errno		@51

-		gcry_free					@52

-		gcry_is_secure				@53

-		gcry_malloc					@54

-		gcry_malloc_secure			@55

-		gcry_md_algo_info			@56

-		gcry_md_algo_name			@57

-		gcry_md_close				@58

-		gcry_md_copy				@59

-		gcry_md_ctl					@60

-		gcry_md_enable				@61

-		gcry_md_get					@62

-		gcry_md_get_algo			@63

-		gcry_md_get_algo_dlen		@64

-		gcry_md_hash_buffer			@65

-		gcry_md_info				@66

-		gcry_md_is_enabled			@67

-		gcry_md_is_secure			@68

-		gcry_md_list				@69

-		gcry_md_map_name			@70

-		gcry_md_open				@71

-		gcry_md_read				@72

-		gcry_md_register			@73

-		gcry_md_reset				@74

-		gcry_md_setkey				@75

-		gcry_md_unregister			@76

-		gcry_md_write				@77

-		gcry_mpi_add				@78

-		gcry_mpi_add_ui				@79

-		gcry_mpi_addm				@80

-		gcry_mpi_aprint				@81

-		gcry_mpi_clear_bit			@82

-		gcry_mpi_clear_flag			@83

-		gcry_mpi_clear_highbit		@84

-		gcry_mpi_cmp				@85

-		gcry_mpi_cmp_ui				@86

-		gcry_mpi_copy				@87

-		gcry_mpi_div				@88

-		gcry_mpi_dump				@89

-		gcry_mpi_gcd				@90

-		gcry_mpi_get_flag			@91

-		gcry_mpi_get_nbits			@92

-		gcry_mpi_get_opaque			@93

-		gcry_mpi_invm				@94

-		gcry_mpi_mod				@95

-		gcry_mpi_mul				@96

-		gcry_mpi_mul_2exp			@97

-		gcry_mpi_mul_ui				@98

-		gcry_mpi_mulm				@99

-		gcry_mpi_new				@100

-		gcry_mpi_powm				@101

-		gcry_mpi_print				@102

-		gcry_mpi_randomize			@103

-		gcry_mpi_release			@104

-		gcry_mpi_rshift				@105

-		gcry_mpi_scan				@106

-		gcry_mpi_set				@107

-		gcry_mpi_set_bit			@108

-		gcry_mpi_set_flag			@109

-		gcry_mpi_set_highbit		@110

-		gcry_mpi_set_opaque			@111

-		gcry_mpi_set_ui				@112

-		gcry_mpi_snew				@113

-		gcry_mpi_sub				@114

-		gcry_mpi_sub_ui				@115

-		gcry_mpi_subm				@116

-		gcry_mpi_swap				@117

-		gcry_mpi_test_bit			@118

-		gcry_pk_algo_info			@119

-		gcry_pk_algo_name			@120

-		gcry_pk_ctl					@121

-		gcry_pk_decrypt				@122

-		gcry_pk_encrypt				@123

-		gcry_pk_genkey				@124

-		gcry_pk_get_keygrip			@125

-		gcry_pk_get_nbits			@126

-		gcry_pk_list				@127

-		gcry_pk_map_name			@128

-		gcry_pk_register			@129

-		gcry_pk_sign				@130

-		gcry_pk_testkey				@131

-		gcry_pk_unregister			@132

-		gcry_pk_verify				@133

-		gcry_prime_check			@134

-		gcry_prime_generate			@135

-		gcry_prime_group_generator	@136

-		gcry_prime_release_factors	@137

-		gcry_random_add_bytes		@138

-		gcry_random_bytes			@139

-		gcry_random_bytes_secure	@140

-		gcry_randomize				@141

-		gcry_realloc				@142

-		gcry_set_allocation_handler	@143

-		gcry_set_fatalerror_handler	@144

-		gcry_set_gettext_handler	@145

-		gcry_set_log_handler		@146

-		gcry_set_outofcore_handler	@147

-		gcry_set_progress_handler	@148

-		gcry_sexp_alist				@149

-		gcry_sexp_append			@150

-		gcry_sexp_build				@151

-		gcry_sexp_build_array		@152

-		gcry_sexp_cadr				@153

-		gcry_sexp_canon_len			@154

-		gcry_sexp_car				@155

-		gcry_sexp_cdr				@156

-		gcry_sexp_cons				@157

-		gcry_sexp_create			@158

-		gcry_sexp_dump				@159

-		gcry_sexp_find_token		@160

-		gcry_sexp_length			@161

-		gcry_sexp_new				@162

-		gcry_sexp_nth				@163

-		gcry_sexp_nth_data			@164

-		gcry_sexp_nth_mpi			@165

-		gcry_sexp_prepend			@166

-		gcry_sexp_release			@167

-		gcry_sexp_sprint			@168

-		gcry_sexp_sscan				@169

-		gcry_sexp_vlist				@170

-		gcry_strdup					@171

-		gcry_strerror				@172

-		gcry_strsource				@173

-		gcry_xcalloc				@174

-		gcry_xcalloc_secure			@175

-		gcry_xmalloc				@176

-		gcry_xmalloc_secure			@177

-		gcry_xrealloc				@178

-		gcry_xstrdup				@179

diff --git a/plugins/MirOTR/Libgcrypt/custom/sys/file.h b/plugins/MirOTR/Libgcrypt/custom/sys/file.h
new file mode 100644
index 0000000000..cd304557e7
--- /dev/null
+++ b/plugins/MirOTR/Libgcrypt/custom/sys/file.h
@@ -0,0 +1 @@
+#include <fcntl.h>
diff --git a/plugins/MirOTR/Libgcrypt/custom/sys/time.h b/plugins/MirOTR/Libgcrypt/custom/sys/time.h
new file mode 100644
index 0000000000..23b0737125
--- /dev/null
+++ b/plugins/MirOTR/Libgcrypt/custom/sys/time.h
@@ -0,0 +1 @@
+#include <time.h>

diff --git a/plugins/MirOTR/Libgcrypt/custom/unistd.h b/plugins/MirOTR/Libgcrypt/custom/unistd.h
new file mode 100644
index 0000000000..34ecb918d1
--- /dev/null
+++ b/plugins/MirOTR/Libgcrypt/custom/unistd.h
@@ -0,0 +1,43 @@
+#ifndef NG_UNISTD_H
+#define NG_UNISTD_H
+#include <basetsd.h>
+#include <stddef.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#ifndef S_IWUSR
+#	define S_IWUSR _S_IWRITE
+#endif
+#ifndef S_IRUSR
+#	define S_IRUSR _S_IREAD
+#endif
+#ifndef S_IXUSR
+#	define S_IXUSR _S_IEXEC
+#endif
+#ifndef S_ISREG
+#	define S_ISREG(A) (1)
+#endif
+
+#ifndef offsetof
+#	define offsetof(type, member) ((size_t)&((type *)0)->member)
+#endif
+
+#include <io.h>
+#define F_OK 0	/* Check for file existence */
+#define X_OK 1	/* Check for execute permission. */
+#define W_OK 2	/* Check for write permission */
+#define R_OK 4	/* Check for read permission */
+
+#define open _open
+#define close _close
+#define fileno _fileno
+#define setmode _setmode
+#define access _access
+#define lseek _lseek
+#define read _read
+#define write _write
+
+#include <process.h>
+#define getpid _getpid
+
+#endif // NG_UNISTD_H