August 2022 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : xactengine3_7: Return error on invalid notification value.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: e43288348de170fef5dfd122675ba367dd7ea0ec URL: https://gitlab.winehq.org/wine/wine/-/commit/e43288348de170fef5dfd122675ba3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 31 14:23:42 2022 +1000 xactengine3_7: Return error on invalid notification value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/xact3.c | 18 ++++++++++++++++++ dlls/xactengine3_7/xact_dll.c | 8 ++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 6b66af59ff0..2a97f5f7c5c 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -208,6 +208,24 @@ static void test_notifications(void) hr = IXACT3Engine_Initialize(engine, &params); ok(hr == S_OK, "Cannot initialize engine, hr %#lx\n", hr); + notification_desc.type = 0; + notification_desc.flags = 0; + notification_desc.pvContext = &prepared_data; + hr = IXACT3Engine_RegisterNotification(engine, &notification_desc); + ok(hr == E_INVALIDARG, "got hr %#lx\n", hr); + + hr = IXACT3Engine_UnRegisterNotification(engine, &notification_desc); + ok(hr == S_OK, "got hr %#lx\n", hr); + + notification_desc.type = XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT + 1; + notification_desc.flags = 0; + notification_desc.pvContext = &prepared_data; + hr = IXACT3Engine_RegisterNotification(engine, &notification_desc); + ok(hr == E_INVALIDARG, "got hr %#lx\n", hr); + + hr = IXACT3Engine_UnRegisterNotification(engine, &notification_desc); + ok(hr == S_OK, "got hr %#lx\n", hr); + prepared_data.type = XACTNOTIFICATIONTYPE_WAVEBANKPREPARED; prepared_data.thread_id = GetCurrentThreadId(); notification_desc.type = XACTNOTIFICATIONTYPE_WAVEBANKPREPARED; diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index cd72f43949f..f2737e0a9bd 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1517,6 +1517,10 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pNotificationDesc); + if (pNotificationDesc->type < XACTNOTIFICATIONTYPE_CUEPREPARED || + pNotificationDesc->type > XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) + return E_INVALIDARG; + unwrap_notificationdesc(&fdesc, pNotificationDesc); This->contexts[pNotificationDesc->type] = pNotificationDesc->pvContext; fdesc.pvContext = This; @@ -1531,6 +1535,10 @@ static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *ifac TRACE("(%p)->(%p)\n", This, pNotificationDesc); + if (pNotificationDesc->type < XACTNOTIFICATIONTYPE_CUEPREPARED || + pNotificationDesc->type > XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT) + return S_OK; + unwrap_notificationdesc(&fdesc, pNotificationDesc); fdesc.pvContext = This; return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc);

1 0

Hans Leidekker : bcrypt: Add AES CFB chaining mode support.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: d3638d426b1a7c829d59c24241414cd44f9ca7de URL: https://gitlab.winehq.org/wine/wine/-/commit/d3638d426b1a7c829d59c24241414c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 3 12:12:42 2022 +0200 bcrypt: Add AES CFB chaining mode support. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53483 --- dlls/bcrypt/bcrypt_internal.h | 3 +- dlls/bcrypt/bcrypt_main.c | 6 ++ dlls/bcrypt/gnutls.c | 5 ++ dlls/bcrypt/tests/bcrypt.c | 168 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 179 insertions(+), 3 deletions(-)

1 0

Rémi Bernon : wmvcore/tests: Add more IWMReader_(Open|Start|Stop|Close) async checks.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 4a43312278c221d2ad313ded043d32d48338cb32 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a43312278c221d2ad313ded043d32… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 6 16:28:44 2022 +0200 wmvcore/tests: Add more IWMReader_(Open|Start|Stop|Close) async checks. --- dlls/wmvcore/tests/wmvcore.c | 214 ++++++++++++++++++++++++++++++++----------- 1 file changed, 158 insertions(+), 56 deletions(-)

1 0

