wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Hugh McMaster : reg/tests: Add tests for querying a key only containing subkeys.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 8b0602023add5c530e4f257ebf07ebae8e4ffdba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0602023add5c530e4f257e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:57 2021 +1000 reg/tests: Add tests for querying a key only containing subkeys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 7c8a1795b34..5c97554648e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -148,6 +148,18 @@ static void test_query(void) "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" " Wine REG_SZ Second instance\r\n\r\n"; + const char *test8a = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey1\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey2\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey3\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey4\r\n"; + + const char *test8b = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey1\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey2\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey3\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey4\r\n\r\n"; + DWORD r, dword = 0x123; HKEY hkey, subkey; BYTE buf[512]; @@ -259,6 +271,24 @@ static void test_query(void) "got exit code %d, expected 0\n", r); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Subkeys only */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "subkey1", NULL); + add_key(hkey, "subkey2", NULL); + add_key(hkey, "subkey3", NULL); + add_key(hkey, "subkey4", NULL); + close_key(hkey); + + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test8a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test8b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(query)

1 0

Hugh McMaster : reg/tests: Use 'hkey' in 'query' tests for consistency with other reg.exe tests.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: c573fce35b80d60b38b720a82fee53941c7490ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c573fce35b80d60b38b720a8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:56 2021 +1000 reg/tests: Use 'hkey' in 'query' tests for consistency with other reg.exe tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3c87f76742e..7c8a1795b34 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -149,7 +149,7 @@ static void test_query(void) " Wine REG_SZ Second instance\r\n\r\n"; DWORD r, dword = 0x123; - HKEY key, subkey; + HKEY hkey, subkey; BYTE buf[512]; delete_tree(HKEY_CURRENT_USER, KEY_BASE); @@ -172,9 +172,9 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* Create a test key */ - add_key(HKEY_CURRENT_USER, KEY_BASE, &key); - add_value(key, "Test1", REG_SZ, "Hello, World", 13); - add_value(key, "Test2", REG_DWORD, &dword, sizeof(dword)); + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -206,10 +206,10 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - add_value(key, "Wine", REG_SZ, "First instance", 15); + add_value(hkey, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ - add_key(key, "subkey", &subkey); + add_key(hkey, "subkey", &subkey); read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -246,10 +246,10 @@ static void test_query(void) "got exit code %d, expected 0\n", r); compare_query(buf, test7, TRUE, 0); - add_value(key, NULL, REG_SZ, "Empty", 6); + add_value(hkey, NULL, REG_SZ, "Empty", 6); add_value(subkey, NULL, REG_SZ, "Empty", 6); close_key(subkey); - close_key(key); + close_key(hkey); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Only try querying an invalid key once.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9752dfeea82c48e2230bacbf9db9564d5562de02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9752dfeea82c48e2230bacbf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:55 2021 +1000 reg/tests: Only try querying an invalid key once. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index c475d288fd8..3c87f76742e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -167,6 +167,10 @@ static void test_query(void) run_reg_exe("reg query -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Key not present */ + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); add_value(key, "Test1", REG_SZ, "Hello, World", 13); @@ -245,6 +249,7 @@ static void test_query(void) add_value(key, NULL, REG_SZ, "Empty", 6); add_value(subkey, NULL, REG_SZ, "Empty", 6); close_key(subkey); + close_key(key); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -253,17 +258,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); - /* Clean-up, then query */ - delete_key(key, "subkey"); - close_key(key); - - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - delete_key(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(query)

1 0

Arkadiusz Hiler : kernel32: Update version to Win 10.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 04a8213ba9e3b8aa1f980d19b240929948da5abe URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a8213ba9e3b8aa1f980d19… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 20 14:38:09 2021 +0300 kernel32: Update version to Win 10. This fixes the game Evil Genius 2 complaining about unsupported OS. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/version.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index 82287e5da79..b6002f51f7a 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows 7 SP1 */ -#define WINE_FILEVERSION 6,1,7601,17514 -#define WINE_FILEVERSION_STR "6.1.7601.17514" -#define WINE_PRODUCTVERSION 6,1,7601,17514 -#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" +/* these values come from Windows 10 Version 1909 */ +#define WINE_FILEVERSION 10,0,18362,1350 +#define WINE_FILEVERSION_STR "10.0.18362.1350" +#define WINE_PRODUCTVERSION 10,0,18362,1350 +#define WINE_PRODUCTVERSION_STR "10.0.18362.1350" #include "wine/wine_common_ver.rc"

1 0

Paul Gofman : bcrypt/tests: Add test for key parallel usage.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f638bd901e70c6b22c6f9809d85ba3becfa03c1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f638bd901e70c6b22c6f9809… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 20 16:53:34 2021 +0200 bcrypt/tests: Add test for key parallel usage. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 87 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 456727d04a9..fb5ac03b039 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -862,6 +862,64 @@ static void test_BCryptGenerateSymmetricKey(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +#define RACE_TEST_COUNT 200 +static LONG encrypt_race_start_barrier; + +static DWORD WINAPI encrypt_race_thread(void *parameter) +{ + static UCHAR nonce[] = + {0x11,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x61,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; + static UCHAR data2[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10}; + static UCHAR expected4[] = + {0xb2,0x27,0x19,0x09,0xc7,0x89,0xdc,0x52,0x24,0x83,0x3a,0x55,0x34,0x76,0x2c,0xbf, + 0x15,0xa1,0xcb,0x40,0x78,0x11,0xba,0xbc,0xa4,0x76,0x69,0x7c,0x75,0x4f,0x11,0xba}; + static UCHAR expected_tag3[] = + {0xef,0xee,0x75,0x99,0xb8,0x12,0xe9,0xf0,0xb4,0xcc,0x65,0x11,0x67,0x60,0x2d,0xe6}; + + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; + BCRYPT_KEY_HANDLE key = parameter; + UCHAR ciphertext[48], tag[16]; + unsigned int i, test; + NTSTATUS ret; + ULONG size; + + memset(&auth_info, 0, sizeof(auth_info)); + auth_info.cbSize = sizeof(auth_info); + auth_info.dwInfoVersion = 1; + auth_info.pbNonce = nonce; + auth_info.cbNonce = sizeof(nonce); + auth_info.pbTag = tag; + auth_info.cbTag = sizeof(tag); + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + InterlockedIncrement(&encrypt_race_start_barrier); + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 3, 2) != 2) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + return 0; +} + static void test_BCryptEncrypt(void) { static UCHAR nonce[] = @@ -921,9 +979,10 @@ static void test_BCryptEncrypt(void) BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; + ULONG size, len, i, test; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; - ULONG size, len, i; + HANDLE hthread; NTSTATUS ret; ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); @@ -1215,6 +1274,32 @@ static void test_BCryptEncrypt(void) ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + /* race test */ + + encrypt_race_start_barrier = 0; + hthread = CreateThread(NULL, 0, encrypt_race_thread, key, 0, NULL); + + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 2, 1) != 1) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag2)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + WaitForSingleObject(hthread, INFINITE); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf);

1 0

Paul Gofman : bcrypt: Synchronize symmetric key access for encrypt and decrypt.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9944a7c92bb23b877d567ccc5d901b5df0325b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9944a7c92bb23b877d567ccc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 20 16:53:33 2021 +0200 bcrypt: Synchronize symmetric key access for encrypt and decrypt. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index fef1e4585ee..61c367cae9d 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -164,6 +164,7 @@ struct key_symmetric ULONG vector_len; UCHAR *secret; ULONG secret_len; + CRITICAL_SECTION cs; }; #define KEY_FLAG_LEGACY_DSA_V2 0x00000001 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 59835014530..5eb50cd616b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1090,8 +1090,8 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_symmetric_encrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; @@ -1462,6 +1462,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; + InitializeCriticalSection( &key->u.s.cs ); key->hdr.magic = MAGIC_KEY; key->alg_id = alg->id; key->u.s.mode = alg->mode; @@ -1570,6 +1571,7 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) key_copy->u.s.block_size = key_orig->u.s.block_size; key_copy->u.s.secret = buffer; key_copy->u.s.secret_len = key_orig->u.s.secret_len; + InitializeCriticalSection( &key_copy->u.s.cs ); } else { @@ -1595,6 +1597,7 @@ static void key_destroy( struct key *key ) key_funcs->key_symmetric_destroy( key ); heap_free( key->u.s.vector ); heap_free( key->u.s.secret ); + DeleteCriticalSection( &key->u.s.cs ); } else { @@ -1696,6 +1699,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { struct key *key = handle; + NTSTATUS ret; TRACE( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); @@ -1712,15 +1716,10 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - if (key_is_symmetric( key )) - return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, @@ -1738,7 +1737,16 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } - return key_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + if (key_is_symmetric( key )) + { + NTSTATUS ret; + EnterCriticalSection( &key->u.s.cs ); + ret = key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + LeaveCriticalSection( &key->u.s.cs ); + return ret; + } + + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )

1 0

Hans Leidekker : bcrypt: Pass output length as a separate parameter to key_asymmetric_decrypt.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: ae194f6997ec7cd14ce361deda9e1a987d080d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae194f6997ec7cd14ce361de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 16:53:32 2021 +0200 bcrypt: Pass output length as a separate parameter to key_asymmetric_decrypt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +---------- dlls/bcrypt/gnutls.c | 18 ++++++------------ 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index eb136111509..fef1e4585ee 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -206,7 +206,7 @@ struct key_funcs void (CDECL *key_symmetric_destroy)( struct key * ); NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); - NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG * ); + NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); NTSTATUS (CDECL *key_asymmetric_sign)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ); NTSTATUS (CDECL *key_asymmetric_verify)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6729edf671f..59835014530 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1715,21 +1715,12 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - return status; -} - static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { if (key_is_symmetric( key )) return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); - return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); + return key_funcs->key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); } NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2f0c62bc6da..9c1e7b5ab06 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1846,32 +1846,26 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key return STATUS_SUCCESS; } -static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, - UCHAR *output, ULONG *output_len ) +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) { gnutls_datum_t e, d = { 0 }; NTSTATUS status = STATUS_SUCCESS; int ret; - e.data = (unsigned char *)input; + e.data = input; e.size = input_len; - if ((ret = pgnutls_privkey_decrypt_data( key_data(key)->privkey, 0, &e, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - if (*output_len >= d.size) - { - *output_len = d.size; - memcpy( output, d.data, *output_len ); - } - else - status = STATUS_BUFFER_TOO_SMALL; + *ret_len = d.size; + if (output_len >= d.size) memcpy( output, d.data, *ret_len ); + else status = STATUS_BUFFER_TOO_SMALL; free( d.data ); - return status; }

1 0

Hans Leidekker : bcrypt: Decryption with asymmetric keys is supported.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 3deb961583046635d1be7468cf91bbe22f0d9a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3deb961583046635d1be7468… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 16:53:31 2021 +0200 bcrypt: Decryption with asymmetric keys is supported. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a1423dcd836..6729edf671f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1240,24 +1240,6 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } -static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) -{ - NTSTATUS status; - - if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) - *ret_len = output_len; - - return status; -} - -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) -{ - return key_is_symmetric( key ) ? key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, - output, output_len, ret_len, flags ) : key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); -} - static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { @@ -1733,6 +1715,23 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return key_encrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); } +static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + NTSTATUS status; + if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) + *ret_len = output_len; + return status; +} + +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + if (key_is_symmetric( key )) + return key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, output, output_len, ret_len, flags ); + return key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); +} + NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { @@ -1742,11 +1741,6 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!key_is_symmetric( key )) - { - FIXME( "decryption with asymmetric keys not yet supported\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags );

1 0

Andrey Gusev : wldap32: Remove redundant 'break' statement.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 78866a7b87d8569c18e11b934178a2751ad9496f URL: https://source.winehq.org/git/wine.git/?a=commit;h=78866a7b87d8569c18e11b93… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 20 17:10:28 2021 +0300 wldap32: Remove redundant 'break' statement. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 0f3d10e1204..ec3830d4ab3 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -467,7 +467,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) else FIXME("upgrading referral value %p to LDAP_OPT_ON (OpenLDAP lacks sufficient granularity)\n", value); return map_error( ldap_funcs->fn_ldap_set_option( CTX(ld), option, openldap_referral ) ); - break; } case LDAP_OPT_DEREF: case LDAP_OPT_DESC:

1 0

Hans Leidekker : kerberos: Move support for SpVerifySignature to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: afa5c6450875c8ec2139b810c531ecba08a5bebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa5c6450875c8ec2139b810… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:52 2021 +0200 kerberos: Move support for SpVerifySignature to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 27 +-------------------------- dlls/kerberos/unixlib.c | 24 ++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7394f05bd2b..f3cbf34ee81 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1059,36 +1059,11 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status; - gss_buffer_desc data_buffer, token_buffer; - gss_ctx_id_t ctxt_handle; - int data_idx, token_idx; - TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = message->pBuffers[data_idx].cbBuffer; - data_buffer.value = message->pBuffers[data_idx].pvBuffer; - - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - token_buffer.length = message->pBuffers[token_idx].cbBuffer; - token_buffer.value = message->pBuffers[token_idx].pvBuffer; - - ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); - TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; - - return status_gss_to_sspi( ret ); -#else - FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->verify_signature( context, message, quality_of_protection ); } #ifdef SONAME_LIBGSSAPI_KRB5 diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index f67f22ad8d8..06f0ffc8a04 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -587,6 +587,29 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = msg->pBuffers[token_idx].cbBuffer; + token_buffer.value = msg->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE && qop) *qop = 0; + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -595,6 +618,7 @@ static const struct krb5_funcs funcs = free_credentials_handle, initialize_context, make_signature, + verify_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index da487bb781e..6a73444aae8 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -30,6 +30,7 @@ struct krb5_funcs NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); + NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *); }; extern const struct krb5_funcs *krb5_funcs;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021