diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6c459921..e9a4ce8c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -272,6 +272,7 @@ patch_enable_all () enable_riched20_IText_Interface="$1" enable_rpcrt4_Pipe_Transport="$1" enable_rpcrt4_RpcBindingServerFromClient="$1" + enable_secur32_Gnutls_Algorithms="$1" enable_secur32_Zero_Buffer_Length="$1" enable_server_ClipCursor="$1" enable_server_CreateProcess_ACLs="$1" @@ -993,6 +994,9 @@ patch_enable () rpcrt4-RpcBindingServerFromClient) enable_rpcrt4_RpcBindingServerFromClient="$2" ;; + secur32-Gnutls_Algorithms) + enable_secur32_Gnutls_Algorithms="$2" + ;; secur32-Zero_Buffer_Length) enable_secur32_Zero_Buffer_Length="$2" ;; @@ -5829,6 +5833,18 @@ if test "$enable_rpcrt4_RpcBindingServerFromClient" -eq 1; then ) >> "$patchlist" fi +# Patchset secur32-Gnutls_Algorithms +# | +# | Modified files: +# | * dlls/secur32/schannel_gnutls.c +# | +if test "$enable_secur32_Gnutls_Algorithms" -eq 1; then + patch_apply secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch + ( + echo '+ { "Sebastian Lackner", "secur32: Define missing gnutls_kx_algorithm_t values for old gnutls versions.", 1 },'; + ) >> "$patchlist" +fi + # Patchset secur32-Zero_Buffer_Length # | # | This patchset fixes the following Wine bugs: diff --git a/patches/secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch b/patches/secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch new file mode 100644 index 00000000..9b4f84af --- /dev/null +++ b/patches/secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch @@ -0,0 +1,29 @@ +From 7ce6926804895efc9abe5ebee6190fd47a79421a Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sun, 10 Jul 2016 06:35:28 +0200 +Subject: secur32: Define missing gnutls_kx_algorithm_t values for old gnutls + versions. + +--- + dlls/secur32/schannel_gnutls.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c +index 7f2dbd6..9a96634 100644 +--- a/dlls/secur32/schannel_gnutls.c ++++ b/dlls/secur32/schannel_gnutls.c +@@ -82,6 +82,11 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); + #define GNUTLS_CIPHER_AES_192_CBC 92 + #define GNUTLS_CIPHER_AES_128_GCM 93 + #define GNUTLS_CIPHER_AES_256_GCM 94 ++ ++#define GNUTLS_KX_ANON_ECDH 11 ++#define GNUTLS_KX_ECDHE_RSA 12 ++#define GNUTLS_KX_ECDHE_ECDSA 13 ++#define GNUTLS_KX_ECDHE_PSK 14 + #endif + + static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) +-- +2.8.0 +