wine-devel October 2018

60 participants
608 discussions

[PATCH 1/3] wineps: Use a tri-state to describe the passthrough state.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/escape.c | 12 ++++++------ dlls/wineps.drv/graphics.c | 14 ++++++++------ dlls/wineps.drv/ps.c | 4 ++-- dlls/wineps.drv/psdrv.h | 10 ++++++++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 636ad2a..f9616bc 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -269,11 +269,12 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, * length of the string, rather than 2 more. So we'll use the WORD at * in_data[0] instead. */ - if(!physDev->job.in_passthrough) { - write_spool(dev, psbegindocument, sizeof(psbegindocument)-1); - physDev->job.in_passthrough = TRUE; + if (physDev->job.passthrough_state == passthrough_none) + { + write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); + physDev->job.passthrough_state = passthrough_active; } - return write_spool(dev,((char*)in_data)+2,*(const WORD*)in_data); + return write_spool(dev, ((char*)in_data) + 2, *(const WORD*)in_data); } case POSTSCRIPT_IGNORE: @@ -451,8 +452,7 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; physDev->job.quiet = FALSE; - physDev->job.in_passthrough = FALSE; - physDev->job.had_passthrough_rect = FALSE; + physDev->job.passthrough_state = passthrough_none; physDev->job.doc_name = strdupW( doc->lpszDocName ); return physDev->job.id; diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 4887bd0..66108d1 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -113,12 +113,14 @@ BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) /* Windows does something truly hacky here. If we're in passthrough mode and our rop is R2_NOP, then we output the string below. This is used in Office 2k when inserting eps files */ - if(physDev->job.in_passthrough && !physDev->job.had_passthrough_rect && GetROP2(dev->hdc) == R2_NOP) { - char buf[256]; - sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); - write_spool(dev, buf, strlen(buf)); - physDev->job.had_passthrough_rect = TRUE; - return TRUE; + if (physDev->job.passthrough_state == passthrough_active && GetROP2(dev->hdc) == R2_NOP) + { + char buf[256]; + + sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); + write_spool(dev, buf, strlen(buf)); + physDev->job.passthrough_state = passthrough_had_rect; + return TRUE; } PSDRV_SetPen(dev); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 972609d..663cc23 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -226,9 +226,9 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) return 0; } - if(physDev->job.in_passthrough) { /* Was in PASSTHROUGH mode */ + if(physDev->job.passthrough_state != passthrough_none) { /* Was in PASSTHROUGH mode */ write_spool( dev, psenddocument, sizeof(psenddocument)-1 ); - physDev->job.in_passthrough = physDev->job.had_passthrough_rect = FALSE; + physDev->job.passthrough_state = passthrough_none; } if(physDev->job.OutOfPage) { /* Will get here after NEWFRAME Escape */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 79f23ea..d92fbb3 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -343,6 +343,13 @@ typedef struct { BOOL set; } PSPEN; +enum passthrough +{ + passthrough_none, + passthrough_active, + passthrough_had_rect, /* See the comment in PSDRV_Rectangle */ +}; + typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ @@ -352,8 +359,7 @@ typedef struct { BOOL OutOfPage; /* Page header not sent yet */ INT PageNo; BOOL quiet; /* Don't actually output anything */ - BOOL in_passthrough; /* In PASSTHROUGH mode */ - BOOL had_passthrough_rect; /* See the comment in PSDRV_Rectangle */ + enum passthrough passthrough_state; } JOB; typedef struct -- 2.7.4

5 years, 7 months

[PATCH] oleaut32: Add DECLSPEC_HOTPATCH to SysAllocStringByteLen

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index ae3bda668b..a12b45ec33 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -427,7 +427,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) * without checking for a terminating NUL. * See BSTR. */ -BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) +BSTR WINAPI DECLSPEC_HOTPATCH SysAllocStringByteLen(LPCSTR str, UINT len) { bstr_t *bstr; -- 2.19.0

5 years, 7 months

[PATCH] credui: Use SecureZeroMemory().

by Serge Gautherie

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- It feels '+ 1' is overkill in this very case, is it not? --- dlls/credui/credui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index bf9f7d1..dc190b7 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -89,7 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); } @@ -673,7 +673,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, { found = TRUE; HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); } @@ -733,7 +733,7 @@ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); -- 2.10.0.windows.1

