]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
ncrypt.h lacks some defines with some versions of MinGW.
authorTim Kosse <tim.kosse@filezilla-project.org>
Sat, 18 Apr 2015 09:38:57 +0000 (11:38 +0200)
committerNikos Mavrogiannopoulos <nmav@gnutls.org>
Sun, 19 Apr 2015 07:24:10 +0000 (09:24 +0200)
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
lib/system-keys-win.c

index 610cc2349a31f1bfd58eec21163f14c3ca42a9ff..273ae2830c1562c3d16c96786b4825e14c7de332 100644 (file)
 
 #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