From d654c8fe4b15fefc072ddec8a7bca2b1e2ba2d2b Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 28 Sep 2017 07:42:39 +0200 Subject: [PATCH] Added patch to fix length of some algorithm names in aProvEnumAlgsEx array. --- patches/patchinstall.sh | 16 ++++++++++ ...h-of-some-algorithm-names-in-aProvEn.patch | 30 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 patches/rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 464320e1..a0eb72a5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -329,6 +329,7 @@ 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" @@ -1266,6 +1267,9 @@ 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" ;; @@ -7532,6 +7536,18 @@ 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: diff --git a/patches/rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch b/patches/rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch new file mode 100644 index 00000000..3ee2af99 --- /dev/null +++ b/patches/rsaenh-aProvEnumAlgsEx/0001-rsaenh-Fix-length-of-some-algorithm-names-in-aProvEn.patch @@ -0,0 +1,30 @@ +From efb2fa6dc278a8282fbfd9af85b087eea668ced8 Mon Sep 17 00:00:00 2001 +From: Louis Lenders +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 +--- + 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 +