Rémi Bernon : winegstreamer: Move IWMReaderCallbackAdvanced *callback_advanced to a local variable.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 488c9c669c03b266047cc002d04ef012af5f525e URL: https://gitlab.winehq.org/wine/wine/-/commit/488c9c669c03b266047cc002d04ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 6 18:35:58 2022 +0200 winegstreamer: Move IWMReaderCallbackAdvanced *callback_advanced to a local variable. --- dlls/winegstreamer/gst_private.h | 4 +--- dlls/winegstreamer/wm_asyncreader.c | 27 +++++++++++++++------------ dlls/winegstreamer/wm_reader.c | 7 +------ dlls/winegstreamer/wm_syncreader.c | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7b8f05dc09c..cd42fbe58f4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -181,8 +181,6 @@ struct wm_reader struct wm_stream *streams; WORD stream_count; - IWMReaderCallbackAdvanced *callback_advanced; - const struct wm_reader_ops *ops; }; @@ -202,7 +200,7 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number); -HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index ef6e445a51b..9d8c2be45cb 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -57,22 +57,17 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) { static const DWORD zero; - HRESULT hr; IWMReaderCallback_AddRef(reader->callback = callback); reader->context = context; IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); - - if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, - &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) - reader->reader.callback_advanced = NULL; - TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); } static DWORD WINAPI stream_thread(void *arg) { struct async_reader *reader = arg; IWMReaderCallback *callback = reader->callback; + IWMReaderCallbackAdvanced *callback_advanced; REFERENCE_TIME start_time; struct wm_stream *stream; static const DWORD zero; @@ -86,9 +81,14 @@ static DWORD WINAPI stream_thread(void *arg) EnterCriticalSection(&reader->stream_cs); + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&callback_advanced))) + callback_advanced = NULL; + TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); + while (reader->running) { - hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); + hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); if (hr != S_OK) break; @@ -98,10 +98,10 @@ static DWORD WINAPI stream_thread(void *arg) { QWORD user_time = reader->user_time; - if (pts > user_time && reader->reader.callback_advanced) + if (pts > user_time && callback_advanced) { LeaveCriticalSection(&reader->stream_cs); - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + IWMReaderCallbackAdvanced_OnTime(callback_advanced, user_time, reader->context); EnterCriticalSection(&reader->stream_cs); } @@ -126,7 +126,7 @@ static DWORD WINAPI stream_thread(void *arg) { LeaveCriticalSection(&reader->stream_cs); if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + hr = IWMReaderCallbackAdvanced_OnStreamSample(callback_advanced, stream_number, pts, duration, flags, sample, reader->context); else hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, @@ -148,12 +148,12 @@ static DWORD WINAPI stream_thread(void *arg) IWMReaderCallback_OnStatus(callback, WMT_EOF, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); - if (reader->user_clock && reader->reader.callback_advanced) + if (reader->user_clock && callback_advanced) { /* We can only get here if user_time is greater than the PTS * of all samples, in which case we cannot have sent this * notification already. */ - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, + IWMReaderCallbackAdvanced_OnTime(callback_advanced, reader->user_time, reader->context); } @@ -164,6 +164,9 @@ static DWORD WINAPI stream_thread(void *arg) ERR("Failed to get sample, hr %#lx.\n", hr); } + if (callback_advanced) + IWMReaderCallbackAdvanced_Release(callback_advanced); + TRACE("Reader is stopping; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 03adea8a318..8038b61f7a7 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1607,10 +1607,6 @@ HRESULT wm_reader_close(struct wm_reader *reader) CloseHandle(reader->read_thread); reader->read_thread = NULL; - if (reader->callback_advanced) - IWMReaderCallbackAdvanced_Release(reader->callback_advanced); - reader->callback_advanced = NULL; - wg_parser_destroy(reader->wg_parser); reader->wg_parser = NULL; @@ -1871,10 +1867,9 @@ static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffe return stream_number; } -HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackAdvanced *callback_advanced, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) { - IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index c7cccd52c4f..c80574b87fd 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -92,7 +92,7 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, EnterCriticalSection(&reader->reader.cs); - hr = wm_reader_get_stream_sample(&reader->reader, stream_number, sample, pts, duration, flags, &stream_number); + hr = wm_reader_get_stream_sample(&reader->reader, NULL, stream_number, sample, pts, duration, flags, &stream_number); if (output_number && hr == S_OK) *output_number = stream_number - 1; if (ret_stream_number && (hr == S_OK || stream_number))

