diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2018-07-12 14:38:00 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2018-07-12 14:38:55 +0200 |
| commit | 2c33105dbf146c78a9a9db6867d0644838e92856 (patch) | |
| tree | d2f18695d4cfe62419b70e9999352ff548ddb3d1 | |
| parent | 29b78a537fc9602f974f8f7dfc5ae57b9df8d75e (diff) | |
| download | curl-2c33105dbf146c78a9a9db6867d0644838e92856.tar.gz | |
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
| -rw-r--r-- | lib/vtls/schannel.c | 8 |
1 files changed, 6 insertions, 2 deletions
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 |