aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2018-07-10 21:02:17 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2018-07-11 13:04:15 +0200
commit48cf45c5aa541d1a13d1d82d6a28e7233895c6e9 (patch)
tree2964875c95a5151b45fd1d418bfcf7444ccd1334
parent1f6e38e6af73b6b11e1a7e4032cfd056d1000e70 (diff)
schannel: fix MinGW compile break
Original MinGW's w32api has a sytax error in its definition of CALG_TLS1PRF [0]. Don't use original MinGW w32api's CALG_TLS1PRF until this bug [1] is fixed. [0] https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/blobs/d1d4a17e51a2b78e252ef0147d483267d56c90cc/w32api/include/wincrypt.h [1] https://osdn.net/projects/mingw/ticket/38391 Fixes https://github.com/curl/curl/pull/2721#issuecomment-403636043 Closes https://github.com/curl/curl/pull/2728
-rw-r--r--lib/vtls/schannel.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 382efb525..ab7d1c983 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -285,7 +285,11 @@ get_alg_id_by_name(char *name)
#ifdef CALG_HMAC
CIPHEROPTION(CALG_HMAC);
#endif
+#if !defined(__W32API_VERSION) || defined(__MINGW64_VERSION_MAJOR)
+ /* CALG_TLS1PRF has a syntax error in MinGW's w32api,
+ see https://osdn.net/projects/mingw/ticket/38391 */
CIPHEROPTION(CALG_TLS1PRF);
+#endif
#ifdef CALG_HASH_REPLACE_OWF
CIPHEROPTION(CALG_HASH_REPLACE_OWF);
#endif