5 years, 7 months

[PATCH v4 1/2] user32: Let nulldrv return some dummy monitor information.

by Bernhard Übelacker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes patch 152109. v2: - No changes to v1. v3: - Make device static const WCHAR. - Use a non-null value as HMONITOR handle. v4: - SetLastError on invalid handle. --- dlls/user32/driver.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd6..5b2929245c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,6 +197,8 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) + static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -354,7 +356,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +371,23 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + if (handle != NULLDRV_DEFAULT_HMONITOR) + { + SetLastError(ERROR_INVALID_MONITOR_HANDLE); + return FALSE; + } + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) -- 2.19.0

5 years, 7 months

[PATCH vkd3d 2/2] build: Bump libtool version numbers for shared libraries.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1fdc9167f6b1..8d4743995a68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_la_LDFLAGS = -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -106,7 +106,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map -- 2.16.4

5 years, 7 months

[PATCH vkd3d 1/2] vkd3d-shader: Bump SPIR-V generator version.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for the next release. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7fe35289c534..98d7a9313f0e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -96,7 +96,7 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 0 +#define VKD3D_SPIRV_GENERATOR_VERSION 1 #define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) struct vkd3d_spirv_stream -- 2.16.4

5 years, 7 months

[PATCH 1/5] d2d1: Implement CreateDeviceContext().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 23 +++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 16 ++++++---------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 97ec0afe88..967b90d038 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3826,9 +3826,28 @@ static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **fact static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, ID2D1DeviceContext **context) { - FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + struct d2d_device_context *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, context %p.\n", iface, options, context); + + if (options) + FIXME("Options are ignored %#x.\n", options); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d2d_device_context_init(object, iface, NULL, NULL))) + { + WARN("Failed to initialize device context, hr %#x.\n", hr); + heap_free(object); + return hr; + } + + TRACE("Created device context %p.\n", object); + *context = &object->ID2D1DeviceContext_iface; + + return S_OK; } static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 54d5618f17..d31c8ad97e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6999,7 +6999,6 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B { hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &compatible_rt); - todo_wine ok_(__FILE__, line)(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT, "Unexpected hr %#x.\n", hr); } @@ -7139,11 +7138,8 @@ static void test_bitmap_surface(void) ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); -todo_wine ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ for (i = 0; i < ARRAY_SIZE(bitmap_format_tests); ++i) { memset(&bitmap_desc, 0, sizeof(bitmap_desc)); @@ -7151,9 +7147,10 @@ if (SUCCEEDED(hr)) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, &bitmap_desc, &bitmap); + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); - if (SUCCEEDED(hr)) + if (SUCCEEDED(bitmap_format_tests[i].hr)) { pixel_format = ID2D1Bitmap1_GetPixelFormat(bitmap); @@ -7243,7 +7240,7 @@ if (SUCCEEDED(hr)) ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_Release(device_context); -} + ID2D1Device_Release(device); IDXGIDevice_Release(dxgi_device); IDXGISurface_Release(surface); @@ -7352,11 +7349,8 @@ static void test_device_context(void) IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); -todo_wine ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ ID2D1DeviceContext_GetDevice(device_context, &device2); ok(device2 == device, "Unexpected device instance.\n"); ID2D1Device_Release(device2); @@ -7434,6 +7428,7 @@ if (SUCCEEDED(hr)) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); +todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); @@ -7495,6 +7490,7 @@ if (SUCCEEDED(hr)) ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); options = ID2D1Bitmap1_GetOptions(bitmap); +todo_wine ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); @@ -7508,7 +7504,7 @@ if (SUCCEEDED(hr)) ID2D1DeviceContext_Release(device_context); ID2D1DCRenderTarget_Release(dc_rt); DeleteDC(hdc); -} + ID2D1Device_Release(device); ID2D1Factory1_Release(factory); ID3D10Device1_Release(d3d_device); -- 2.19.0

5 years, 7 months

[PATCH v3 1/2] user32: Let nulldrv return some dummy monitor information.

by Bernhard Übelacker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Supersedes patch 152009. v2: - No changes to v1. v3: - Make device static const WCHAR. - Use a non-null value as HMONITOR handle. --- dlls/user32/driver.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126bd6..9d1fc87f72 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,6 +197,8 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) + static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -354,7 +356,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +371,20 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + if (handle != NULLDRV_DEFAULT_HMONITOR) + return FALSE; + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) -- 2.19.0

