From 2c33105dbf146c78a9a9db6867d0644838e92856 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Thu, 12 Jul 2018 14:38:00 +0200 Subject: schannel: enable CALG_TLS1PRF for w32api >= 5.1 The definition of CALG_TLS1PRF has been fixed in the 5.1 branch: https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/commits/73aedcc0f2e6ba370de0d86ab878ad76a0dda7b5 --- lib/vtls/schannel.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/vtls/schannel.c') diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index ab7d1c983..ebd1c1c04 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -285,8 +285,12 @@ 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, +#if !defined(__W32API_MAJOR_VERSION) || \ + !defined(__W32API_MINOR_VERSION) || \ + defined(__MINGW64_VERSION_MAJOR) || \ + (__W32API_MAJOR_VERSION > 5) || \ + ((__W32API_MAJOR_VERSION == 5) && (__W32API_MINOR_VERSION > 0)) + /* CALG_TLS1PRF has a syntax error in MinGW's w32api up to version 5.0, see https://osdn.net/projects/mingw/ticket/38391 */ CIPHEROPTION(CALG_TLS1PRF); #endif -- cgit v1.2.3