1 0

Rémi Bernon : winegstreamer: Leave the stream CS while waiting for a sample.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: efe0504f5f04a349473557e90a7484c4cac294c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/efe0504f5f04a349473557e90a7484… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 2 11:59:16 2022 +0200 winegstreamer: Leave the stream CS while waiting for a sample. This may call AllocateForOutput/Stream callbacks, and it may block. --- dlls/winegstreamer/wm_asyncreader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 9d8c2be45cb..a4dc077d341 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -88,7 +88,9 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { + LeaveCriticalSection(&reader->stream_cs); hr = wm_reader_get_stream_sample(&reader->reader, callback_advanced, 0, &sample, &pts, &duration, &flags, &stream_number); + EnterCriticalSection(&reader->stream_cs); if (hr != S_OK) break;

1 0

Rémi Bernon : winegstreamer: Make IWMReader state transitions asynchronous.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: b95158b23ca884322a02be69826a58edb5e3923e URL: https://gitlab.winehq.org/wine/wine/-/commit/b95158b23ca884322a02be69826a58… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 3 10:18:06 2022 +0200 winegstreamer: Make IWMReader state transitions asynchronous. --- dlls/winegstreamer/wm_asyncreader.c | 248 ++++++++++++++++++++++++------------ dlls/wmvcore/tests/wmvcore.c | 40 ++---- 2 files changed, 178 insertions(+), 110 deletions(-)

1 0

Arkadiusz Hiler : winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 3df433843b33277306f290f59cf58863fd287f93 URL: https://gitlab.winehq.org/wine/wine/-/commit/3df433843b33277306f290f59cf588… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Aug 1 18:51:05 2022 +0300 winebus.sys/sdl: Use the 8 absolute axes supported by DIJOYSTATE2. Most games use c_dfDIJoystick2 which can support up to 8 absolute axes, 6 directional ones and 2 sliders. With this change we now have 8 usable axes instead of six and we FIXME if device exposes more than that. --- dlls/winebus.sys/bus_sdl.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5d810d25205..39432ce9f17 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -249,17 +249,14 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface) const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_JOYSTICK}; static const USAGE_AND_PAGE absolute_usages[] = { - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_THROTTLE}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_RUDDER}, - {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_WHEEL}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_ACCELERATOR}, - {.UsagePage = HID_USAGE_PAGE_SIMULATION, .Usage = HID_USAGE_SIMULATION_BRAKE}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_X}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Y}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_Z}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RX}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RY}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_RZ}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_SLIDER}, + {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_DIAL}, }; static const USAGE_AND_PAGE relative_usages[] = {

1 0

Shaun Ren : webservices: Support faults in error.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: ac90bc1e162c209bb28cb2c06c3bab42f33a8a10 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac90bc1e162c209bb28cb2c06c3bab… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jul 22 14:17:42 2022 -0400 webservices: Support faults in error. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/error.c | 348 +++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 310 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 6 +- dlls/webservices/webservices_private.h | 2 + include/webservices.h | 39 ++++ 5 files changed, 702 insertions(+), 3 deletions(-)

1 0

Santino Mazza : ncrypt/tests: Test for NCryptEncrypt with RSA and PKCS1 padding.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 68f6d6ba9e649599412e291b47424497a4ae0622 URL: https://gitlab.winehq.org/wine/wine/-/commit/68f6d6ba9e649599412e291b474244… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 26 19:39:37 2022 -0300 ncrypt/tests: Test for NCryptEncrypt with RSA and PKCS1 padding. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/tests/ncrypt.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 5808a3bb30a..81b737c9a21 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -539,6 +539,81 @@ static void test_NCryptIsAlgSupported(void) NCryptFreeObject(prov); } +static UCHAR data_to_encrypt[12] = "Hello world"; + +static void test_NCryptEncrypt(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS ret; + BYTE *output_a; + BYTE *output_b; + DWORD output_size; + + todo_wine { + NCryptOpenStorageProvider(&prov, NULL, 0); + NCryptCreatePersistedKey(prov, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); + + /* Test encrypt with invalid key handle */ + ret = NCryptEncrypt(prov, data_to_encrypt, sizeof(data_to_encrypt), NULL, NULL, 0, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_HANDLE, "got %lx\n", ret); + + /* Test encrypt with a non finalized key */ + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, NULL, 0, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BAD_KEY_STATE, "got %lx\n", ret); + + NCryptFinalizeKey(key, 0); + + /* Test encrypt with invalid flags */ + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, NULL, 0, + &output_size, 51342); + ok(ret == NTE_BAD_FLAGS, "got %lx\n", ret); + + /* Test no padding with RSA */ + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, NULL, 0, &output_size, + NCRYPT_NO_PADDING_FLAG); + ok(ret == ERROR_SUCCESS, "got %lx\n", ret); + ok(output_size == 128, "got %ld\n", output_size); + + output_a = malloc(output_size); + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, output_a, output_size, + &output_size, NCRYPT_NO_PADDING_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %lx\n", ret); + free(output_a); + + /* Test output RSA with PKCS1. PKCS1 should append a random padding to the data, so the output should be different + * with each call. */ + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, NULL, 0, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %lx\n", ret); + ok(output_size == 128, "got %ld\n", output_size); + + output_a = malloc(output_size); + output_b = malloc(output_size); + + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, output_a, 12, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BUFFER_TOO_SMALL, "got %lx\n", ret); + + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, output_a, output_size, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %lx\n", ret); + + ret = NCryptEncrypt(key, data_to_encrypt, sizeof(data_to_encrypt), NULL, output_b, output_size, + &output_size, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %lx\n", ret); + ok(memcmp(output_a, output_b, 128), "expected to have different outputs.\n"); + + NCryptFreeObject(key); + free(output_a); + free(output_b); + + NCryptFreeObject(prov); + } +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -549,4 +624,5 @@ START_TEST(ncrypt) test_finalize_key(); test_verify_signature(); test_NCryptIsAlgSupported(); + test_NCryptEncrypt(); }

1 0

Santino Mazza : bcrypt/tests: Test for BCryptEncrypt with RSA keys.
by Alexandre Julliard 03 Aug '22

03 Aug '22

Module: wine Branch: master Commit: 4a395899eabab73c3c5045a17d728e7668225b8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4a395899eabab73c3c5045a17d728e… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Thu Jul 28 14:10:27 2022 -0300 bcrypt/tests: Test for BCryptEncrypt with RSA keys. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/tests/bcrypt.c | 111 +++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 6 +++ 2 files changed, 117 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 08ce360cac0..fca7ae4e1ed 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2019,6 +2019,114 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd }; +static void test_rsa_encrypt(void) +{ + static UCHAR input[] = "Hello World!"; + static UCHAR input_no_padding[64] = { 0 }; + BCRYPT_ALG_HANDLE rsa = 0; + BCRYPT_KEY_HANDLE key = 0; + NTSTATUS ret = 0; + DWORD encrypted_size = 60; + UCHAR *encrypted_a = NULL; + UCHAR *encrypted_b = NULL; + DWORD decrypted_size = 0; + UCHAR *decrypted = NULL; + BCRYPT_OAEP_PADDING_INFO oaep_pad; + oaep_pad.pszAlgId = BCRYPT_MD5_ALGORITHM; + oaep_pad.pbLabel = (PUCHAR)"test"; + oaep_pad.cbLabel = 5; + + BCryptOpenAlgorithmProvider(&rsa, BCRYPT_RSA_ALGORITHM, NULL, 0); + BCryptGenerateKeyPair(rsa, &key, 512, 0); + + todo_wine { + /* Not finalized key */ + ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); + + BCryptFinalizeKeyPair(key, 0); + + /* No padding */ + memset(input_no_padding, 0, sizeof(input_no_padding)); + strcpy((char *)input_no_padding, "Hello World"); + ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, NULL, 0, &encrypted_size, BCRYPT_PAD_NONE); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(encrypted_size == 64, "got size of %ld\n", encrypted_size); + + encrypted_a = malloc(encrypted_size); + memset(encrypted_a, 0, encrypted_size); + encrypted_b = malloc(encrypted_size); + memset(encrypted_b, 0xff, encrypted_size); + + ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); + ok(ret == STATUS_INVALID_PARAMETER, "got %lx\n", ret); + + ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_a, 12, &encrypted_size, BCRYPT_PAD_NONE); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %lx\n", ret); + + ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n"); + + BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); + decrypted = malloc(decrypted_size); + BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_NONE); + ok(!memcmp(decrypted, input_no_padding, sizeof(input_no_padding)), "Decrypted output it's not what expected\n"); + free(decrypted); + + encrypted_size = 60; + /* PKCS1 Padding */ + ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(encrypted_size == 64, "got size of %ld\n", encrypted_size); + + encrypted_a = realloc(encrypted_a, encrypted_size); + memset(encrypted_a, 0, encrypted_size); + encrypted_b = realloc(encrypted_b, encrypted_size); + memset(encrypted_b, 0, encrypted_size); + + ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); + + BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_PKCS1); + decrypted = malloc(decrypted_size); + BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_PKCS1); + ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); + free(decrypted); + + encrypted_size = 60; + /* OAEP Padding */ + ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, NULL, 0, &encrypted_size, BCRYPT_PAD_OAEP); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(encrypted_size == 64, "got size of %ld\n", encrypted_size); + + encrypted_a = realloc(encrypted_a, encrypted_size); + memset(encrypted_a, 0, encrypted_size); + encrypted_b = realloc(encrypted_b, encrypted_size); + memset(encrypted_b, 0, encrypted_size); + + ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_a, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ret = BCryptEncrypt(key, input, sizeof(input), &oaep_pad, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_OAEP); + ok(ret == STATUS_SUCCESS, "got %lx\n", ret); + ok(memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs are the same\n"); + + BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_OAEP); + decrypted = malloc(decrypted_size); + BCryptDecrypt(key, encrypted_a, encrypted_size, &oaep_pad, NULL, 0, decrypted, decrypted_size, &decrypted_size, BCRYPT_PAD_OAEP); + ok(!memcmp(decrypted, input, sizeof(input)), "Decrypted output it's not what expected\n"); + } + free(decrypted); + + free(encrypted_a); + free(encrypted_b); +} + static void test_RSA(void) { static UCHAR hash[] = @@ -2202,6 +2310,9 @@ static void test_RSA(void) ret = BCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %#lx\n", ret); + + /* RSA encryption */ + test_rsa_encrypt(); } static void test_RSA_SIGN(void) diff --git a/include/bcrypt.h b/include/bcrypt.h index fbfb5099c09..fd660c1843c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -284,6 +284,12 @@ typedef struct _BCRYPT_PKCS1_PADDING_INFO LPCWSTR pszAlgId; } BCRYPT_PKCS1_PADDING_INFO; +typedef struct _BCRYPT_OAEP_PADDING_INFO { + LPCWSTR pszAlgId; + PUCHAR pbLabel; + ULONG cbLabel; +} BCRYPT_OAEP_PADDING_INFO; + #define BCRYPT_PAD_NONE 0x00000001 #define BCRYPT_PAD_PKCS1 0x00000002 #define BCRYPT_PAD_OAEP 0x00000004

1 0