]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
schannel: enable CALG_TLS1PRF for w32api >= 5.1
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Thu, 12 Jul 2018 12:38:00 +0000 (14:38 +0200)
committerMarcel Raad <Marcel.Raad@teamviewer.com>
Thu, 12 Jul 2018 12:38:55 +0000 (14:38 +0200)
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

index ab7d1c9834d3da852aafadb53c7ad46e1e1e57f5..ebd1c1c042da2b4d2b29c2c1557d4758945714c4 100644 (file)
@@ -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