diff --git a/3rdparty/curl/curl b/3rdparty/curl/curl index a05f34973e..68720b4837 160000 --- a/3rdparty/curl/curl +++ b/3rdparty/curl/curl @@ -1 +1 @@ -Subproject commit a05f34973e6c4bb629d018f7cb51487be1c904d8 +Subproject commit 68720b4837284335b2d63cb358f8f6ce65f5bc55 diff --git a/3rdparty/curl/libcurl.vcxproj b/3rdparty/curl/libcurl.vcxproj index 9acb78a8b7..0b5f25d6db 100644 --- a/3rdparty/curl/libcurl.vcxproj +++ b/3rdparty/curl/libcurl.vcxproj @@ -72,12 +72,15 @@ + + + @@ -167,13 +170,14 @@ - + + @@ -208,13 +212,19 @@ - - + + + + + + + + @@ -265,6 +275,8 @@ + + @@ -276,6 +288,7 @@ + @@ -368,12 +381,13 @@ - + + @@ -411,8 +425,13 @@ - - + + + + + + + @@ -420,6 +439,7 @@ + diff --git a/3rdparty/curl/libcurl.vcxproj.filters b/3rdparty/curl/libcurl.vcxproj.filters index 482b2f1452..ba7326baa0 100644 --- a/3rdparty/curl/libcurl.vcxproj.filters +++ b/3rdparty/curl/libcurl.vcxproj.filters @@ -366,9 +366,6 @@ Source Files - - Source Files - Source Files @@ -384,12 +381,6 @@ Source Files - - Source Files - - - Source Files - Source Files @@ -564,6 +555,45 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -944,9 +974,6 @@ Header Files - - Header Files - Header Files @@ -962,12 +989,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -1145,6 +1166,45 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/3rdparty/wolfssl/extra/win32/user_settings.h b/3rdparty/wolfssl/extra/win32/user_settings.h index 09cff64fc0..e4ca83a778 100644 --- a/3rdparty/wolfssl/extra/win32/user_settings.h +++ b/3rdparty/wolfssl/extra/win32/user_settings.h @@ -46,6 +46,9 @@ #define HAVE_AESGCM #define HAVE_SUPPORTED_CURVES #define HAVE_TLS_EXTENSIONS +#define HAVE_HKDF +#define WC_RSA_PSS +#define WOLFSSL_TLS13 #define HAVE_ECC #define ECC_SHAMIR #define ECC_TIMING_RESISTANT