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

Rebase against d53b711f27f15cdeb9700e86526dab13ddf8d731.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-08-18 05:31:27 +02:00
parent 62f94a1ed2
commit ea6cb58103
7 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch
View File

@ -1,19 +1,19 @@
From 9e70e218c8a5c497ece71e17034ccae2e0baa218 Mon Sep 17 00:00:00 2001
From 12402a522209bfaf340b6a94b6777f93a530160f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Dec 2016 05:37:02 +0100
Subject: bcrypt/tests: Add tests for AES GCM mode.
---
dlls/bcrypt/tests/bcrypt.c | 155 ++++++++++++++++++++++++++++++++++++++++++++-
include/bcrypt.h | 29 +++++++++
include/bcrypt.h | 24 ++++++-
include/ntstatus.h | 2 +
3 files changed, 185 insertions(+), 1 deletion(-)
3 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 23e150e..699a995 100644
index c6921096f74..f551345aca0 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -941,6 +941,8 @@ static void test_BCryptGenerateSymmetricKey(void)
@@ -838,6 +838,8 @@ static void test_BCryptGenerateSymmetricKey(void)
static void test_BCryptEncrypt(void)
{
@ -22,7 +22,7 @@ index 23e150e..699a995 100644
static UCHAR secret[] =
{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
static UCHAR iv[] =
@@ -959,15 +961,28 @@ static void test_BCryptEncrypt(void)
@@ -856,15 +858,28 @@ static void test_BCryptEncrypt(void)
{0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79,
0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb,
0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4};
@ -52,7 +52,7 @@ index 23e150e..699a995 100644
len = 0xdeadbeef;
size = sizeof(len);
ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
@@ -1054,12 +1069,101 @@ static void test_BCryptEncrypt(void)
@@ -951,12 +966,101 @@ static void test_BCryptEncrypt(void)
ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
HeapFree(GetProcessHeap(), 0, buf);
@ -154,7 +154,7 @@ index 23e150e..699a995 100644
static UCHAR secret[] =
{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
static UCHAR iv[] =
@@ -1081,6 +1185,12 @@ static void test_BCryptDecrypt(void)
@@ -978,6 +1082,12 @@ static void test_BCryptDecrypt(void)
{0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79,
0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb,
0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4};
@ -164,12 +164,12 @@ index 23e150e..699a995 100644
+ static UCHAR tag[] =
+ {0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
+ BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
BCRYPT_KEY_LENGTHS_STRUCT key_lengths;
BCRYPT_ALG_HANDLE aes;
BCRYPT_KEY_HANDLE key;
UCHAR *buf, plaintext[48], ivbuf[16];
@@ -1090,6 +1200,10 @@ static void test_BCryptDecrypt(void)
ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0);
ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
@@ -997,6 +1107,10 @@ static void test_BCryptDecrypt(void)
ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength);
ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement);
+ /******************
+ * AES - CBC mode *
@ -178,7 +178,7 @@ index 23e150e..699a995 100644
len = 0xdeadbeef;
size = sizeof(len);
ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);
@@ -1187,6 +1301,45 @@ static void test_BCryptDecrypt(void)
@@ -1094,6 +1208,45 @@ static void test_BCryptDecrypt(void)
ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
HeapFree(GetProcessHeap(), 0, buf);
@ -225,18 +225,14 @@ index 23e150e..699a995 100644
ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
}
diff --git a/include/bcrypt.h b/include/bcrypt.h
index 6af85e3..b8ff624 100644
index 2555bf06b82..acf2f30e21c 100644
--- a/include/bcrypt.h
+++ b/include/bcrypt.h
@@ -85,6 +85,35 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER
ULONG dwFlags;
} BCRYPT_ALGORITHM_IDENTIFIER;
+typedef struct __BCRYPT_KEY_LENGTHS_STRUCT
+{
+ ULONG dwMinLength;
+ ULONG dwMaxLength;
+ ULONG dwIncrement;
@@ -90,7 +90,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT
ULONG dwMinLength;
ULONG dwMaxLength;
ULONG dwIncrement;
-} BCRYPT_KEY_LENGTHS_STRUCT;
+} BCRYPT_KEY_LENGTHS_STRUCT, BCRYPT_AUTH_TAG_LENGTHS_STRUCT;
+
+typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO
@ -260,12 +256,11 @@ index 6af85e3..b8ff624 100644
+
+#define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001
+#define BCRYPT_AUTH_MODE_IN_PROGRESS_FLAG 0x00000002
+
typedef PVOID BCRYPT_ALG_HANDLE;
typedef PVOID BCRYPT_KEY_HANDLE;
typedef PVOID BCRYPT_HANDLE;
diff --git a/include/ntstatus.h b/include/ntstatus.h
index 86dad85..7026de7 100644
index 86dad85b43f..7026de7f85f 100644
--- a/include/ntstatus.h
+++ b/include/ntstatus.h
@@ -990,6 +990,8 @@
@ -278,5 +273,5 @@ index 86dad85..7026de7 100644
#define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS) 0xC0020002)
#define RPC_NT_INVALID_BINDING ((NTSTATUS) 0xC0020003)
--
2.9.0
2.13.1

14
patches/bcrypt-Improvements/0014-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_CHAINI.patch
View File

@ -1,4 +1,4 @@
From 6de382845ffbb12d514a0ece9483a72b34df852e Mon Sep 17 00:00:00 2001
From 46ceeaa21f5c7c9201233313826ac64a569c558a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Dec 2016 06:46:11 +0100
Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
@ -9,7 +9,7 @@ Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 595d36d7dbe..3ab80a1a31a 100644
index 93e805dcbfe..4b0b297ed85 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -470,17 +470,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
@ -38,13 +38,13 @@ index 595d36d7dbe..3ab80a1a31a 100644
+ memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) );
+ return STATUS_SUCCESS;
}
break;
if (!strcmpW( prop, BCRYPT_KEY_LENGTHS ))
{
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 08a83aaf7a5..1a5523726dd 100644
index 7f23c687148..6653f6632a4 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -729,7 +729,7 @@ static void test_aes(void)
@@ -730,7 +730,7 @@ static void test_aes(void)
size = 0;
ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0);
@ -54,5 +54,5 @@ index 08a83aaf7a5..1a5523726dd 100644
size = 0;
--
2.11.0
2.13.1

14
patches/bcrypt-Improvements/0015-bcrypt-Implement-BCryptGetProperty-for-BCRYPT_AUTH_T.patch
View File

@ -1,4 +1,4 @@
From 5f7f79f4ae52f87eeaaa04617a7cd9289dd655b2 Mon Sep 17 00:00:00 2001
From 9b09bc711cc5814452b046985720d925587f329b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Dec 2016 06:50:28 +0100
Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
@ -9,11 +9,11 @@ Subject: bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index 3ab80a1a31a..0a990158361 100644
index 4b0b297ed85..39c898d5f6e 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -483,6 +483,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) );
@@ -496,6 +496,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop
}
return STATUS_SUCCESS;
}
+ if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH ))
@ -34,10 +34,10 @@ index 3ab80a1a31a..0a990158361 100644
default:
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 1a5523726dd..50340566093 100644
index 6653f6632a4..d8e9ddb1272 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -962,24 +962,24 @@ static void test_BCryptEncrypt(void)
@@ -972,24 +972,24 @@ static void test_BCryptEncrypt(void)
size = 0;
ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0);
@ -71,5 +71,5 @@ index 1a5523726dd..50340566093 100644
len = 0xdeadbeef;
size = sizeof(len);
--
2.11.0
2.13.1

16
patches/bcrypt-Improvements/0016-bcrypt-Fix-string-comparison-in-set_alg_property.patch
View File

@ -1,4 +1,4 @@
From 698dc9ea948f98eba154453e6cdc79919373d007 Mon Sep 17 00:00:00 2001
From d48dfa8d9c59c26ed7d5eabfb73478e0ab9e7ee6 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 26 Dec 2016 07:21:27 +0100
Subject: bcrypt: Fix string comparison in set_alg_property.
@ -9,10 +9,10 @@ Subject: bcrypt: Fix string comparison in set_alg_property.
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
index dc5c798..7eea550 100644
index 39c898d5f6e..28fa35dc9d5 100644
--- a/dlls/bcrypt/bcrypt_main.c
+++ b/dlls/bcrypt/bcrypt_main.c
@@ -585,14 +585,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA
@@ -527,14 +527,12 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA
case ALG_ID_AES:
if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))
{
@ -30,12 +30,12 @@ index dc5c798..7eea550 100644
alg->mode = MODE_ID_GCM;
return STATUS_SUCCESS;
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 513d11f..77aacdc 100644
index d8e9ddb1272..8dc932434e6 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -852,6 +852,17 @@ static void test_aes(void)
ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode);
ok(size == 64, "got %u\n", size);
@@ -749,6 +749,17 @@ static void test_aes(void)
ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength);
ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement);
+ memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM));
+ ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0);
@ -52,5 +52,5 @@ index 513d11f..77aacdc 100644
ret = pBCryptCloseAlgorithmProvider(alg, 0);
--
2.9.0
2.13.1

20
patches/bcrypt-Improvements/0024-bcrypt-tests-Add-tests-for-auth-data-in-AES-GCM-mode.patch
View File

@ -1,4 +1,4 @@
From 930962bf986a469b956e3a5e17d8c026098fadfb Mon Sep 17 00:00:00 2001
From 3ca362011e98a7bebb145243c3e62f6e84933766 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 26 Dec 2016 15:01:38 +0100
Subject: bcrypt/tests: Add tests for auth data in AES GCM mode.
@ -8,10 +8,10 @@ Subject: bcrypt/tests: Add tests for auth data in AES GCM mode.
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 62f0ca7..a18e495 100644
index 2bc5f89b91c..9dbf88f08f7 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -987,7 +987,9 @@ static void test_BCryptGenerateSymmetricKey(void)
@@ -884,7 +884,9 @@ static void test_BCryptGenerateSymmetricKey(void)
static void test_BCryptEncrypt(void)
{
static UCHAR nonce[] =
@ -22,7 +22,7 @@ index 62f0ca7..a18e495 100644
static UCHAR secret[] =
{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
static UCHAR iv[] =
@@ -1013,6 +1015,8 @@ static void test_BCryptEncrypt(void)
@@ -910,6 +912,8 @@ static void test_BCryptEncrypt(void)
{0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
static UCHAR expected_tag2[] =
{0x9a,0x92,0x32,0x2c,0x61,0x2a,0xae,0xef,0x66,0x2a,0xfb,0x55,0xe9,0x48,0xdf,0xbd};
@ -31,7 +31,7 @@ index 62f0ca7..a18e495 100644
BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
UCHAR *buf, ciphertext[48], ivbuf[16], tag[16];
BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length;
@@ -1186,6 +1190,24 @@ static void test_BCryptEncrypt(void)
@@ -1083,6 +1087,24 @@ static void test_BCryptEncrypt(void)
for (i = 0; i < 16; i++)
ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]);
@ -56,7 +56,7 @@ index 62f0ca7..a18e495 100644
/* test with padding */
memcpy(ivbuf, iv, sizeof(iv));
memset(ciphertext, 0, sizeof(ciphertext));
@@ -1208,7 +1230,9 @@ static void test_BCryptEncrypt(void)
@@ -1105,7 +1127,9 @@ static void test_BCryptEncrypt(void)
static void test_BCryptDecrypt(void)
{
static UCHAR nonce[] =
@ -67,16 +67,16 @@ index 62f0ca7..a18e495 100644
static UCHAR secret[] =
{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
static UCHAR iv[] =
@@ -1235,6 +1259,8 @@ static void test_BCryptDecrypt(void)
@@ -1132,6 +1156,8 @@ static void test_BCryptDecrypt(void)
0x86,0x64,0xc3,0xfe,0xa3,0x07,0x61,0xf8,0x16,0xc9,0x78,0x7f,0xe7,0xb1,0xc4,0x94};
static UCHAR tag[] =
{0x89,0xb3,0x92,0x00,0x39,0x20,0x09,0xb4,0x6a,0xd6,0xaf,0xca,0x4b,0x5b,0xfd,0xd0};
+ static UCHAR tag2[] =
+ {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77};
BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info;
BCRYPT_KEY_LENGTHS_STRUCT key_lengths;
BCRYPT_ALG_HANDLE aes;
BCRYPT_KEY_HANDLE key;
@@ -1374,6 +1400,20 @@ static void test_BCryptDecrypt(void)
@@ -1281,6 +1307,20 @@ static void test_BCryptDecrypt(void)
ok(size == 32, "got %u\n", size);
ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n");
@ -98,5 +98,5 @@ index 62f0ca7..a18e495 100644
memcpy(ivbuf, iv, sizeof(iv));
auth_info.pbTag = iv; /* wrong tag */
--
2.9.0
2.13.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "866eec810e7342630d47887f8ad7e1fbb5a0e788"
echo "d53b711f27f15cdeb9700e86526dab13ddf8d731"
}
# Show version information

10
patches/wininet-Redirect/0001-wininet-Return-failure-when-handling-http-redirect-w.patch
View File

@ -1,4 +1,4 @@
From c67d3ad3788845c39b39c3762b47133f1211afd6 Mon Sep 17 00:00:00 2001
From fdab2aea2753d94ab1e169216dccfda727e7ea8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 29 Mar 2017 03:05:05 +0200
Subject: wininet: Return failure when handling http redirect without hostname.
@ -8,7 +8,7 @@ Subject: wininet: Return failure when handling http redirect without hostname.
1 file changed, 32 insertions(+)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 528239c50bd..1d6b0262f2c 100644
index 3804ec7cfec..63c97e5f32e 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2111,6 +2111,12 @@ static const char ok_with_length2[] =
@ -35,7 +35,7 @@ index 528239c50bd..1d6b0262f2c 100644
shutdown(c, 2);
closesocket(c);
c = -1;
@@ -5584,6 +5594,27 @@ static void test_remove_dot_segments(int port)
@@ -5717,6 +5727,27 @@ static void test_remove_dot_segments(int port)
close_request(&req);
}
@ -63,9 +63,9 @@ index 528239c50bd..1d6b0262f2c 100644
static void test_http_connection(void)
{
struct server_info si;
@@ -5638,6 +5669,7 @@ static void test_http_connection(void)
test_long_url(si.port);
@@ -5772,6 +5803,7 @@ static void test_http_connection(void)
test_redirect(si.port);
test_persistent_connection(si.port);
test_remove_dot_segments(si.port);
+ test_redirect_no_host(si.port);