summaryrefslogtreecommitdiffstats
path: root/src/json-c-2-fix-wincrypt-include.patch
diff options
context:
space:
mode:
authorTobias Gruetzmacher <tobias-git@23.gs>2014-10-12 18:11:10 (GMT)
committerTobias Gruetzmacher <tobias-git@23.gs>2014-10-12 18:11:10 (GMT)
commit847683cd5cc43f0aa6852882df631f2d42962e7c (patch)
treeca48289fd17edef1b20c6b1a1a6a6dd96ce73284 /src/json-c-2-fix-wincrypt-include.patch
parent3c2562b8d294c549ae5110b00de463a9898e5be1 (diff)
downloadmxe-847683cd5cc43f0aa6852882df631f2d42962e7c.zip
mxe-847683cd5cc43f0aa6852882df631f2d42962e7c.tar.gz
mxe-847683cd5cc43f0aa6852882df631f2d42962e7c.tar.bz2
json-c: Update, enable shared & refresh patch.
This fixes CVE-2013-6371 and CVE-2013-6370.
Diffstat (limited to 'src/json-c-2-fix-wincrypt-include.patch')
-rw-r--r--src/json-c-2-fix-wincrypt-include.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/json-c-2-fix-wincrypt-include.patch b/src/json-c-2-fix-wincrypt-include.patch
new file mode 100644
index 0000000..83c5553
--- /dev/null
+++ b/src/json-c-2-fix-wincrypt-include.patch
@@ -0,0 +1,21 @@
+This file is part of MXE.
+See index.html for further information.
+
+mingw32 doesn't include wincrypt.h in windows.h, so the build fails.
+
+This is basically
+https://github.com/ams-cs/json-c/commit/ca0ebe0f71b806f73a20d5d5e0da78aba5de42be
+
+--- a/random_seed.c 2014-04-11 02:41:08.000000000 +0200
++++ b/random_seed.c 2014-10-12 20:07:32.419043270 +0200
+@@ -181,7 +181,10 @@
+ #define HAVE_CRYPTGENRANDOM 1
+
+ #include <windows.h>
++#include <wincrypt.h>
++#ifndef __GNUC__
+ #pragma comment(lib, "advapi32.lib")
++#endif
+
+ static int get_cryptgenrandom_seed()
+ {