wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fb8226f639093a3fef41f7273fa0089246d1dfa4.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-10-06 23:32:59 +02:00
parent 7c183df10b
commit 1b974b234d
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "825d5c86415d9e76c92a9d533c00790efe847ae7"
echo "fb8226f639093a3fef41f7273fa0089246d1dfa4"
}
# Show version information
@ -330,7 +330,6 @@ patch_enable_all ()
enable_riched20_Class_Tests="$1"
enable_riched20_IText_Interface="$1"
enable_rpcrt4_Race_Condition="$1"
enable_rsaenh_aProvEnumAlgsEx="$1"
enable_secur32_Zero_Buffer_Length="$1"
enable_server_ClipCursor="$1"
enable_server_CreateProcess_ACLs="$1"
@ -1273,9 +1272,6 @@ patch_enable ()
rpcrt4-Race_Condition)
enable_rpcrt4_Race_Condition="$2"
;;
rsaenh-aProvEnumAlgsEx)
enable_rsaenh_aProvEnumAlgsEx="$2"
;;
secur32-Zero_Buffer_Length)
enable_secur32_Zero_Buffer_Length="$2"
;;
@ -7637,18 +7633,6 @@ if test "$enable_rpcrt4_Race_Condition" -eq 1; then
) >> "$patchlist"
fi
# Patchset rsaenh-aProvEnumAlgsEx
# |
# | Modified files:
# | * dlls/rsaenh/rsaenh.c
# |
if test "$enable_rsaenh_aProvEnumAlgsEx" -eq 1; then
patch_apply rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch
(
printf '%s\n' '+ { "Louis Lenders", "rsaenh: Fix length of some algorithm names in aProvEnumAlgsEx array.", 1 },';
) >> "$patchlist"
fi
# Patchset secur32-Zero_Buffer_Length
# |
# | This patchset fixes the following Wine bugs:

30
patches/rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch
View File

@ -1,30 +0,0 @@
From efb2fa6dc278a8282fbfd9af85b087eea668ced8 Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Mon, 25 Sep 2017 00:07:12 +0200
Subject: rsaenh: Fix length of some algorithm names in aProvEnumAlgsEx array.
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
---
dlls/rsaenh/rsaenh.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 3db828638b9..97eb4743746 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -246,9 +246,9 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] =
{CALG_AES_192, 192,192, 192,0, 8,"AES-192", 39,"Advanced Encryption Standard (AES-192)"},
{CALG_AES_256, 256,256, 256,0, 8,"AES-256", 39,"Advanced Encryption Standard (AES-256)"},
{CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"},
- {CALG_SHA_256, 256,256, 256,CRYPT_FLAG_SIGNING, 6,"SHA-256", 30,"Secure Hash Algorithm (SHA-256)"},
- {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-384)"},
- {CALG_SHA_512, 512,512, 512,CRYPT_FLAG_SIGNING, 6,"SHA-512", 30,"Secure Hash Algorithm (SHA-512)"},
+ {CALG_SHA_256, 256,256, 256,CRYPT_FLAG_SIGNING, 8,"SHA-256", 32,"Secure Hash Algorithm (SHA-256)"},
+ {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 8,"SHA-384", 32,"Secure Hash Algorithm (SHA-384)"},
+ {CALG_SHA_512, 512,512, 512,CRYPT_FLAG_SIGNING, 8,"SHA-512", 32,"Secure Hash Algorithm (SHA-512)"},
{CALG_MD2, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD2", 23,"Message Digest 2 (MD2)"},
{CALG_MD4, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD4", 23,"Message Digest 4 (MD4)"},
{CALG_MD5, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD5", 23,"Message Digest 5 (MD5)"},
--
2.14.1