wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to define missing gnutls_kx_algorithm_t values for old versions of gnutls.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-07-10 06:39:46 +02:00
parent f902de09d5
commit 245467db83
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -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:

29
patches/secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch Normal file
View File

@ -0,0 +1,29 @@
From 7ce6926804895efc9abe5ebee6190fd47a79421a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
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