From: Tim Kosse <tim.kosse@filezilla-project.org>
Date: Sat, 18 Apr 2015 09:38:57 +0000 (+0200)
Subject: ncrypt.h lacks some defines with some versions of MinGW.
X-Git-Tag: gnutls_3_4_1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977fbb869fb0dc347ba5e17cef31df26b019029b;p=thirdparty%2Fgnutls.git

ncrypt.h lacks some defines with some versions of MinGW.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/lib/system-keys-win.c b/lib/system-keys-win.c
index 610cc2349a..273ae2830c 100644
--- a/lib/system-keys-win.c
+++ b/lib/system-keys-win.c
@@ -46,10 +46,30 @@
 
 #define DYN_NCRYPT
 
-#ifndef DYN_NCRYPT
-# include <ncrypt.h>
+#include <ncrypt.h>
+
+// MinGW headers may not have these defines
+#ifndef NCRYPT_SHA1_ALGORITHM
+#define NCRYPT_SHA1_ALGORITHM           BCRYPT_SHA1_ALGORITHM
+#endif
+#ifndef NCRYPT_SHA256_ALGORITHM
+#define NCRYPT_SHA256_ALGORITHM         BCRYPT_SHA256_ALGORITHM
+#endif
+#ifndef NCRYPT_SHA384_ALGORITHM
+#define NCRYPT_SHA384_ALGORITHM         BCRYPT_SHA384_ALGORITHM
+#endif
+#ifndef NCRYPT_SHA512_ALGORITHM
+#define NCRYPT_SHA512_ALGORITHM         BCRYPT_SHA512_ALGORITHM
+#endif
+#ifndef NCRYPT_PAD_PKCS1_FLAG
+#define NCRYPT_PAD_PKCS1_FLAG 2
+#endif
+#ifndef NCRYPT_ALGORITHM_PROPERTY
+#define NCRYPT_ALGORITHM_PROPERTY               L"Algorithm Name"
+#endif
+#ifndef CERT_NCRYPT_KEY_HANDLE_TRANSFER_PROP_ID
+#define CERT_NCRYPT_KEY_HANDLE_TRANSFER_PROP_ID 99
 #endif
-/* ncrypt.h and shlwapi.h not included to allow compilation in windows XP */
 
 #define MAX_WID_SIZE 48