5 years, 7 months

Wine staging 3.17 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.17 (882 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Added * 44588 - Added ntoskrnl.exe.KeWaitForMultipleObjects semi-stub Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

5 years, 7 months

[PATCH 2/2] rsaenh: Implement RSA OAEP.

by Zhiyi Zhang

Implement RSA optimal asymmetric encryption padding according to RFC 8017. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/rsaenh/rsaenh.c | 298 ++++++++++++++++++++++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 49 +++++++- 2 files changed, 332 insertions(+), 15 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e4c6dd14b3..bc10fc731f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1694,26 +1694,189 @@ static BOOL pad_data_pkcs1(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, return TRUE; } +/****************************************************************************** + * pkcs1_mgf1 [Internal] + * + * MGF function for RSA EM-OAEP as specified in RFC 8017 PKCS #1 V2.2, Appendix B.2.1. MGF1 + * + * PARAMS + * hProv [I] Cryptographic provider handle + * pbSeed [I] Seed from which mask is generated + * dwSeedLength [I] Length of pbSeed + * dwLength [I] Intended length in octets of the mask + * pbMask [O] Generated mask if success. Caller is responsible for freeing the mask when it's done + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL pkcs1_mgf1(HCRYPTPROV hProv, const BYTE *pbSeed, DWORD dwSeedLength, DWORD dwLength, PCRYPT_DATA_BLOB pbMask) +{ + HCRYPTHASH hHash; + BYTE *pbHashInput, *pbCounter; + DWORD dwCounter; + DWORD dwLen, dwHashLen; + + RSAENH_CPCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); + RSAENH_CPHashData(hProv, hHash, 0, 0, 0); + dwLen = sizeof(dwHashLen); + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHSIZE, (BYTE *)&dwHashLen, &dwLen, 0); + RSAENH_CPDestroyHash(hProv, hHash); + + /* Allocate multiples of hash value */ + pbMask->pbData = HeapAlloc(GetProcessHeap(), 0, (dwLength + dwHashLen - 1) / dwHashLen * dwHashLen); + if (!pbMask->pbData) + { + SetLastError(NTE_NO_MEMORY); + return FALSE; + } + pbMask->cbData = dwLength; + + pbHashInput = HeapAlloc(GetProcessHeap(), 0, dwSeedLength + sizeof(DWORD)); + if (!pbHashInput) + { + free_data_blob(pbMask); + SetLastError(NTE_NO_MEMORY); + return FALSE; + } + + dwLen = dwHashLen; + memcpy(pbHashInput, pbSeed, dwSeedLength); + pbCounter = pbHashInput + dwSeedLength; + for (dwCounter = 0; dwCounter < (dwLength + dwHashLen - 1) / dwHashLen; dwCounter++) + { + *(pbCounter) = (BYTE)((dwCounter >> 24) & 0xff); + *(pbCounter + 1) = (BYTE)((dwCounter >> 16) & 0xff); + *(pbCounter + 2) = (BYTE)((dwCounter >> 8) & 0xff); + *(pbCounter + 3) = (BYTE)(dwCounter & 0xff); + RSAENH_CPCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); + RSAENH_CPHashData(hProv, hHash, pbHashInput, dwSeedLength + sizeof(DWORD), 0); + /* pbMask->pbData = old pbMask->pbData || Hash(Seed || Counter) */ + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, pbMask->pbData + dwCounter * dwHashLen, &dwLen, 0); + RSAENH_CPDestroyHash(hProv, hHash); + } + + HeapFree(GetProcessHeap(), 0, pbHashInput); + return TRUE; +} + +/****************************************************************************** + * pad_data_oaep [Internal] + * + * Helper function for data OAEP padding scheme according to RFC 8017 PKCS #1 V2.2 + * + * PARAMS + * hProv [I] Cryptographic provider handle + * abData [I] The data to be padded + * dwDataLen [I] Length of the data + * abBuffer [O] Padded data will be stored here + * dwBufferLen [I] Length of the buffer (also length of padded data) + * dwFlags [I] Currently only CRYPT_OAEP is defined + * + * RETURN + * Success: TRUE + * Failure: FALSE + */ +static BOOL pad_data_oaep(HCRYPTPROV hProv, const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, + DWORD dwFlags) +{ + CRYPT_DATA_BLOB blobDbMask = {0}, blobSeedMask = {0}; + HCRYPTHASH hHash; + BYTE *pbPadded = NULL, *pbDb, *pbSeed; + DWORD dwLen, dwHashLen; + DWORD dwDbLen, dwSeedLen; + BOOL result, ret = FALSE; + DWORD i; + + RSAENH_CPCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); + /* Empty label */ + RSAENH_CPHashData(hProv, hHash, 0, 0, 0); + dwLen = sizeof(dwHashLen); + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHSIZE, (BYTE *)&dwHashLen, &dwLen, 0); + + if (dwDataLen > dwBufferLen - 2 * dwHashLen - 2) + { + SetLastError(NTE_BAD_LEN); + goto done; + } + + if (dwBufferLen < 2 * dwHashLen + 2) + { + SetLastError(ERROR_MORE_DATA); + goto done; + } + + pbPadded = HeapAlloc(GetProcessHeap(), 0, dwBufferLen); + if (!pbPadded) + { + SetLastError(NTE_NO_MEMORY); + goto done; + } + + /* EM = 00 || maskedSeed || maskedDB */ + pbPadded[0] = 0; + pbSeed = pbPadded + 1; + dwSeedLen = dwHashLen; + pbDb = pbPadded + 1 + dwHashLen; + dwDbLen = dwBufferLen - dwSeedLen - 1; + + /* DB = pHash || PS || 01 || M */ + /* Set pHash in DB */ + dwLen = dwHashLen; + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, pbDb, &dwLen, 0); + /* Set PS(zeros) in DB */ + memset(pbDb + dwHashLen, 0, dwDbLen - dwHashLen - 1 - dwDataLen); + /* Set 01 in DB */ + pbDb[dwDbLen - dwDataLen - 1] = 1; + /* Set M in DB */ + memcpy(pbDb + dwDbLen - dwDataLen, abData, dwDataLen); + + /* Get seed */ + gen_rand_impl(pbSeed, dwHashLen); + /* Get masked DB */ + result = pkcs1_mgf1(hProv, pbSeed, dwHashLen, dwDbLen, &blobDbMask); + if (!result) goto done; + for (i = 0; i < dwDbLen; i++) pbDb[i] ^= blobDbMask.pbData[i]; + + /* Get masked seed */ + result = pkcs1_mgf1(hProv, pbDb, dwDbLen, dwHashLen, &blobSeedMask); + if (!result) goto done; + for (i = 0; i < dwHashLen; i++) pbSeed[i] ^= blobSeedMask.pbData[i]; + + memcpy(abBuffer, pbPadded, dwBufferLen); + ret = TRUE; +done: + RSAENH_CPDestroyHash(hProv, hHash); + HeapFree(GetProcessHeap(), 0, pbPadded); + free_data_blob(&blobDbMask); + free_data_blob(&blobSeedMask); + return ret; +} + /****************************************************************************** * pad_data [Internal] * * Helper function for data padding according to padding format * * PARAMS + * hProv [I] Cryptographic provider handle * abData [I] The data to be padded * dwDataLen [I] Length of the data * abBuffer [O] Padded data will be stored here * dwBufferLen [I] Length of the buffer (also length of padded data) - * dwFlags [I] 0 or CRYPT_SSL2_FALLBACK + * dwFlags [I] 0, CRYPT_SSL2_FALLBACK or CRYPT_OAEP * * RETURN * Success: TRUE * Failure: FALSE */ -static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, +static BOOL pad_data(HCRYPTPROV hProv, const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, DWORD dwFlags) { - return pad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); + if (dwFlags == CRYPT_OAEP) + return pad_data_oaep(hProv, abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); + else + return pad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); } /****************************************************************************** @@ -1757,26 +1920,133 @@ static BOOL unpad_data_pkcs1(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer return TRUE; } +/****************************************************************************** + * unpad_data_oaep [Internal] + * + * Remove the OAEP padding from RSA decrypted data + * + * PARAMS + * hProv [I] Cryptographic provider handle + * abData [I] The padded data + * dwDataLen [I] Length of the padded data + * abBuffer [O] Data without padding will be stored here + * dwBufferLen [I/O] I: Length of the buffer, O: Length of unpadded data + * dwFlags [I] Currently only CRYPT_OAEP is defined + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL unpad_data_oaep(HCRYPTPROV hProv, const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, + DWORD dwFlags) +{ + CRYPT_DATA_BLOB blobDbMask = {0}, blobSeedMask = {0}; + HCRYPTHASH hHash; + BYTE *pbBuffer = NULL, *pbHashValue = NULL; + const BYTE *pbPaddedSeed, *pbPaddedDb; + BYTE *pbUnpaddedSeed, *pbUnpaddedDb; + DWORD dwLen, dwHashLen; + DWORD dwSeedLen, dwDbLen; + DWORD dwZeroCount, dwMsgCount; + BOOL result, ret = FALSE; + DWORD i; + + RSAENH_CPCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); + RSAENH_CPHashData(hProv, hHash, 0, 0, 0); + dwLen = sizeof(dwHashLen); + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHSIZE, (BYTE *)&dwHashLen, &dwLen, 0); + if (dwDataLen < 2 * dwHashLen + 2) + { + SetLastError(NTE_BAD_DATA); + goto done; + } + + /* Get default hash value */ + pbHashValue = HeapAlloc(GetProcessHeap(), 0, dwHashLen); + if (!pbHashValue) + { + SetLastError(NTE_NO_MEMORY); + goto done; + } + dwLen = dwHashLen; + RSAENH_CPGetHashParam(hProv, hHash, HP_HASHVAL, pbHashValue, &dwLen, 0); + + /* Store seed and DB */ + pbBuffer = HeapAlloc(GetProcessHeap(), 0, dwDataLen - 1); + if (!pbBuffer) + { + SetLastError(NTE_NO_MEMORY); + goto done; + } + + pbPaddedSeed = abData + 1; + pbPaddedDb = abData + 1 + dwHashLen; + pbUnpaddedSeed = pbBuffer; + pbUnpaddedDb = pbBuffer + dwHashLen; + dwSeedLen = dwHashLen; + dwDbLen = dwDataLen - dwHashLen - 1; + + /* Get unpadded seed */ + result = pkcs1_mgf1(hProv, pbPaddedDb, dwDbLen, dwSeedLen, &blobSeedMask); + if (!result) goto done; + for (i = 0; i < dwSeedLen; i++) pbUnpaddedSeed[i] = pbPaddedSeed[i] ^ blobSeedMask.pbData[i]; + + /* Get unpadded DB */ + result = pkcs1_mgf1(hProv, pbUnpaddedSeed, dwSeedLen, dwDbLen, &blobDbMask); + if (!result) goto done; + for (i = 0; i < dwDbLen; i++) pbUnpaddedDb[i] = pbPaddedDb[i] ^ blobDbMask.pbData[i]; + + /* Compare hash in DB */ + result = memcmp(pbUnpaddedDb, pbHashValue, dwHashLen); + + /* Get count of zero paddings(PS) */ + dwZeroCount = 0; + while (dwHashLen + dwZeroCount + 1 <= dwDbLen && pbUnpaddedDb[dwHashLen + dwZeroCount] == 0) dwZeroCount++; + dwMsgCount = dwDbLen - dwHashLen - dwZeroCount - 1; + + if (dwHashLen + dwZeroCount + 1 > dwDbLen || abData[0] || result || pbUnpaddedDb[dwHashLen + dwZeroCount] != 1 + || *dwBufferLen < dwMsgCount) + { + SetLastError(NTE_BAD_DATA); + goto done; + } + + *dwBufferLen = dwMsgCount; + memcpy(abBuffer, pbUnpaddedDb + dwHashLen + dwZeroCount + 1, dwMsgCount); + ret = TRUE; +done: + RSAENH_CPDestroyHash(hProv, hHash); + HeapFree(GetProcessHeap(), 0, pbHashValue); + HeapFree(GetProcessHeap(), 0, pbBuffer); + free_data_blob(&blobDbMask); + free_data_blob(&blobSeedMask); + return ret; +} + /****************************************************************************** * unpad_data [Internal] * * Remove the padding from RSA decrypted data according to padding format * * PARAMS + * hProv [I] Cryptographic provider handle * abData [I] The padded data * dwDataLen [I] Length of the padded data * abBuffer [O] Data without padding will be stored here * dwBufferLen [I/O] I: Length of the buffer, O: Length of unpadded data - * dwFlags [I] Currently none defined + * dwFlags [I] 0 or CRYPT_OAEP * * RETURNS * Success: TRUE * Failure: FALSE */ -static BOOL unpad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, +static BOOL unpad_data(HCRYPTPROV hProv, const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, DWORD dwFlags) { - return unpad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); + if (dwFlags == CRYPT_OAEP) + return unpad_data_oaep(hProv, abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); + else + return unpad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); } /****************************************************************************** @@ -2187,7 +2457,7 @@ BOOL WINAPI RSAENH_CPDuplicateKey(HCRYPTPROV hUID, HCRYPTKEY hKey, DWORD *pdwRes * hKey [I] The key used to encrypt the data. * hHash [I] An optional hash object for parallel hashing. See notes. * Final [I] Indicates if this is the last block of data to encrypt. - * dwFlags [I] Currently no flags defined. Must be zero. + * dwFlags [I] Must be zero or CRYPT_OAEP * pbData [I/O] Pointer to the data to encrypt. Encrypted data will also be stored there. * pdwDataLen [I/O] I: Length of data to encrypt, O: Length of encrypted data. * dwBufLen [I] Size of the buffer at pbData. @@ -2219,7 +2489,7 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, return FALSE; } - if (dwFlags) + if (dwFlags != 0 && dwFlags != CRYPT_OAEP) { SetLastError(NTE_BAD_FLAGS); return FALSE; @@ -2316,7 +2586,7 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, SetLastError(ERROR_MORE_DATA); return FALSE; } - if (!pad_data(pbData, *pdwDataLen, pbData, pCryptKey->dwBlockLen, dwFlags)) return FALSE; + if (!pad_data(hProv, pbData, *pdwDataLen, pbData, pCryptKey->dwBlockLen, dwFlags)) return FALSE; encrypt_block_impl(pCryptKey->aiAlgid, PK_PUBLIC, &pCryptKey->context, pbData, pbData, RSAENH_ENCRYPT); *pdwDataLen = pCryptKey->dwBlockLen; Final = TRUE; @@ -2340,7 +2610,7 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, * hKey [I] The key used to decrypt the data. * hHash [I] An optional hash object for parallel hashing. See notes. * Final [I] Indicates if this is the last block of data to decrypt. - * dwFlags [I] Currently no flags defined. Must be zero. + * dwFlags [I] Must be zero or CRYPT_OAEP * pbData [I/O] Pointer to the data to decrypt. Plaintext will also be stored there. * pdwDataLen [I/O] I: Length of ciphertext, O: Length of plaintext. * @@ -2371,7 +2641,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, return FALSE; } - if (dwFlags) + if (dwFlags != 0 && dwFlags != CRYPT_OAEP) { SetLastError(NTE_BAD_FLAGS); return FALSE; @@ -2459,7 +2729,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, return FALSE; } encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbData, pbData, RSAENH_DECRYPT); - if (!unpad_data(pbData, pCryptKey->dwBlockLen, pbData, pdwDataLen, dwFlags)) return FALSE; + if (!unpad_data(hProv, pbData, pCryptKey->dwBlockLen, pbData, pdwDataLen, dwFlags)) return FALSE; Final = TRUE; } else { SetLastError(NTE_BAD_TYPE); @@ -2503,7 +2773,7 @@ static BOOL crypt_export_simple(CRYPTKEY *pCryptKey, CRYPTKEY *pPubKey, *pAlgid = pPubKey->aiAlgid; - if (!pad_data(pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), + if (!pad_data(pCryptKey->hProv, pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), pPubKey->dwBlockLen, dwFlags)) { return FALSE; @@ -2966,7 +3236,7 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwD RSAENH_DECRYPT); dwKeyLen = RSAENH_MAX_KEY_SIZE; - if (!unpad_data(pbDecrypted, pPubKey->dwBlockLen, pbDecrypted, &dwKeyLen, dwFlags)) { + if (!unpad_data(hProv, pbDecrypted, pPubKey->dwBlockLen, pbDecrypted, &dwKeyLen, dwFlags)) { HeapFree(GetProcessHeap(), 0, pbDecrypted); return FALSE; } diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index df31aeb54b..3e782be279 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2282,6 +2282,7 @@ static void test_rsa_encrypt(void) BYTE abData[2048] = "Wine rocks!"; BOOL result; DWORD dwVal, dwLen; + DWORD err; /* It is allowed to use the key exchange key for encryption/decryption */ result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hRSAKey); @@ -2297,6 +2298,7 @@ static void test_rsa_encrypt(void) } ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); ok(dwLen == 128, "Unexpected length %d\n", dwLen); + /* PKCS1 V1.5 */ dwLen = 12; result = CryptEncrypt(hRSAKey, 0, TRUE, 0, abData, &dwLen, (DWORD)sizeof(abData)); ok (result, "%08x\n", GetLastError()); @@ -2304,7 +2306,52 @@ static void test_rsa_encrypt(void) result = CryptDecrypt(hRSAKey, 0, TRUE, 0, abData, &dwLen); ok (result && dwLen == 12 && !memcmp(abData, "Wine rocks!", 12), "%08x\n", GetLastError()); - + + /* OAEP, RFC 8017 PKCS #1 V2.2 */ + /* Test minimal buffer length requirement */ + dwLen = 1; + SetLastError(0xdeadbeef); + result = CryptEncrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen, 20 * 2 + 2); + err = GetLastError(); + ok(!result && err == ERROR_MORE_DATA, "%08x\n", err); + + /* Test data length limit */ + dwLen = sizeof(abData) - (20 * 2 + 2) + 1; + result = CryptEncrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen, (DWORD)sizeof(abData)); + err = GetLastError(); + ok(!result && err == NTE_BAD_LEN, "%08x\n", err); + + /* Test malformed data */ + dwLen = 12; + SetLastError(0xdeadbeef); + memcpy(abData, "Wine rocks!", dwLen); + result = CryptDecrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen); + err = GetLastError(); + /* NTE_DOUBLE_ENCRYPT on xp or 2003 */ + ok(!result && (err == NTE_BAD_DATA || broken(err == NTE_DOUBLE_ENCRYPT)), "%08x\n", err); + + /* Test decrypt with insufficient buffer */ + dwLen = 12; + SetLastError(0xdeadbeef); + memcpy(abData, "Wine rocks!", 12); + result = CryptEncrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen, (DWORD)sizeof(abData)); + ok(result, "%08x\n", GetLastError()); + dwLen = 11; + SetLastError(0xdeadbeef); + result = CryptDecrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen); + err = GetLastError(); + /* broken on xp or 2003 */ + ok((!result && dwLen == 11 && err == NTE_BAD_DATA) || broken(result == TRUE && dwLen == 12 && err == ERROR_NO_TOKEN), + "%08x %d %08x\n", result, dwLen, err); + + /* Test normal encryption and decryption */ + dwLen = 12; + memcpy(abData, "Wine rocks!", dwLen); + result = CryptEncrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen, (DWORD)sizeof(abData)); + ok(result, "%08x\n", GetLastError()); + result = CryptDecrypt(hRSAKey, 0, TRUE, CRYPT_OAEP, abData, &dwLen); + ok(result && dwLen == 12 && !memcmp(abData, "Wine rocks!", 12), "%08x\n", GetLastError()); + dwVal = 0xdeadbeef; dwLen = sizeof(DWORD); result = CryptGetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); -- 2.15.2 (Apple Git-101.1)

5 years, 7 months

Jump to page:

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-devel October 2018