Ros-diffs

ros-diffs@reactos.org

81390 discussions

[phater] 74563: [MSTSC] Fix adding module name and IP to logon packet. Patch by Stas'M. Minor modification by me. Thanks. CORE-13234
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:56:51 2017 New Revision: 74563 URL: http://svn.reactos.org/svn/reactos?rev=74563&view=rev Log: [MSTSC] Fix adding module name and IP to logon packet. Patch by Stas'M. Minor modification by me. Thanks. CORE-13234 Modified: trunk/reactos/base/applications/mstsc/rdp.c Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] Tue May 16 17:56:51 2017 @@ -352,8 +352,9 @@ int len_directory = 2 * strlen(directory); /* length of strings in TS_EXTENDED_PACKET includes null terminator */ + char dllName[MAX_PATH]; int len_ip = 2 * strlen(ipaddr) + 2; - int len_dll = 2 * strlen("C:\\") + 2; + int len_dll = 0; int packetlen = 0; uint32 sec_flags = g_encryption ? (SEC_INFO_PKT | SEC_ENCRYPT) : SEC_INFO_PKT; @@ -362,9 +363,11 @@ time_t tzone; uint8 security_verifier[16]; + GetModuleFileNameA(NULL, dllName, ARRAYSIZE(dllName)); + len_dll = 2 * strlen(dllName) + 2; + if (g_rdp_version == RDP_V4 || 1 == g_server_rdp_version) { - DEBUG_RDP5(("Sending RDP4-style Logon packet\n")); s = sec_init(sec_flags, 18 + len_domain + len_user + len_password + len_program + len_directory + 10); @@ -462,7 +465,7 @@ out_uint16_le(s, len_ip); /* cbClientAddress */ rdp_out_unistr_mandatory_null(s, ipaddr, len_ip - 2); /* clientAddress */ out_uint16_le(s, len_dll); /* cbClientDir */ - rdp_out_unistr(s, "C:\\", len_dll - 2); /* clientDir */ + rdp_out_unistr(s, dllName, len_dll - 2); /* clientDir */ /* TS_TIME_ZONE_INFORMATION */ tzone = (mktime(gmtime(&t)) - mktime(localtime(&t))) / 60;

1 0

[hbelusca] 74562: Addendum to r74559: specify 'void' function aka. doesn't take any parameter. In C, a function whose prototype is () means "take an arbitrary number of args".
by hbelusca＠svn.reactos.org 16 May '17

16 May '17

Author: hbelusca Date: Tue May 16 17:45:52 2017 New Revision: 74562 URL: http://svn.reactos.org/svn/reactos?rev=74562&view=rev Log: Addendum to r74559: specify 'void' function aka. doesn't take any parameter. In C, a function whose prototype is () means "take an arbitrary number of args". Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Tue May 16 17:45:52 2017 @@ -519,7 +519,7 @@ } NTSTATUS -acpi_create_volatile_registry_tables() +acpi_create_volatile_registry_tables(void) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING HardwareKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\ACPI");

1 0

[phater] 74561: [MSTSC] Enable taking settings folder using SHGetFolderLocation instead of using "c:\". Patch by Stas'M. Thanks CORE-13225
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:37:48 2017 New Revision: 74561 URL: http://svn.reactos.org/svn/reactos?rev=74561&view=rev Log: [MSTSC] Enable taking settings folder using SHGetFolderLocation instead of using "c:\". Patch by Stas'M. Thanks CORE-13225 Modified: trunk/reactos/base/applications/mstsc/settings.c Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Tue May 16 17:37:48 2017 @@ -374,7 +374,6 @@ /* use default file */ if (lpFile == NULL) { -#ifndef __REACTOS__ HRESULT hr; LPITEMIDLIST lpidl= NULL; @@ -392,10 +391,6 @@ CoTaskMemFree(lpidl); } } -#else - wcscpy(pszPath, L"C:\\Default.rdp"); - lpFile = pszPath; -#endif } if (lpFile) @@ -427,7 +422,6 @@ /* use default file */ if (lpFile == NULL) { -#ifndef __REACTOS__ // remove when this is working HRESULT hr; LPITEMIDLIST lpidl= NULL; @@ -445,10 +439,6 @@ CoTaskMemFree(lpidl); } } -#else - wcscpy(pszPath, L"C:\\Default.rdp"); - lpFile = pszPath; -#endif } if (lpFile)

1 0

[phater] 74560: [MSTSC] Fix image corruption in 24bpp mode CORE-13224
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:32:19 2017 New Revision: 74560 URL: http://svn.reactos.org/svn/reactos?rev=74560&view=rev Log: [MSTSC] Fix image corruption in 24bpp mode CORE-13224 Modified: trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] Tue May 16 17:32:19 2017 @@ -199,7 +199,7 @@ { bs_set_pixel_on(am, j, 31 - i, 32, 1, 1); } - if (bs_is_pixel_on((char *)xormask, j, i, 32, 24)) + if (bs_is_pixel_on((char *)xormask, j, i, 32, xor_bpp)) { bs_set_pixel_on(xm, j, 31 - i, 32, 1, 1); } Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Tue May 16 17:32:19 2017 @@ -886,6 +886,7 @@ int red; int green; int blue; + int index; ZeroMemory(&bi, sizeof(bi)); bi.bmiHeader.biSize = sizeof(bi.bmiHeader); @@ -942,7 +943,22 @@ } } } - else if (g_server_depth == 24 || g_server_depth == 32) + else if (g_server_depth == 24) + { + for (i = cy - 1; i >= 0; i--) + { + for (j = cx - 1; j >= 0; j--) + { + index = (i * cx + j) * 3; + red = ((unsigned char*)data)[index + 2]; + green = ((unsigned char*)data)[index + 1]; + blue = ((unsigned char*)data)[index]; + MAKE_COLOUR32(colour, red, green, blue); + ((unsigned int*)bits)[i * cx + j] = colour; + } + } + } + else if (g_server_depth == 32) { memcpy(bits, data, cx*cy*4); }

1 0

[phater] 74559: [ACPI] Implement creating volatile registry keys for ACPI tables CORE-12942
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:26:12 2017 New Revision: 74559 URL: http://svn.reactos.org/svn/reactos?rev=74559&view=rev Log: [ACPI] Implement creating volatile registry keys for ACPI tables CORE-12942 Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c trunk/reactos/drivers/bus/acpi/include/acpi_bus.h trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Tue May 16 17:26:12 2017 @@ -24,6 +24,7 @@ */ #include <precomp.h> +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -369,4 +370,281 @@ return_ACPI_STATUS(status); } - +NTSTATUS +acpi_create_registry_table(HANDLE ParentKeyHandle, ACPI_TABLE_HEADER *OutTable, PCWSTR KeyName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING HardwareKeyName, ValueName; + ANSI_STRING HardwareKeyNameA; + HANDLE KeyHandle = NULL, SubKeyHandle = NULL; + NTSTATUS Status; + char OemId[7] = { 0 }; /* exactly one byte more than ACPI_TABLE_HEADER->OemId */ + char OemTableId[9] = { 0 }; /* exactly one byte more than ACPI_TABLE_HEADER->OemTableId */ + WCHAR OemRevision[9] = { 0 }; /* enough to accept hex DWORD */ + + C_ASSERT(sizeof(OemId) == RTL_FIELD_SIZE(ACPI_TABLE_HEADER, OemId) + 1); + C_ASSERT(sizeof(OemTableId) == RTL_FIELD_SIZE(ACPI_TABLE_HEADER, OemTableId) + 1); + /* Copy OEM data from the table */ + RtlCopyMemory(OemId, OutTable->OemId, sizeof(OutTable->OemId)); + RtlCopyMemory(OemTableId, OutTable->OemTableId, sizeof(OutTable->OemTableId)); + /* Create table subkey */ + RtlInitUnicodeString(&HardwareKeyName, KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + ParentKeyHandle, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + + if (OutTable->OemRevision != 0) + { + /* We have OEM info in table, so create other OEM subkeys */ + RtlInitAnsiString(&HardwareKeyNameA, OemId); + Status = RtlAnsiStringToUnicodeString(&HardwareKeyName, &HardwareKeyNameA, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlAnsiStringToUnicodeString() for %s failed (Status 0x%08lx)\n", HardwareKeyNameA, Status); + return Status; + } + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + RtlFreeUnicodeString(&HardwareKeyName); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %s failed (Status 0x%08lx)\n", HardwareKeyNameA, Status); + return Status; + } + KeyHandle = SubKeyHandle; + + RtlInitAnsiString(&HardwareKeyNameA, OemTableId); + Status = RtlAnsiStringToUnicodeString(&HardwareKeyName, &HardwareKeyNameA, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlAnsiStringToUnicodeString() for %s failed (Status 0x%08lx)\n", HardwareKeyNameA, Status); + return Status; + } + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + RtlFreeUnicodeString(&HardwareKeyName); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %s failed (Status 0x%08lx)\n", HardwareKeyNameA, Status); + return Status; + } + KeyHandle = SubKeyHandle; + + Status = RtlStringCbPrintfW(OemRevision, + sizeof(OemRevision), + L"%08X", + OutTable->OemRevision); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlStringCbPrintfW() for 0x%08lx failed (Status 0x%08lx)\n", OutTable->OemRevision, Status); + return Status; + } + RtlInitUnicodeString(&HardwareKeyName, OemRevision); + + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwCreateKey(&SubKeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for %ws failed (Status 0x%08lx)\n", KeyName, Status); + return Status; + } + KeyHandle = SubKeyHandle; + } + /* Table reg value name is always '00000000' */ + RtlInitUnicodeString(&ValueName, + L"00000000"); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + OutTable, + OutTable->Length); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed (Status 0x%08lx)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +acpi_create_volatile_registry_tables() +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING HardwareKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\ACPI"); + HANDLE KeyHandle = NULL; + NTSTATUS Status; + ACPI_STATUS AcpiStatus; + ACPI_TABLE_HEADER *OutTable; + ACPI_PHYSICAL_ADDRESS RsdpAddress; + ACPI_TABLE_RSDP *Rsdp; + ACPI_PHYSICAL_ADDRESS Address; + UINT32 TableEntrySize; + + /* Create Main Hardware ACPI key*/ + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() for ACPI failed (Status 0x%08lx)\n", Status); + return Status; + } + /* Read DSDT table */ + AcpiStatus = AcpiGetTable(ACPI_SIG_DSDT, 0, &OutTable); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiGetTable() for DSDT failed (Status 0x%08lx)\n", AcpiStatus); + Status = STATUS_UNSUCCESSFUL; + goto done; + } + /* Dump DSDT table */ + Status = acpi_create_registry_table(KeyHandle, OutTable, L"DSDT"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for DSDT failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Read FACS table */ + AcpiStatus = AcpiGetTable(ACPI_SIG_FACS, 0, &OutTable); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiGetTable() for FACS failed (Status 0x%08lx)\n", AcpiStatus); + Status = STATUS_UNSUCCESSFUL; + goto done; + } + /* Dump FACS table */ + Status = acpi_create_registry_table(KeyHandle, OutTable, L"FACS"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for FACS failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Read FACS table */ + AcpiStatus = AcpiGetTable(ACPI_SIG_FADT, 0, &OutTable); + if (ACPI_FAILURE(AcpiStatus)) + { + DPRINT1("AcpiGetTable() for FADT failed (Status 0x%08lx)\n", AcpiStatus); + Status = STATUS_UNSUCCESSFUL; + goto done; + } + /* Dump FADT table */ + Status = acpi_create_registry_table(KeyHandle, OutTable, L"FADT"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for FADT failed (Status 0x%08lx)\n", Status); + goto done; + } + /* This is a rough copy from ACPICA reading of RSDT/XSDT and added to avoid patching acpica */ + RsdpAddress = AcpiOsGetRootPointer(); + /* Map the entire RSDP and extract the address of the RSDT or XSDT */ + Rsdp = AcpiOsMapMemory(RsdpAddress, sizeof(ACPI_TABLE_RSDP)); + if (!Rsdp) + { + DPRINT1("AcpiOsMapMemory() failed\n"); + Status = STATUS_NO_MEMORY; + goto done; + } + /* Use XSDT if present and not overridden. Otherwise, use RSDT */ + if ((Rsdp->Revision > 1) && + Rsdp->XsdtPhysicalAddress && + !AcpiGbl_DoNotUseXsdt) + { + /* + * RSDP contains an XSDT (64-bit physical addresses). We must use + * the XSDT if the revision is > 1 and the XSDT pointer is present, + * as per the ACPI specification. + */ + Address = (ACPI_PHYSICAL_ADDRESS)Rsdp->XsdtPhysicalAddress; + TableEntrySize = ACPI_XSDT_ENTRY_SIZE; + } + else + { + /* Root table is an RSDT (32-bit physical addresses) */ + Address = (ACPI_PHYSICAL_ADDRESS)Rsdp->RsdtPhysicalAddress; + TableEntrySize = ACPI_RSDT_ENTRY_SIZE; + } + /* + * It is not possible to map more than one entry in some environments, + * so unmap the RSDP here before mapping other tables + */ + AcpiOsUnmapMemory(Rsdp, sizeof(ACPI_TABLE_RSDP)); + OutTable = AcpiOsMapMemory(Address, TableEntrySize); + if (!OutTable) + { + DPRINT1("AcpiOsMapMemory() failed\n"); + Status = STATUS_NO_MEMORY; + goto done; + } + /* Dump RSDT table */ + Status = acpi_create_registry_table(KeyHandle, OutTable, L"RSDT"); + AcpiOsUnmapMemory(OutTable, TableEntrySize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("acpi_dump_table_to_registry() for RSDT failed (Status 0x%08lx)\n", Status); + } + +done: + ZwClose(KeyHandle); + return Status; +} Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] Tue May 16 17:26:12 2017 @@ -57,6 +57,8 @@ ACPI_STRING pathname, struct acpi_object_list *arguments, struct acpi_handle_list *list); +NTSTATUS +acpi_create_volatile_registry_tables(void); enum acpi_bus_removal_type { ACPI_BUS_REMOVAL_NORMAL = 0, Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Tue May 16 17:26:12 2017 @@ -297,6 +297,12 @@ DPRINT1("Unable to AcpiLoadTables\n"); AcpiTerminate(); return STATUS_UNSUCCESSFUL; + } + + status = acpi_create_volatile_registry_tables(); + if (!NT_SUCCESS(status)) + { + DPRINT1("Unable to create ACPI tables in registry\n"); } DPRINT("Acpi subsystem init\n");

1 0

[phater] 74558: [MSTSC] Switch most MSTSC from internal "ssl" functions to CryptoAPI and implement/enable certificate functions CORE-13259
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:20:56 2017 New Revision: 74558 URL: http://svn.reactos.org/svn/reactos?rev=74558&view=rev Log: [MSTSC] Switch most MSTSC from internal "ssl" functions to CryptoAPI and implement/enable certificate functions CORE-13259 Modified: trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] Tue May 16 17:20:56 2017 @@ -58,6 +58,19 @@ int rdssl_sign_ok(char* e_data, int e_len, char* n_data, int n_len, char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey); +PCCERT_CONTEXT +rdssl_cert_read(uint8 * data, uint32 len); +void +rdssl_cert_free(PCCERT_CONTEXT context); +uint8 * +rdssl_cert_to_rkey(PCCERT_CONTEXT cert, uint32 * key_len); +RD_BOOL +rdssl_certs_ok(PCCERT_CONTEXT server_cert, PCCERT_CONTEXT cacert); +int +rdssl_rkey_get_exp_mod(uint8 * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus, + uint32 max_mod_len); +void +rdssl_rkey_free(uint8 * rkey); extern char g_hostname[16]; extern int g_width; @@ -640,9 +653,9 @@ uint8 ** server_random, uint8 * modulus, uint8 * exponent) { uint32 crypt_level, random_len, rsa_info_len; - uint32 /*cacert_len, cert_len,*/ flags; - //RDSSL_CERT *cacert, *server_cert; - //RDSSL_RKEY *server_public_key; + uint32 cacert_len, cert_len, flags; + PCCERT_CONTEXT cacert, server_cert; + BYTE *server_public_key; uint16 tag, length; uint8 *next_tag, *end; @@ -706,7 +719,6 @@ } else { -#if 0 uint32 certcount; DEBUG_RDP5(("We're going for the RDP5-style encryption\n")); @@ -719,7 +731,7 @@ for (; certcount > 2; certcount--) { /* ignore all the certificates between the root and the signing CA */ uint32 ignorelen; - RDSSL_CERT *ignorecert; + PCCERT_CONTEXT ignorecert; DEBUG_RDP5(("Ignored certs left: %d\n", certcount)); in_uint32_le(s, ignorelen); @@ -797,7 +809,6 @@ } rdssl_rkey_free(server_public_key); return True; /* There's some garbage here we don't care about */ -#endif } return s_check_end(s); } Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] Tue May 16 17:20:56 2017 @@ -22,733 +22,576 @@ #include "precomp.h" -#define APP_CC - /*****************************************************************************/ static void * g_malloc(int size, int zero) { - void * p; - - p = xmalloc(size); - if (zero) - { - memset(p, 0, size); - } - return p; + void * p; + + p = CryptMemAlloc(size); + if (zero) + { + memset(p, 0, size); + } + return p; } /*****************************************************************************/ static void g_free(void * in) { - xfree(in); -} - -/*****************************************************************************/ -/*****************************************************************************/ -/* rc4 stuff */ -/* An implementation of the ARC4 algorithm - * - * Copyright (C) 2001-2003 Christophe Devine - */ + CryptMemFree(in); +} + struct rc4_state { - int x; - int y; - int m[256]; + HCRYPTPROV hCryptProv; + HCRYPTKEY hKey; }; - -/*****************************************************************************/ -void* APP_CC +/*****************************************************************************/ +void* rdssl_rc4_info_create(void) { - return g_malloc(sizeof(struct rc4_state), 1); -} - -/*****************************************************************************/ -void APP_CC + struct rc4_state *info = g_malloc(sizeof(struct rc4_state), 1); + BOOL ret; + DWORD dwErr; + if (!info) + { + error("rdssl_rc4_info_create no memory\n"); + return NULL; + } + ret = CryptAcquireContext(&info->hCryptProv, + NULL, + MS_ENHANCED_PROV, + PROV_RSA_FULL, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptAcquireContext failed with %lx\n", dwErr); + g_free(info); + return NULL; + } + return info; +} + +/*****************************************************************************/ +void rdssl_rc4_info_delete(void* rc4_info) { - g_free(rc4_info); -} - -/*****************************************************************************/ -void APP_CC + struct rc4_state *info = rc4_info; + BOOL ret = TRUE; + DWORD dwErr; + if (!info) + { + //error("rdssl_rc4_info_delete rc4_info is null\n"); + return; + } + if (info->hKey) + { + ret = CryptDestroyKey(info->hKey); + if (!ret) + { + dwErr = GetLastError(); + error("CryptDestroyKey failed with %lx\n", dwErr); + } + } + if (info->hCryptProv) + { + ret = CryptReleaseContext(info->hCryptProv, 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptReleaseContext failed with %lx\n", dwErr); + } + } + g_free(rc4_info); +} + +/*****************************************************************************/ +void rdssl_rc4_set_key(void* rc4_info, char* key, int len) { - int i; - int j; - int k; - int a; - int* m; - struct rc4_state* s; - - s = (struct rc4_state*)rc4_info; - s->x = 0; - s->y = 0; - m = s->m; - for (i = 0; i < 256; i++) - { - m[i] = i; - } - j = 0; - k = 0; - for (i = 0; i < 256; i++) - { - a = m[i]; - j = (unsigned char)(j + a + key[k]); - m[i] = m[j]; - m[j] = a; - k++; - if (k >= len) - { - k = 0; - } - } -} - -/*****************************************************************************/ -void APP_CC + struct rc4_state *info = rc4_info; + BOOL ret; + DWORD dwErr; + BYTE * blob; + PUBLICKEYSTRUC *desc; + DWORD * keySize; + BYTE * keyBuf; + if (!rc4_info || !key || !len || !info->hCryptProv) + { + error("rdssl_rc4_set_key %p %p %d\n", rc4_info, key, len); + return; + } + blob = g_malloc(sizeof(PUBLICKEYSTRUC) + sizeof(DWORD) + len, 0); + if (!blob) + { + error("rdssl_rc4_set_key no memory\n"); + return; + } + desc = (PUBLICKEYSTRUC *)blob; + keySize = (DWORD *)(blob + sizeof(PUBLICKEYSTRUC)); + keyBuf = blob + sizeof(PUBLICKEYSTRUC) + sizeof(DWORD); + desc->aiKeyAlg = CALG_RC4; + desc->bType = PLAINTEXTKEYBLOB; + desc->bVersion = CUR_BLOB_VERSION; + desc->reserved = 0; + *keySize = len; + memcpy(keyBuf, key, len); + if (info->hKey) + { + CryptDestroyKey(info->hKey); + info->hKey = 0; + } + ret = CryptImportKey(info->hCryptProv, + blob, + sizeof(PUBLICKEYSTRUC) + sizeof(DWORD) + len, + 0, + CRYPT_EXPORTABLE, + &info->hKey); + g_free(blob); + if (!ret) + { + dwErr = GetLastError(); + error("CryptImportKey failed with %lx\n", dwErr); + } +} + +/*****************************************************************************/ +void rdssl_rc4_crypt(void* rc4_info, char* in_data, char* out_data, int len) { - int i; - int x; - int y; - int a; - int b; - int* m; - struct rc4_state* s; - - s = (struct rc4_state*)rc4_info; - x = s->x; - y = s->y; - m = s->m; - for (i = 0; i < len; i++) - { - x = (unsigned char)(x + 1); - a = m[x]; - y = (unsigned char)(y + a); - b = m[y]; - m[x] = b; - m[y] = a; - out_data[i] = in_data[i] ^ (m[(unsigned char)(a + b)]); - } - s->x = x; - s->y = y; -} - -/*****************************************************************************/ -/*****************************************************************************/ -/* sha1 stuff */ -/* FIPS-180-1 compliant SHA-1 implementation - * - * Copyright (C) 2001-2003 Christophe Devine - */ -struct sha1_context -{ - int total[2]; - int state[5]; - char buffer[64]; + struct rc4_state *info = rc4_info; + BOOL ret; + DWORD dwErr; + BYTE * intermediate_data; + DWORD dwLen = len; + if (!rc4_info || !in_data || !out_data || !len || !info->hKey) + { + error("rdssl_rc4_crypt %p %p %p %d\n", rc4_info, in_data, out_data, len); + return; + } + intermediate_data = g_malloc(len, 0); + if (!intermediate_data) + { + error("rdssl_rc4_set_key no memory\n"); + return; + } + memcpy(intermediate_data, in_data, len); + ret = CryptEncrypt(info->hKey, + 0, + FALSE, + 0, + intermediate_data, + &dwLen, + dwLen); + if (!ret) + { + dwErr = GetLastError(); + g_free(intermediate_data); + error("CryptEncrypt failed with %lx\n", dwErr); + return; + } + memcpy(out_data, intermediate_data, len); + g_free(intermediate_data); +} + +struct hash_context +{ + HCRYPTPROV hCryptProv; + HCRYPTKEY hHash; }; /*****************************************************************************/ -void* APP_CC +void* +rdssl_hash_info_create(ALG_ID id) +{ + struct hash_context *info = g_malloc(sizeof(struct hash_context), 1); + BOOL ret; + DWORD dwErr; + if (!info) + { + error("rdssl_hash_info_create %d no memory\n", id); + return NULL; + } + ret = CryptAcquireContext(&info->hCryptProv, + NULL, + MS_ENHANCED_PROV, + PROV_RSA_FULL, + 0); + if (!ret) + { + dwErr = GetLastError(); + g_free(info); + error("CryptAcquireContext failed with %lx\n", dwErr); + return NULL; + } + ret = CryptCreateHash(info->hCryptProv, + id, + 0, + 0, + &info->hHash); + if (!ret) + { + dwErr = GetLastError(); + CryptReleaseContext(info->hCryptProv, 0); + g_free(info); + error("CryptCreateHash failed with %lx\n", dwErr); + return NULL; + } + return info; +} + +/*****************************************************************************/ +void +rdssl_hash_info_delete(void* hash_info) +{ + struct hash_context *info = hash_info; + if (!info) + { + //error("ssl_hash_info_delete hash_info is null\n"); + return; + } + if (info->hHash) + { + CryptDestroyHash(info->hHash); + } + if (info->hCryptProv) + { + CryptReleaseContext(info->hCryptProv, 0); + } + g_free(hash_info); +} + +/*****************************************************************************/ +void +rdssl_hash_clear(void* hash_info, ALG_ID id) +{ + struct hash_context *info = hash_info; + BOOL ret; + DWORD dwErr; + if (!info || !info->hHash || !info->hCryptProv) + { + error("rdssl_hash_clear %p\n", info); + return; + } + ret = CryptDestroyHash(info->hHash); + if (!ret) + { + dwErr = GetLastError(); + error("CryptDestroyHash failed with %lx\n", dwErr); + return; + } + ret = CryptCreateHash(info->hCryptProv, + id, + 0, + 0, + &info->hHash); + if (!ret) + { + dwErr = GetLastError(); + error("CryptCreateHash failed with %lx\n", dwErr); + } +} + +void +rdssl_hash_transform(void* hash_info, char* data, int len) +{ + struct hash_context *info = hash_info; + BOOL ret; + DWORD dwErr; + if (!info || !info->hHash || !info->hCryptProv || !data || !len) + { + error("rdssl_hash_transform %p %p %d\n", hash_info, data, len); + return; + } + ret = CryptHashData(info->hHash, + (BYTE *)data, + len, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptHashData failed with %lx\n", dwErr); + } +} + +/*****************************************************************************/ +void +rdssl_hash_complete(void* hash_info, char* data) +{ + struct hash_context *info = hash_info; + BOOL ret; + DWORD dwErr, dwDataLen; + if (!info || !info->hHash || !info->hCryptProv || !data) + { + error("rdssl_hash_complete %p %p\n", hash_info, data); + return; + } + ret = CryptGetHashParam(info->hHash, + HP_HASHVAL, + NULL, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptGetHashParam failed with %lx\n", dwErr); + return; + } + ret = CryptGetHashParam(info->hHash, + HP_HASHVAL, + (BYTE *)data, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptGetHashParam failed with %lx\n", dwErr); + } +} + +/*****************************************************************************/ +void* rdssl_sha1_info_create(void) { - return g_malloc(sizeof(struct sha1_context), 1); -} - -/*****************************************************************************/ -void APP_CC + return rdssl_hash_info_create(CALG_SHA1); +} + +/*****************************************************************************/ +void rdssl_sha1_info_delete(void* sha1_info) { - g_free(sha1_info); -} - -/*****************************************************************************/ -void APP_CC + rdssl_hash_info_delete(sha1_info); +} + +/*****************************************************************************/ +void rdssl_sha1_clear(void* sha1_info) { - struct sha1_context* ctx; - - ctx = (struct sha1_context*)sha1_info; - memset(ctx, 0, sizeof(struct sha1_context)); - ctx->state[0] = 0x67452301; - ctx->state[1] = 0xEFCDAB89; - ctx->state[2] = 0x98BADCFE; - ctx->state[3] = 0x10325476; - ctx->state[4] = 0xC3D2E1F0; -} - -#undef GET_UINT32 -#define GET_UINT32(n, b, i) \ -{ \ - (n) = ((b)[(i) + 0] << 24) | \ - ((b)[(i) + 1] << 16) | \ - ((b)[(i) + 2] << 8) | \ - ((b)[(i) + 3] << 0); \ -} - -#undef PUT_UINT32 -#define PUT_UINT32(n, b, i) \ -{ \ - (b)[(i) + 0] = ((n) >> 24); \ - (b)[(i) + 1] = ((n) >> 16); \ - (b)[(i) + 2] = ((n) >> 8); \ - (b)[(i) + 3] = ((n) >> 0); \ -} - -/*****************************************************************************/ -static void APP_CC -sha1_process(struct sha1_context* ctx, char* in_data) -{ - int temp; - int W[16]; - int A; - int B; - int C; - int D; - int E; - unsigned char* data; - - data = (unsigned char*)in_data; - - GET_UINT32(W[0], data, 0); - GET_UINT32(W[1], data, 4); - GET_UINT32(W[2], data, 8); - GET_UINT32(W[3], data, 12); - GET_UINT32(W[4], data, 16); - GET_UINT32(W[5], data, 20); - GET_UINT32(W[6], data, 24); - GET_UINT32(W[7], data, 28); - GET_UINT32(W[8], data, 32); - GET_UINT32(W[9], data, 36); - GET_UINT32(W[10], data, 40); - GET_UINT32(W[11], data, 44); - GET_UINT32(W[12], data, 48); - GET_UINT32(W[13], data, 52); - GET_UINT32(W[14], data, 56); - GET_UINT32(W[15], data, 60); - -#define S(x, n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n))) - -#define R(t) \ -( \ - temp = W[(t - 3) & 0x0F] ^ \ - W[(t - 8) & 0x0F] ^ \ - W[(t - 14) & 0x0F] ^ \ - W[(t - 0) & 0x0F], \ - (W[t & 0x0F] = S(temp, 1)) \ -) - -#undef P -#define P(a, b, c, d, e, x) \ -{ \ - e += S(a, 5) + F(b, c, d) + K + x; \ - b = S(b, 30); \ -} - - A = ctx->state[0]; - B = ctx->state[1]; - C = ctx->state[2]; - D = ctx->state[3]; - E = ctx->state[4]; - -#define F(x, y, z) (z ^ (x & (y ^ z))) -#define K 0x5A827999 - - P(A, B, C, D, E, W[0]); - P(E, A, B, C, D, W[1]); - P(D, E, A, B, C, W[2]); - P(C, D, E, A, B, W[3]); - P(B, C, D, E, A, W[4]); - P(A, B, C, D, E, W[5]); - P(E, A, B, C, D, W[6]); - P(D, E, A, B, C, W[7]); - P(C, D, E, A, B, W[8]); - P(B, C, D, E, A, W[9]); - P(A, B, C, D, E, W[10]); - P(E, A, B, C, D, W[11]); - P(D, E, A, B, C, W[12]); - P(C, D, E, A, B, W[13]); - P(B, C, D, E, A, W[14]); - P(A, B, C, D, E, W[15]); - P(E, A, B, C, D, R(16)); - P(D, E, A, B, C, R(17)); - P(C, D, E, A, B, R(18)); - P(B, C, D, E, A, R(19)); - -#undef K -#undef F - -#define F(x, y, z) (x ^ y ^ z) -#define K 0x6ED9EBA1 - - P(A, B, C, D, E, R(20)); - P(E, A, B, C, D, R(21)); - P(D, E, A, B, C, R(22)); - P(C, D, E, A, B, R(23)); - P(B, C, D, E, A, R(24)); - P(A, B, C, D, E, R(25)); - P(E, A, B, C, D, R(26)); - P(D, E, A, B, C, R(27)); - P(C, D, E, A, B, R(28)); - P(B, C, D, E, A, R(29)); - P(A, B, C, D, E, R(30)); - P(E, A, B, C, D, R(31)); - P(D, E, A, B, C, R(32)); - P(C, D, E, A, B, R(33)); - P(B, C, D, E, A, R(34)); - P(A, B, C, D, E, R(35)); - P(E, A, B, C, D, R(36)); - P(D, E, A, B, C, R(37)); - P(C, D, E, A, B, R(38)); - P(B, C, D, E, A, R(39)); - -#undef K -#undef F - -#define F(x, y, z) ((x & y) | (z & (x | y))) -#define K 0x8F1BBCDC - - P(A, B, C, D, E, R(40)); - P(E, A, B, C, D, R(41)); - P(D, E, A, B, C, R(42)); - P(C, D, E, A, B, R(43)); - P(B, C, D, E, A, R(44)); - P(A, B, C, D, E, R(45)); - P(E, A, B, C, D, R(46)); - P(D, E, A, B, C, R(47)); - P(C, D, E, A, B, R(48)); - P(B, C, D, E, A, R(49)); - P(A, B, C, D, E, R(50)); - P(E, A, B, C, D, R(51)); - P(D, E, A, B, C, R(52)); - P(C, D, E, A, B, R(53)); - P(B, C, D, E, A, R(54)); - P(A, B, C, D, E, R(55)); - P(E, A, B, C, D, R(56)); - P(D, E, A, B, C, R(57)); - P(C, D, E, A, B, R(58)); - P(B, C, D, E, A, R(59)); - -#undef K -#undef F - -#define F(x, y, z) (x ^ y ^ z) -#define K 0xCA62C1D6 - - P(A, B, C, D, E, R(60)); - P(E, A, B, C, D, R(61)); - P(D, E, A, B, C, R(62)); - P(C, D, E, A, B, R(63)); - P(B, C, D, E, A, R(64)); - P(A, B, C, D, E, R(65)); - P(E, A, B, C, D, R(66)); - P(D, E, A, B, C, R(67)); - P(C, D, E, A, B, R(68)); - P(B, C, D, E, A, R(69)); - P(A, B, C, D, E, R(70)); - P(E, A, B, C, D, R(71)); - P(D, E, A, B, C, R(72)); - P(C, D, E, A, B, R(73)); - P(B, C, D, E, A, R(74)); - P(A, B, C, D, E, R(75)); - P(E, A, B, C, D, R(76)); - P(D, E, A, B, C, R(77)); - P(C, D, E, A, B, R(78)); - P(B, C, D, E, A, R(79)); - -#undef K -#undef F - - ctx->state[0] += A; - ctx->state[1] += B; - ctx->state[2] += C; - ctx->state[3] += D; - ctx->state[4] += E; -} - -/*****************************************************************************/ -void APP_CC + rdssl_hash_clear(sha1_info, CALG_SHA1); +} + +/*****************************************************************************/ +void rdssl_sha1_transform(void* sha1_info, char* data, int len) { - int left; - int fill; - struct sha1_context* ctx; - - ctx = (struct sha1_context*)sha1_info; - if (len == 0) - { - return; - } - left = ctx->total[0] & 0x3F; - fill = 64 - left; - ctx->total[0] += len; - ctx->total[0] &= 0xFFFFFFFF; - if (ctx->total[0] < len) - { - ctx->total[1]++; - } - if (left && (len >= fill)) - { - memcpy(ctx->buffer + left, data, fill); - sha1_process(ctx, ctx->buffer); - len -= fill; - data += fill; - left = 0; - } - while (len >= 64) - { - sha1_process(ctx, data); - len -= 64; - data += 64; - } - if (len != 0) - { - memcpy(ctx->buffer + left, data, len); - } -} - -static unsigned char sha1_padding[64] = -{ - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/*****************************************************************************/ -void APP_CC + rdssl_hash_transform(sha1_info, data, len); +} + +/*****************************************************************************/ +void rdssl_sha1_complete(void* sha1_info, char* data) { - int last; - int padn; - int high; - int low; - char msglen[8]; - struct sha1_context* ctx; - - ctx = (struct sha1_context*)sha1_info; - high = (ctx->total[0] >> 29) | (ctx->total[1] << 3); - low = (ctx->total[0] << 3); - PUT_UINT32(high, msglen, 0); - PUT_UINT32(low, msglen, 4); - last = ctx->total[0] & 0x3F; - padn = (last < 56) ? (56 - last) : (120 - last); - rdssl_sha1_transform(ctx, (char *)sha1_padding, padn); - rdssl_sha1_transform(ctx, msglen, 8); - PUT_UINT32(ctx->state[0], data, 0); - PUT_UINT32(ctx->state[1], data, 4); - PUT_UINT32(ctx->state[2], data, 8); - PUT_UINT32(ctx->state[3], data, 12); - PUT_UINT32(ctx->state[4], data, 16); -} - -/*****************************************************************************/ -/*****************************************************************************/ -/* md5 stuff */ -/* RFC 1321 compliant MD5 implementation - * - * Copyright (C) 2001-2003 Christophe Devine - */ - -struct md5_context -{ - int total[2]; - int state[4]; - char buffer[64]; -}; - -/*****************************************************************************/ -void* APP_CC + rdssl_hash_complete(sha1_info, data); +} + +/*****************************************************************************/ +void* rdssl_md5_info_create(void) { - return g_malloc(sizeof(struct md5_context), 1); -} - -/*****************************************************************************/ -void APP_CC + return rdssl_hash_info_create(CALG_MD5); +} + +/*****************************************************************************/ +void rdssl_md5_info_delete(void* md5_info) { - g_free(md5_info); -} - -/*****************************************************************************/ -void APP_CC + rdssl_hash_info_delete(md5_info); +} + +/*****************************************************************************/ +void rdssl_md5_clear(void* md5_info) { - struct md5_context* ctx; - - ctx = (struct md5_context*)md5_info; - memset(ctx, 0, sizeof(struct md5_context)); - ctx->state[0] = 0x67452301; - ctx->state[1] = 0xEFCDAB89; - ctx->state[2] = 0x98BADCFE; - ctx->state[3] = 0x10325476; -} - -#undef GET_UINT32 -#define GET_UINT32(n, b, i) \ -{ \ - (n) = ((b)[(i) + 0] << 0) | \ - ((b)[(i) + 1] << 8) | \ - ((b)[(i) + 2] << 16) | \ - ((b)[(i) + 3] << 24); \ -} - -#undef PUT_UINT32 -#define PUT_UINT32(n, b, i) \ -{ \ - (b)[(i) + 0] = ((n) >> 0); \ - (b)[(i) + 1] = ((n) >> 8); \ - (b)[(i) + 2] = ((n) >> 16); \ - (b)[(i) + 3] = ((n) >> 24); \ -} - -/*****************************************************************************/ -static void -md5_process(struct md5_context* ctx, char* in_data) -{ - int X[16]; - int A; - int B; - int C; - int D; - unsigned char* data; - - data = (unsigned char*)in_data; - GET_UINT32(X[0], data, 0); - GET_UINT32(X[1], data, 4); - GET_UINT32(X[2], data, 8); - GET_UINT32(X[3], data, 12); - GET_UINT32(X[4], data, 16); - GET_UINT32(X[5], data, 20); - GET_UINT32(X[6], data, 24); - GET_UINT32(X[7], data, 28); - GET_UINT32(X[8], data, 32); - GET_UINT32(X[9], data, 36); - GET_UINT32(X[10], data, 40); - GET_UINT32(X[11], data, 44); - GET_UINT32(X[12], data, 48); - GET_UINT32(X[13], data, 52); - GET_UINT32(X[14], data, 56); - GET_UINT32(X[15], data, 60); - -#define S(x, n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n))) - -#undef P -#define P(a, b, c, d, k, s, t) \ -{ \ - a += F(b, c, d) + X[k] + t; \ - a = S(a, s) + b; \ -} - - A = ctx->state[0]; - B = ctx->state[1]; - C = ctx->state[2]; - D = ctx->state[3]; - -#define F(x, y, z) (z ^ (x & (y ^ z))) - - P(A, B, C, D, 0, 7, 0xD76AA478); - P(D, A, B, C, 1, 12, 0xE8C7B756); - P(C, D, A, B, 2, 17, 0x242070DB); - P(B, C, D, A, 3, 22, 0xC1BDCEEE); - P(A, B, C, D, 4, 7, 0xF57C0FAF); - P(D, A, B, C, 5, 12, 0x4787C62A); - P(C, D, A, B, 6, 17, 0xA8304613); - P(B, C, D, A, 7, 22, 0xFD469501); - P(A, B, C, D, 8, 7, 0x698098D8); - P(D, A, B, C, 9, 12, 0x8B44F7AF); - P(C, D, A, B, 10, 17, 0xFFFF5BB1); - P(B, C, D, A, 11, 22, 0x895CD7BE); - P(A, B, C, D, 12, 7, 0x6B901122); - P(D, A, B, C, 13, 12, 0xFD987193); - P(C, D, A, B, 14, 17, 0xA679438E); - P(B, C, D, A, 15, 22, 0x49B40821); - -#undef F - -#define F(x, y, z) (y ^ (z & (x ^ y))) - - P(A, B, C, D, 1, 5, 0xF61E2562); - P(D, A, B, C, 6, 9, 0xC040B340); - P(C, D, A, B, 11, 14, 0x265E5A51); - P(B, C, D, A, 0, 20, 0xE9B6C7AA); - P(A, B, C, D, 5, 5, 0xD62F105D); - P(D, A, B, C, 10, 9, 0x02441453); - P(C, D, A, B, 15, 14, 0xD8A1E681); - P(B, C, D, A, 4, 20, 0xE7D3FBC8); - P(A, B, C, D, 9, 5, 0x21E1CDE6); - P(D, A, B, C, 14, 9, 0xC33707D6); - P(C, D, A, B, 3, 14, 0xF4D50D87); - P(B, C, D, A, 8, 20, 0x455A14ED); - P(A, B, C, D, 13, 5, 0xA9E3E905); - P(D, A, B, C, 2, 9, 0xFCEFA3F8); - P(C, D, A, B, 7, 14, 0x676F02D9); - P(B, C, D, A, 12, 20, 0x8D2A4C8A); - -#undef F - -#define F(x, y, z) (x ^ y ^ z) - - P(A, B, C, D, 5, 4, 0xFFFA3942); - P(D, A, B, C, 8, 11, 0x8771F681); - P(C, D, A, B, 11, 16, 0x6D9D6122); - P(B, C, D, A, 14, 23, 0xFDE5380C); - P(A, B, C, D, 1, 4, 0xA4BEEA44); - P(D, A, B, C, 4, 11, 0x4BDECFA9); - P(C, D, A, B, 7, 16, 0xF6BB4B60); - P(B, C, D, A, 10, 23, 0xBEBFBC70); - P(A, B, C, D, 13, 4, 0x289B7EC6); - P(D, A, B, C, 0, 11, 0xEAA127FA); - P(C, D, A, B, 3, 16, 0xD4EF3085); - P(B, C, D, A, 6, 23, 0x04881D05); - P(A, B, C, D, 9, 4, 0xD9D4D039); - P(D, A, B, C, 12, 11, 0xE6DB99E5); - P(C, D, A, B, 15, 16, 0x1FA27CF8); - P(B, C, D, A, 2, 23, 0xC4AC5665); - -#undef F - -#define F(x, y, z) (y ^ (x | ~z)) - - P(A, B, C, D, 0, 6, 0xF4292244); - P(D, A, B, C, 7, 10, 0x432AFF97); - P(C, D, A, B, 14, 15, 0xAB9423A7); - P(B, C, D, A, 5, 21, 0xFC93A039); - P(A, B, C, D, 12, 6, 0x655B59C3); - P(D, A, B, C, 3, 10, 0x8F0CCC92); - P(C, D, A, B, 10, 15, 0xFFEFF47D); - P(B, C, D, A, 1, 21, 0x85845DD1); - P(A, B, C, D, 8, 6, 0x6FA87E4F); - P(D, A, B, C, 15, 10, 0xFE2CE6E0); - P(C, D, A, B, 6, 15, 0xA3014314); - P(B, C, D, A, 13, 21, 0x4E0811A1); - P(A, B, C, D, 4, 6, 0xF7537E82); - P(D, A, B, C, 11, 10, 0xBD3AF235); - P(C, D, A, B, 2, 15, 0x2AD7D2BB); - P(B, C, D, A, 9, 21, 0xEB86D391); - -#undef F - - ctx->state[0] += A; - ctx->state[1] += B; - ctx->state[2] += C; - ctx->state[3] += D; -} - -/*****************************************************************************/ -void APP_CC + rdssl_hash_clear(md5_info, CALG_MD5); +} + +/*****************************************************************************/ +void rdssl_md5_transform(void* md5_info, char* data, int len) { - int left; - int fill; - struct md5_context* ctx; - - ctx = (struct md5_context*)md5_info; - if (len == 0) - { - return; - } - left = ctx->total[0] & 0x3F; - fill = 64 - left; - ctx->total[0] += len; - ctx->total[0] &= 0xFFFFFFFF; - if (ctx->total[0] < len) - { - ctx->total[1]++; - } - if (left && (len >= fill)) - { - memcpy(ctx->buffer + left, data, fill); - md5_process(ctx, ctx->buffer); - len -= fill; - data += fill; - left = 0; - } - while (len >= 64) - { - md5_process(ctx, data); - len -= 64; - data += 64; - } - if (len != 0) - { - memcpy(ctx->buffer + left, data, len); - } -} - -static unsigned char md5_padding[64] = -{ - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/*****************************************************************************/ -void APP_CC + rdssl_hash_transform(md5_info, data, len); +} + +/*****************************************************************************/ +void rdssl_md5_complete(void* md5_info, char* data) { - int last; - int padn; - int high; - int low; - char msglen[8]; - struct md5_context* ctx; - - ctx = (struct md5_context*)md5_info; - high = (ctx->total[0] >> 29) | (ctx->total[1] << 3); - low = (ctx->total[0] << 3); - PUT_UINT32(low, msglen, 0); - PUT_UINT32(high, msglen, 4); - last = ctx->total[0] & 0x3F; - padn = (last < 56) ? (56 - last) : (120 - last); - rdssl_md5_transform(ctx, (char *)md5_padding, padn); - rdssl_md5_transform(ctx, msglen, 8); - PUT_UINT32(ctx->state[0], data, 0); - PUT_UINT32(ctx->state[1], data, 4); - PUT_UINT32(ctx->state[2], data, 8); - PUT_UINT32(ctx->state[3], data, 12); -} - -void APP_CC + rdssl_hash_complete(md5_info, data); +} + +/*****************************************************************************/ +void rdssl_hmac_md5(char* key, int keylen, char* data, int len, char* output) { - int i; - char ipad[64]; - char opad[64]; - char sum[16]; - void* ctx; - - if( keylen > 64 ) - { - ctx = rdssl_md5_info_create(); - rdssl_md5_transform(ctx, key, keylen); - rdssl_md5_complete(ctx, sum); - rdssl_md5_info_delete(ctx); - keylen = 16; - key = sum; - } - - memset( ipad, 0x36, sizeof(ipad) ); - memset( opad, 0x5C, sizeof(opad) ); - - for( i = 0; i < keylen; i++ ) - { - ipad[i] = ipad[i] ^ key[i]; - opad[i] = opad[i] ^ key[i]; - } - ctx = rdssl_md5_info_create(); - rdssl_md5_transform(ctx, ipad, sizeof(ipad)); - rdssl_md5_transform(ctx, data, len); - rdssl_md5_complete(ctx, sum); - rdssl_md5_info_delete(ctx); - ctx = rdssl_md5_info_create(); - rdssl_md5_transform(ctx, opad, sizeof(opad)); - rdssl_md5_complete(ctx, output); - rdssl_md5_info_delete(ctx); + HCRYPTPROV hCryptProv; + HCRYPTKEY hKey; + HCRYPTKEY hHash; + BOOL ret; + DWORD dwErr, dwDataLen; + HMAC_INFO info; + BYTE * blob; + PUBLICKEYSTRUC *desc; + DWORD * keySize; + BYTE * keyBuf; + BYTE sum[16]; + + if (!key || !keylen || !data || !len ||!output) + { + error("rdssl_hmac_md5 %p %d %p %d %p\n", key, keylen, data, len, output); + return; + } + blob = g_malloc(sizeof(PUBLICKEYSTRUC) + sizeof(DWORD) + keylen, 0); + desc = (PUBLICKEYSTRUC *)blob; + keySize = (DWORD *)(blob + sizeof(PUBLICKEYSTRUC)); + keyBuf = blob + sizeof(PUBLICKEYSTRUC) + sizeof(DWORD); + if (!blob) + { + error("rdssl_hmac_md5 %d no memory\n"); + return; + } + ret = CryptAcquireContext(&hCryptProv, + NULL, + MS_ENHANCED_PROV, + PROV_RSA_FULL, + 0); + if (!ret) + { + dwErr = GetLastError(); + g_free(blob); + error("CryptAcquireContext failed with %lx\n", dwErr); + return; + } + desc->aiKeyAlg = CALG_RC4; + desc->bType = PLAINTEXTKEYBLOB; + desc->bVersion = CUR_BLOB_VERSION; + desc->reserved = 0; + if (keylen > 64) + { + HCRYPTKEY hHash; + ret = CryptCreateHash(hCryptProv, + CALG_MD5, + 0, + 0, + &hHash); + if (!ret) + { + dwErr = GetLastError(); + g_free(blob); + error("CryptCreateHash failed with %lx\n", dwErr); + return; + } + ret = CryptHashData(hHash, + (BYTE *)key, + keylen, + 0); + if (!ret) + { + dwErr = GetLastError(); + g_free(blob); + error("CryptHashData failed with %lx\n", dwErr); + return; + } + ret = CryptGetHashParam(hHash, + HP_HASHVAL, + NULL, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + g_free(blob); + error("CryptGetHashParam failed with %lx\n", dwErr); + return; + } + ret = CryptGetHashParam(hHash, + HP_HASHVAL, + sum, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + g_free(blob); + error("CryptGetHashParam failed with %lx\n", dwErr); + return; + } + keylen = dwDataLen; + key = (char *)sum; + } + *keySize = keylen; + memcpy(keyBuf, key, keylen); + ret = CryptImportKey(hCryptProv, + blob, + sizeof(PUBLICKEYSTRUC) + sizeof(DWORD) + keylen, + 0, + CRYPT_EXPORTABLE, + &hKey); + g_free(blob); + if (!ret) + { + dwErr = GetLastError(); + error("CryptImportKey failed with %lx\n", dwErr); + return; + } + ret = CryptCreateHash(hCryptProv, + CALG_HMAC, + hKey, + 0, + &hHash); + if (!ret) + { + dwErr = GetLastError(); + error("CryptCreateHash failed with %lx\n", dwErr); + return; + } + info.HashAlgid = CALG_MD5; + info.cbInnerString = 0; + info.cbOuterString = 0; + ret = CryptSetHashParam(hHash, + HP_HMAC_INFO, + (BYTE *)&info, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptSetHashParam failed with %lx\n", dwErr); + return; + } + ret = CryptHashData(hHash, + (BYTE *)data, + len, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptHashData failed with %lx\n", dwErr); + return; + } + ret = CryptGetHashParam(hHash, + HP_HASHVAL, + NULL, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptGetHashParam failed with %lx\n", dwErr); + return; + } + ret = CryptGetHashParam(hHash, + HP_HASHVAL, + (BYTE *)output, + &dwDataLen, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptGetHashParam failed with %lx\n", dwErr); + return; + } + CryptDestroyHash(hHash); + ret = CryptReleaseContext(hCryptProv, 0); } /*****************************************************************************/ @@ -816,7 +659,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T mpAdd(DIGIT_T* w, DIGIT_T* u, DIGIT_T* v, unsigned int ndigits) { /* Calculates w = u + v @@ -852,7 +695,7 @@ } /*****************************************************************************/ -static void APP_CC +static void mpSetDigit(DIGIT_T* a, DIGIT_T d, unsigned int ndigits) { /* Sets a = d where d is a single digit */ unsigned int i; @@ -865,7 +708,7 @@ } /*****************************************************************************/ -static int APP_CC +static int mpCompare(DIGIT_T* a, DIGIT_T* b, unsigned int ndigits) { /* Returns sign of (a - b) */ @@ -888,7 +731,7 @@ } /*****************************************************************************/ -static void APP_CC +static void mpSetZero(DIGIT_T* a, unsigned int ndigits) { /* Sets a = 0 */ unsigned int i; @@ -900,7 +743,7 @@ } /*****************************************************************************/ -static void APP_CC +static void mpSetEqual(DIGIT_T* a, DIGIT_T* b, unsigned int ndigits) { /* Sets a = b */ unsigned int i; @@ -912,7 +755,7 @@ } /*****************************************************************************/ -static unsigned int APP_CC +static unsigned int mpSizeof(DIGIT_T* a, unsigned int ndigits) { /* Returns size of significant digits in a */ while (ndigits--) @@ -926,7 +769,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T mpShiftLeft(DIGIT_T* a, DIGIT_T* b, unsigned int x, unsigned int ndigits) { /* Computes a = b << x */ unsigned int i; @@ -962,7 +805,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T mpShiftRight(DIGIT_T* a, DIGIT_T* b, unsigned int x, unsigned int ndigits) { /* Computes a = b >> x */ unsigned int i; @@ -999,7 +842,7 @@ } /*****************************************************************************/ -static void APP_CC +static void spMultSub(DIGIT_T* uu, DIGIT_T qhat, DIGIT_T v1, DIGIT_T v0) { /* Compute uu = uu - q(v1v0) @@ -1022,7 +865,7 @@ } /*****************************************************************************/ -static int APP_CC +static int spMultiply(DIGIT_T* p, DIGIT_T x, DIGIT_T y) { /* Computes p = x * y */ /* Ref: Arbitrary Precision Computation @@ -1093,7 +936,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T spDivide(DIGIT_T* q, DIGIT_T* r, DIGIT_T* u, DIGIT_T v) { /* Computes quotient q = u / v, remainder r = u mod v where u is a double digit @@ -1234,7 +1077,7 @@ } /*****************************************************************************/ -static int APP_CC +static int QhatTooBig(DIGIT_T qhat, DIGIT_T rhat, DIGIT_T vn2, DIGIT_T ujn2) { /* Returns true if Qhat is too big i.e. if (Qhat * Vn-2) > (b.Rhat + Uj+n-2) */ @@ -1257,7 +1100,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T mpShortDiv(DIGIT_T* q, DIGIT_T* u, DIGIT_T v, unsigned int ndigits) { /* Calculates quotient q = u div v @@ -1316,7 +1159,7 @@ } /*****************************************************************************/ -static DIGIT_T APP_CC +static DIGIT_T mpMultSub(DIGIT_T wn, DIGIT_T* w, DIGIT_T* v, DIGIT_T q, unsigned int n) { /* Compute w = w - qv where w = (WnW[n-1]...W[0]) @@ -1355,7 +1198,7 @@ } /*****************************************************************************/ -static int APP_CC +static int mpDivide(DIGIT_T* q, DIGIT_T* r, DIGIT_T* u, unsigned int udigits, DIGIT_T* v, unsigned int vdigits) { /* Computes quotient q = u / v and remainder r = u mod v @@ -1501,7 +1344,7 @@ } /*****************************************************************************/ -static int APP_CC +static int mpModulo(DIGIT_T* r, DIGIT_T* u, unsigned int udigits, DIGIT_T* v, unsigned int vdigits) { @@ -1528,7 +1371,7 @@ } /*****************************************************************************/ -static int APP_CC +static int mpMultiply(DIGIT_T* w, DIGIT_T* u, DIGIT_T* v, unsigned int ndigits) { /* Computes product w = u * v @@ -1586,7 +1429,7 @@ } /*****************************************************************************/ -static int APP_CC +static int mpModMult(DIGIT_T* a, DIGIT_T* x, DIGIT_T* y, DIGIT_T* m, unsigned int ndigits) { /* Computes a = (x * y) mod m */ @@ -1602,7 +1445,7 @@ } /*****************************************************************************/ -int APP_CC +int rdssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len) { @@ -1752,3 +1595,139 @@ return memcmp(sign_data, sign_data2, sign_len2); } +/*****************************************************************************/ +PCCERT_CONTEXT rdssl_cert_read(uint8 * data, uint32 len) +{ + PCCERT_CONTEXT res; + if (!data || !len) + { + error("rdssl_cert_read %p %ld\n", data, len); + return NULL; + } + res = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, data, len); + if (!res) + { + error("CertCreateCertificateContext call failed with %lx\n", GetLastError()); + } + return res; +} + +/*****************************************************************************/ +void rdssl_cert_free(PCCERT_CONTEXT context) +{ + if (context) + CertFreeCertificateContext(context); +} + +/*****************************************************************************/ +uint8 *rdssl_cert_to_rkey(PCCERT_CONTEXT cert, uint32 * key_len) +{ + HCRYPTPROV hCryptProv; + HCRYPTKEY hKey; + BOOL ret; + BYTE * rkey; + DWORD dwSize, dwErr; + ret = CryptAcquireContext(&hCryptProv, + NULL, + MS_ENHANCED_PROV, + PROV_RSA_FULL, + 0); + if (!ret) + { + dwErr = GetLastError(); + error("CryptAcquireContext call failed with %lx\n", dwErr); + return NULL; + } + ret = CryptImportPublicKeyInfoEx(hCryptProv, + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + &(cert->pCertInfo->SubjectPublicKeyInfo), + 0, + 0, + NULL, + &hKey); + if (!ret) + { + dwErr = GetLastError(); + CryptReleaseContext(hCryptProv, 0); + error("CryptImportPublicKeyInfoEx call failed with %lx\n", dwErr); + return NULL; + } + ret = CryptExportKey(hKey, + 0, + PUBLICKEYBLOB, + 0, + NULL, + &dwSize); + if (!ret) + { + dwErr = GetLastError(); + CryptDestroyKey(hKey); + CryptReleaseContext(hCryptProv, 0); + error("CryptExportKey call failed with %lx\n", dwErr); + return NULL; + } + rkey = g_malloc(dwSize, 0); + ret = CryptExportKey(hKey, + 0, + PUBLICKEYBLOB, + 0, + rkey, + &dwSize); + if (!ret) + { + dwErr = GetLastError(); + g_free(rkey); + CryptDestroyKey(hKey); + CryptReleaseContext(hCryptProv, 0); + error("CryptExportKey call failed with %lx\n", dwErr); + return NULL; + } + CryptDestroyKey(hKey); + CryptReleaseContext(hCryptProv, 0); + return rkey; +} + +/*****************************************************************************/ +RD_BOOL rdssl_certs_ok(PCCERT_CONTEXT server_cert, PCCERT_CONTEXT cacert) +{ + /* FIXME should we check for expired certificates??? */ + DWORD dwFlags = CERT_STORE_SIGNATURE_FLAG; /* CERT_STORE_TIME_VALIDITY_FLAG */ + BOOL ret = CertVerifySubjectCertificateContext(server_cert, + cacert, + &dwFlags); + if (!ret) + { + error("CertVerifySubjectCertificateContext call failed with %lx\n", GetLastError()); + } + if (dwFlags) + { + error("CertVerifySubjectCertificateContext check failed %lx\n", dwFlags); + } + return (dwFlags == 0); +} + +/*****************************************************************************/ +int rdssl_rkey_get_exp_mod(uint8 * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus, + uint32 max_mod_len) +{ + RSAPUBKEY *desc = (RSAPUBKEY *)(rkey + sizeof(PUBLICKEYSTRUC)); + if (!rkey || !exponent || !max_exp_len || !modulus || !max_mod_len) + { + error("rdssl_rkey_get_exp_mod %p %p %ld %p %ld\n", rkey, exponent, max_exp_len, modulus, max_mod_len); + return -1; + } + memcpy (exponent, &desc->pubexp, max_exp_len); + memcpy (modulus, rkey + sizeof(PUBLICKEYSTRUC) + sizeof(RSAPUBKEY), max_mod_len); + return 0; +} + +/*****************************************************************************/ +void rdssl_rkey_free(uint8 * rkey) +{ + if (!rkey) + { + error("rdssl_rkey_free rkey is null\n"); + return; + } + g_free(rkey); +}

1 0

[phater] 74557: [MSTSC] Fix build
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 17:03:20 2017 New Revision: 74557 URL: http://svn.reactos.org/svn/reactos?rev=74557&view=rev Log: [MSTSC] Fix build Modified: trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/secure.c Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] Tue May 16 17:03:20 2017 @@ -495,7 +495,7 @@ out_uint32_le(s, 1); /* Version */ out_uint32_le(s, g_reconnect_logonid); /* LogonId */ rdssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), - g_client_random, SEC_RANDOM_SIZE, security_verifier); + (char *)g_client_random, SEC_RANDOM_SIZE, (char *)security_verifier); out_uint8a(s, security_verifier, sizeof(security_verifier)); } else Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] Tue May 16 17:03:20 2017 @@ -54,10 +54,10 @@ rdssl_rc4_crypt(void * rc4_info, char * in_data, char * out_data, int len); int rdssl_mod_exp(char* out, int out_len, char* in, int in_len, - char* mod, int mod_len, char* exp, int exp_len); + char* mod, int mod_len, char* exp, int exp_len); int rdssl_sign_ok(char* e_data, int e_len, char* n_data, int n_len, - char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey); + char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey); extern char g_hostname[16]; extern int g_width; @@ -892,7 +892,7 @@ sec_recv(uint8 * rdpver) { uint16 sec_flags; - uint16 sec_flags_hi; + /* uint16 sec_flags_hi; */ uint16 channel; STREAM s; @@ -914,7 +914,7 @@ { /* TS_SECURITY_HEADER */ in_uint16_le(s, sec_flags); - in_uint16_le(s, sec_flags_hi); + in_uint8s(s, 2); /* sec_flags_hi */ if (g_encryption) {

1 0

[phater] 74556: [MSTSC] Bring MSTSC closer to latest rdesktop (1.83) CORE-13258
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 16:37:29 2017 New Revision: 74556 URL: http://svn.reactos.org/svn/reactos?rev=74556&view=rev Log: [MSTSC] Bring MSTSC closer to latest rdesktop (1.83) CORE-13258 Modified: trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/proto.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/uimain.c Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/constants.h [iso-8859-1] Tue May 16 16:37:29 2017 @@ -94,11 +94,23 @@ #define SEC_PADDING_SIZE 8 #define SEC_EXPONENT_SIZE 4 -#define SEC_CLIENT_RANDOM 0x0001 +/* TS_SECURITY_HEADER.flags */ +#define SEC_EXCHANGE_PKT 0x0001 +#define SEC_TRANSPORT_REQ 0x0002 +#define RDP_SEC_TRANSPORT_RSP 0x0004 #define SEC_ENCRYPT 0x0008 -#define SEC_LOGON_INFO 0x0040 -#define SEC_LICENCE_NEG 0x0080 -#define SEC_REDIRECT_ENCRYPT 0x0C00 +#define SEC_RESET_SEQNO 0x0010 +#define SEC_IGNORE_SEQNO 0x0020 +#define SEC_INFO_PKT 0x0040 +#define SEC_LICENSE_PKT 0x0080 +#define SEC_LICENSE_ENCRYPT_CS 0x0200 +#define SEC_LICENSE_ENCRYPT_SC 0x0200 +#define SEC_REDIRECTION_PKT 0x0400 +#define SEC_SECURE_CHECKSUM 0x0800 +#define SEC_AUTODETECT_REQ 0x1000 +#define SEC_AUTODETECT_RSP 0x2000 +#define SEC_HEARTBEAT 0x4000 +#define SEC_FLAGSHI_VALID 0x8000 #define SEC_TAG_SRV_INFO 0x0c01 #define SEC_TAG_SRV_CRYPT 0x0c02 @@ -131,12 +143,12 @@ #define LICENCE_SIGNATURE_SIZE 16 #define LICENCE_TAG_REQUEST 0x01 -#define LICENCE_TAG_PLATFORM_CHALLENGE 0x02 +#define LICENCE_TAG_PLATFORM_CHALLANGE 0x02 #define LICENCE_TAG_NEW_LICENCE 0x03 #define LICENCE_TAG_UPGRADE_LICENCE 0x04 #define LICENCE_TAG_LICENCE_INFO 0x12 #define LICENCE_TAG_NEW_LICENCE_REQUEST 0x13 -#define LICENCE_TAG_PLATFORM_CHALLENGE_RESPONSE 0x15 +#define LICENCE_TAG_PLATFORM_CHALLANGE_RESPONSE 0x15 #define LICENCE_TAG_ERROR_ALERT 0xff #define BB_CLIENT_USER_NAME_BLOB 0x000f @@ -323,19 +335,20 @@ #define RDP_INFO_AUTOLOGON 0x00000008 #define RDP_INFO_UNICODE 0x00000010 #define RDP_INFO_MAXIMIZESHELL 0x00000020 -#define RDP_INFO_COMPRESSION 0x00000080 /* mppc compression with 8kB history buffer */ +#define RDP_INFO_COMPRESSION 0x00000080 /* mppc compression with 8kB histroy buffer */ #define RDP_INFO_ENABLEWINDOWSKEY 0x00000100 #define RDP_INFO_COMPRESSION2 0x00000200 /* rdp5 mppc compression with 64kB history buffer */ #define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000 #define RDP_INFO_PASSWORD_IS_SC_PIN 0x00040000 -#define RDP5_DISABLE_NOTHING 0x00 -#define RDP5_NO_WALLPAPER 0x01 -#define RDP5_NO_FULLWINDOWDRAG 0x02 -#define RDP5_NO_MENUANIMATIONS 0x04 -#define RDP5_NO_THEMING 0x08 -#define RDP5_NO_CURSOR_SHADOW 0x20 -#define RDP5_NO_CURSORSETTINGS 0x40 /* disables cursor blinking */ +/* TS_EXTENDED_INFO_PACKET.performanceFlags */ +#define PERF_DISABLE_WALLPAPER 0x01 +#define PERF_DISABLE_FULLWINDOWDRAG 0x02 +#define PERF_DISABLE_MENUANIMATIONS 0x04 +#define PERF_DISABLE_THEMING 0x08 +#define PERF_DISABLE_CURSOR_SHADOW 0x20 +#define PERF_DISABLE_CURSORSETTINGS 0x40 /* disables cursor blinking */ +#define PERF_ENABLE_FONT_SMOOTHING 0x80 /* compression types */ #define RDP_MPPC_BIG 0x01 @@ -481,6 +494,48 @@ #define FILE_DELETE_ON_CLOSE 0x00001000 #define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 +#define CAP_GENERAL_TYPE 0x0001 +#define CAP_PRINTER_TYPE 0x0002 +#define CAP_PORT_TYPE 0x0003 +#define CAP_DRIVE_TYPE 0x0004 +#define CAP_SMARTCARD_TYPE 0x0005 + +#define GENERAL_CAPABILITY_VERSION_01 0x00000001 +#define GENERAL_CAPABILITY_VERSION_02 0x00000002 +#define PRINT_CAPABILITY_VERSION_01 0x00000001 +#define PORT_CAPABILITY_VERSION_01 0x00000001 +#define DRIVE_CAPABILITY_VERSION_01 0x00000001 +#define DRIVE_CAPABILITY_VERSION_02 0x00000002 +#define SMARTCARD_CAPABILITY_VERSION_01 0x00000001 + +#define RDPDR_IRP_MJ_CREATE 0x00000001 +#define RDPDR_IRP_MJ_CLEANUP 0x00000002 +#define RDPDR_IRP_MJ_CLOSE 0x00000004 +#define RDPDR_IRP_MJ_READ 0x00000008 +#define RDPDR_IRP_MJ_WRITE 0x00000010 +#define RDPDR_IRP_MJ_FLUSH_BUFFERS 0x00000020 +#define RDPDR_IRP_MJ_SHUTDOWN 0x00000040 +#define RDPDR_IRP_MJ_DEVICE_CONTROL 0x00000080 +#define RDPDR_IRP_MJ_QUERY_VOLUME_INFORMATION 0x00000100 +#define RDPDR_IRP_MJ_SET_VOLUME_INFORMATION 0x00000200 +#define RDPDR_IRP_MJ_QUERY_INFORMATION 0x00000400 +#define RDPDR_IRP_MJ_SET_INFORMATION 0x00000800 +#define RDPDR_IRP_MJ_DIRECTORY_CONTROL 0x00001000 +#define RDPDR_IRP_MJ_LOCK_CONTROL 0x00002000 +#define RDPDR_IRP_MJ_QUERY_SECURITY 0x00004000 +#define RDPDR_IRP_MJ_SET_SECURITY 0x00008000 +#define ALL_RDPDR_IRP_MJ 0x0000FFFF + +#define RDPDR_PRINTER_ANNOUNCE_FLAG_ASCII 0x00000001 +#define RDPDR_PRINTER_ANNOUNCE_FLAG_DEFAULTPRINTER 0x00000002 +#define RDPDR_PRINTER_ANNOUNCE_FLAG_NETWORKPRINTER 0x00000004 +#define RDPDR_PRINTER_ANNOUNCE_FLAG_TSPRINTER 0x00000008 +#define RDPDR_PRINTER_ANNOUNCE_FLAG_XPSFORMAT 0x00000010 + +#define RDPDR_DEVICE_REMOVE_PDUS 0x00000001 +#define RDPDR_CLIENT_DISPLAY_NAME_PDU 0x00000002 +#define RDPDR_USER_LOGGEDON_PDU 0x00000004 + /* RDP5 disconnect PDU */ #define exDiscReasonNoInfo 0x0000 #define exDiscReasonAPIInitiatedDisconnect 0x0001 @@ -531,15 +586,20 @@ /* redirect flags, from [MS-RDPBCGR] 2.2.13.1 */ enum RDP_PDU_REDIRECT_FLAGS { - PDU_REDIRECT_HAS_IP = 0x1, - PDU_REDIRECT_HAS_LOAD_BALANCE_INFO = 0x2, - PDU_REDIRECT_HAS_USERNAME = 0x4, - PDU_REDIRECT_HAS_DOMAIN = 0x8, - PDU_REDIRECT_HAS_PASSWORD = 0x10, - PDU_REDIRECT_DONT_STORE_USERNAME = 0x20, - PDU_REDIRECT_USE_SMARTCARD = 0x40, - PDU_REDIRECT_INFORMATIONAL = 0x80, - PDU_REDIRECT_HAS_TARGET_FQDN = 0x100, - PDU_REDIRECT_HAS_TARGET_NETBIOS = 0x200, - PDU_REDIRECT_HAS_TARGET_IP_ARRAY = 0x800 -}; + LB_TARGET_NET_ADDRESS = 0x1, + LB_LOAD_BALANCE_INFO = 0x2, + LB_USERNAME = 0x4, + LB_DOMAIN = 0x8, + LB_PASSWORD = 0x10, + LB_DONTSTOREUSERNAME = 0x20, + LB_SMARTCARD_LOGON = 0x40, + LB_NOREDIRECT = 0x80, + LB_TARGET_FQDN = 0x100, + LB_TARGET_NETBIOS = 0x200, + LB_TARGET_NET_ADDRESSES = 0x800, + LB_CLIENT_TSV_URL = 0x1000, + LB_SERVER_TSV_CAPABLE = 0x2000, + LB_PASSWORD_IS_PK_ENCRYPTED = 0x4000, + LB_REDIRECTION_GUID = 0x8000, + LB_TARGET_CERTIFICATE = 0x10000 +}; Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… ============================================================================== --- trunk/reactos/base/applications/mstsc/licence.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/licence.c [iso-8859-1] Tue May 16 16:37:29 2017 @@ -23,16 +23,16 @@ #include "precomp.h" void * -ssl_rc4_info_create(void); +rdssl_rc4_info_create(void); void -ssl_rc4_info_delete(void * rc4_info); +rdssl_rc4_info_delete(void * rc4_info); void -ssl_rc4_set_key(void * rc4_info, char * key, int len); +rdssl_rc4_set_key(void * rc4_info, char * key, int len); void -ssl_rc4_crypt(void * rc4_info, char * in_data, char * out_data, int len); +rdssl_rc4_crypt(void * rc4_info, char * in_data, char * out_data, int len); int -ssl_mod_exp(char* out, int out_len, char* in, int in_len, - char* mod, int mod_len, char* exp, int exp_len); +rdssl_mod_exp(char* out, int out_len, char* in, int in_len, + char* mod, int mod_len, char* exp, int exp_len); extern char g_username[256]; extern char g_hostname[256]; @@ -74,7 +74,7 @@ licence_info(uint8 * client_random, uint8 * rsa_data, uint8 * licence_data, int licence_size, uint8 * hwid, uint8 * signature) { - uint32 sec_flags = SEC_LICENCE_NEG; + uint32 sec_flags = SEC_LICENSE_PKT; uint16 length = 24 + SEC_RANDOM_SIZE + SEC_MODULUS_SIZE + SEC_PADDING_SIZE + licence_size + LICENCE_HWID_SIZE + LICENCE_SIGNATURE_SIZE; @@ -114,7 +114,7 @@ static void licence_send_new_licence_request(uint8 * client_random, uint8 * rsa_data, char *user, char *host) { - uint32 sec_flags = SEC_LICENCE_NEG; + uint32 sec_flags = SEC_LICENSE_PKT; uint16 userlen = strlen(user) + 1; uint16 hostlen = strlen(host) + 1; uint16 length = @@ -179,10 +179,10 @@ sec_sign(signature, 16, g_licence_sign_key, 16, hwid, sizeof(hwid)); /* Now encrypt the HWID */ - crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); - ssl_rc4_crypt(crypt_key, (char *)hwid, (char *)hwid, sizeof(hwid)); - ssl_rc4_info_delete(crypt_key); + crypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + rdssl_rc4_crypt(crypt_key, (char *)hwid, (char *)hwid, sizeof(hwid)); + rdssl_rc4_info_delete(crypt_key); #if WITH_DEBUG DEBUG(("Sending licensing PDU (message type 0x%02x)\n", LICENCE_TAG_LICENCE_INFO)); @@ -203,13 +203,13 @@ static void licence_send_platform_challenge_response(uint8 * token, uint8 * crypt_hwid, uint8 * signature) { - uint32 sec_flags = SEC_LICENCE_NEG; + uint32 sec_flags = SEC_LICENSE_PKT; uint16 length = 58; STREAM s; s = sec_init(sec_flags, length + 2); - out_uint8(s, LICENCE_TAG_PLATFORM_CHALLENGE_RESPONSE); + out_uint8(s, LICENCE_TAG_PLATFORM_CHALLANGE_RESPONSE); out_uint8(s, ((g_rdp_version >= RDP_V5) ? 3 : 2)); /* version */ out_uint16_le(s, length); @@ -264,10 +264,10 @@ memcpy(out_token, in_token, LICENCE_TOKEN_SIZE); /* Decrypt the token. It should read TEST in Unicode. */ - crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); - ssl_rc4_crypt(crypt_key, (char *)in_token, (char *)decrypt_token, LICENCE_TOKEN_SIZE); - ssl_rc4_info_delete(crypt_key); + crypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + rdssl_rc4_crypt(crypt_key, (char *)in_token, (char *)decrypt_token, LICENCE_TOKEN_SIZE); + rdssl_rc4_info_delete(crypt_key); /* Generate a signature for a buffer of token and HWID */ licence_generate_hwid(hwid); @@ -276,10 +276,9 @@ sec_sign(out_sig, 16, g_licence_sign_key, 16, sealed_buffer, sizeof(sealed_buffer)); /* Now encrypt the HWID */ - crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); - ssl_rc4_crypt(crypt_key, (char *)hwid, (char *)crypt_hwid, LICENCE_HWID_SIZE); - ssl_rc4_info_delete(crypt_key); + crypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + rdssl_rc4_crypt(crypt_key, (char *)hwid, (char *)crypt_hwid, LICENCE_HWID_SIZE); licence_send_platform_challenge_response(out_token, crypt_hwid, out_sig); } @@ -297,10 +296,10 @@ if (!s_check_rem(s, length)) return; - crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); - ssl_rc4_crypt(crypt_key, (char *)s->p, (char *)s->p, length); - ssl_rc4_info_delete(crypt_key); + crypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + rdssl_rc4_crypt(crypt_key, (char *)s->p, (char *)s->p, length); + rdssl_rc4_info_delete(crypt_key); /* Parse NEW_LICENSE_INFO block */ in_uint8s(s, 4); // skip dwVersion @@ -393,7 +392,7 @@ licence_process_request(s); break; - case LICENCE_TAG_PLATFORM_CHALLENGE: + case LICENCE_TAG_PLATFORM_CHALLANGE: licence_process_platform_challenge(s); break; Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] Tue May 16 16:37:29 2017 @@ -13,26 +13,13 @@ #include <wincon.h> #include <shlobj.h> #include <stdio.h> +#include <wincrypt.h> #include "rdesktop.h" #include "resource.h" #ifndef __TODO_MSTSC_H #define __TODO_MSTSC_H - -#define RDP_INFO_MOUSE 0x00000001 -#define RDP_INFO_DISABLECTRLALTDEL 0x00000002 -#define RDP_INFO_AUTOLOGON 0x00000008 -#define RDP_INFO_UNICODE 0x00000010 -#define RDP_INFO_MAXIMIZESHELL 0x00000020 -#define RDP_INFO_COMPRESSION 0x00000080 /* mppc compression with 8kB history buffer */ -#define RDP_INFO_ENABLEWINDOWSKEY 0x00000100 -#define RDP_INFO_COMPRESSION2 0x00000200 /* rdp5 mppc compression with 64kB history buffer */ -#define RDP_INFO_REMOTE_CONSOLE_AUDIO 0x00002000 -#define RDP_INFO_PASSWORD_IS_SC_PIN 0x00040000 - -#define RDP5_DISABLE_NOTHING 0x00 -#define RDP5_NO_WALLPAPER 0x01 #define RDP_LOGON_NORMAL (RDP_INFO_MOUSE | RDP_INFO_DISABLECTRLALTDEL | RDP_INFO_UNICODE | RDP_INFO_MAXIMIZESHELL) Modified: trunk/reactos/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/proto.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/proto.h [iso-8859-1] Tue May 16 16:37:29 2017 @@ -24,12 +24,6 @@ extern "C" { #endif /* *INDENT-ON* */ -/* utils.c */ -char *utils_string_escape(const char *str); -char *utils_string_unescape(const char *str); -int utils_locale_to_utf8(const char *src, size_t is, char *dest, size_t os); -int utils_mkdir_safe(const char *path, int mask); -int utils_mkdir_p(const char *path, int mask); /* bitmap.c */ RD_BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp); /* cache.c */ Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] Tue May 16 16:37:29 2017 @@ -70,7 +70,7 @@ extern RD_BOOL g_has_reconnect_random; extern uint8 g_client_random[SEC_RANDOM_SIZE]; -void ssl_hmac_md5(char* key, int keylen, char* data, int len, char* output); +void rdssl_hmac_md5(char* key, int keylen, char* data, int len, char* output); #if WITH_DEBUG static uint32 g_packetno; @@ -139,7 +139,7 @@ static STREAM rdp_init_data(int maxlen) { - STREAM s = NULL; + STREAM s; s = sec_init(g_encryption ? SEC_ENCRYPT : 0, maxlen + 18); s_push_layer(s, rdp_hdr, 18); @@ -169,6 +169,18 @@ out_uint16(s, 0); /* compress_len */ sec_send(s, g_encryption ? SEC_ENCRYPT : 0); +} + +/* Output a string in Unicode with mandatory null termination. If + string is NULL or len is 0, write an unicode null termination to + stream. */ +void +rdp_out_unistr_mandatory_null(STREAM s, char *string, int len) +{ + if (string && len > 0) + rdp_out_unistr(s, string, len); + else + out_uint16_le(s, 0); } /* Output a string in Unicode */ @@ -344,8 +356,8 @@ int len_dll = 2 * strlen("C:\\") + 2; int packetlen = 0; - uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; - STREAM s = NULL; + uint32 sec_flags = g_encryption ? (SEC_INFO_PKT | SEC_ENCRYPT) : SEC_INFO_PKT; + STREAM s; time_t t = time(NULL); time_t tzone; uint8 security_verifier[16]; @@ -364,11 +376,12 @@ out_uint16_le(s, len_password); out_uint16_le(s, len_program); out_uint16_le(s, len_directory); - rdp_out_unistr(s, domain, len_domain); - rdp_out_unistr(s, user, len_user); - rdp_out_unistr(s, password, len_password); - rdp_out_unistr(s, program, len_program); - rdp_out_unistr(s, directory, len_directory); + + rdp_out_unistr_mandatory_null(s, domain, len_domain); + rdp_out_unistr_mandatory_null(s, user, len_user); + rdp_out_unistr_mandatory_null(s, password, len_password); + rdp_out_unistr_mandatory_null(s, program, len_program); + rdp_out_unistr_mandatory_null(s, directory, len_directory); } else { @@ -376,6 +389,7 @@ if (g_redirect == True && g_redirect_cookie_len > 0) { + flags |= RDP_INFO_AUTOLOGON; len_password = g_redirect_cookie_len; len_password -= 2; /* substract 2 bytes which is added below */ } @@ -427,44 +441,26 @@ out_uint16_le(s, len_program); out_uint16_le(s, len_directory); - if (0 < len_domain) - rdp_out_unistr(s, domain, len_domain); + rdp_out_unistr_mandatory_null(s, domain, len_domain); + rdp_out_unistr_mandatory_null(s, user, len_user); + + if (g_redirect == True && 0 < g_redirect_cookie_len) + { + out_uint8p(s, g_redirect_cookie, g_redirect_cookie_len); + } else - out_uint16_le(s, 0); /* mandatory 2 bytes null terminator */ - - if (0 < len_user) - rdp_out_unistr(s, user, len_user); - else - out_uint16_le(s, 0); /* mandatory 2 bytes null terminator */ - - if (0 < len_password) - { - if (g_redirect == True && 0 < g_redirect_cookie_len) - { - out_uint8p(s, g_redirect_cookie, g_redirect_cookie_len); - } - else - { - rdp_out_unistr(s, password, len_password); - } - } - else - out_uint16_le(s, 0); /* mandatory 2 bytes null terminator */ - - if (0 < len_program) - rdp_out_unistr(s, program, len_program); - else - out_uint16_le(s, 0); /* mandatory 2 bytes null terminator */ - - if (0 < len_directory) - rdp_out_unistr(s, directory, len_directory); - else - out_uint16_le(s, 0); /* mandatory 2 bytes null terminator */ + { + rdp_out_unistr_mandatory_null(s, password, len_password); + } + + + rdp_out_unistr_mandatory_null(s, program, len_program); + rdp_out_unistr_mandatory_null(s, directory, len_directory); /* TS_EXTENDED_INFO_PACKET */ out_uint16_le(s, 2); /* clientAddressFamily = AF_INET */ - out_uint16_le(s, len_ip); /* cbClientAddress, Length of client ip */ - rdp_out_unistr(s, ipaddr, len_ip - 2); /* clientAddress */ + out_uint16_le(s, len_ip); /* cbClientAddress */ + rdp_out_unistr_mandatory_null(s, ipaddr, len_ip - 2); /* clientAddress */ out_uint16_le(s, len_dll); /* cbClientDir */ rdp_out_unistr(s, "C:\\", len_dll - 2); /* clientDir */ @@ -498,8 +494,8 @@ out_uint32_le(s, 28); /* cbLen */ out_uint32_le(s, 1); /* Version */ out_uint32_le(s, g_reconnect_logonid); /* LogonId */ - ssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), - (char *)g_client_random, SEC_RANDOM_SIZE, (char *)security_verifier); + rdssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), + g_client_random, SEC_RANDOM_SIZE, security_verifier); out_uint8a(s, security_verifier, sizeof(security_verifier)); } else @@ -1547,7 +1543,7 @@ /* read connection flags */ in_uint32_le(s, g_redirect_flags); - if (g_redirect_flags & PDU_REDIRECT_HAS_IP) + if (g_redirect_flags & LB_TARGET_NET_ADDRESS) { /* read length of ip string */ in_uint32_le(s, len); @@ -1556,7 +1552,7 @@ rdp_in_unistr(s, len, &g_redirect_server, &g_redirect_server_len); } - if (g_redirect_flags & PDU_REDIRECT_HAS_LOAD_BALANCE_INFO) + if (g_redirect_flags & LB_LOAD_BALANCE_INFO) { /* read length of load balance info blob */ in_uint32_le(s, g_redirect_lb_info_len); @@ -1571,7 +1567,7 @@ in_uint8p(s, g_redirect_lb_info, g_redirect_lb_info_len); } - if (g_redirect_flags & PDU_REDIRECT_HAS_USERNAME) + if (g_redirect_flags & LB_USERNAME) { /* read length of username string */ in_uint32_le(s, len); @@ -1580,7 +1576,7 @@ rdp_in_unistr(s, len, &g_redirect_username, &g_redirect_username_len); } - if (g_redirect_flags & PDU_REDIRECT_HAS_DOMAIN) + if (g_redirect_flags & LB_DOMAIN) { /* read length of domain string */ in_uint32_le(s, len); @@ -1589,7 +1585,7 @@ rdp_in_unistr(s, len, &g_redirect_domain, &g_redirect_domain_len); } - if (g_redirect_flags & PDU_REDIRECT_HAS_PASSWORD) + if (g_redirect_flags & LB_PASSWORD) { /* the information in this blob is either a password or a cookie that should be passed though as blob and not parsed as a unicode string */ @@ -1607,24 +1603,24 @@ in_uint8p(s, g_redirect_cookie, g_redirect_cookie_len); } - if (g_redirect_flags & PDU_REDIRECT_DONT_STORE_USERNAME) - { - warning("PDU_REDIRECT_DONT_STORE_USERNAME set\n"); - } - - if (g_redirect_flags & PDU_REDIRECT_USE_SMARTCARD) - { - warning("PDU_REDIRECT_USE_SMARTCARD set\n"); - } - - if (g_redirect_flags & PDU_REDIRECT_INFORMATIONAL) + if (g_redirect_flags & LB_DONTSTOREUSERNAME) + { + warning("LB_DONTSTOREUSERNAME set\n"); + } + + if (g_redirect_flags & LB_SMARTCARD_LOGON) + { + warning("LB_SMARTCARD_LOGON set\n"); + } + + if (g_redirect_flags & LB_NOREDIRECT) { /* By spec this is only for information and doesn't mean that an actual redirect should be performed. How it should be used is not mentioned. */ g_redirect = False; } - if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_FQDN) + if (g_redirect_flags & LB_TARGET_FQDN) { in_uint32_le(s, len); @@ -1639,14 +1635,39 @@ rdp_in_unistr(s, len, &g_redirect_server, &g_redirect_server_len); } - if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_NETBIOS) - { - warning("PDU_REDIRECT_HAS_TARGET_NETBIOS set\n"); - } - - if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_IP_ARRAY) - { - warning("PDU_REDIRECT_HAS_TARGET_IP_ARRAY set\n"); + if (g_redirect_flags & LB_TARGET_NETBIOS) + { + warning("LB_TARGET_NETBIOS set\n"); + } + + if (g_redirect_flags & LB_TARGET_NET_ADDRESSES) + { + warning("LB_TARGET_NET_ADDRESSES set\n"); + } + + if (g_redirect_flags & LB_CLIENT_TSV_URL) + { + warning("LB_CLIENT_TSV_URL set\n"); + } + + if (g_redirect_flags & LB_SERVER_TSV_CAPABLE) + { + warning("LB_SERVER_TSV_CAPABLE set\n"); + } + + if (g_redirect_flags & LB_PASSWORD_IS_PK_ENCRYPTED) + { + warning("LB_PASSWORD_IS_PK_ENCRYPTED set\n"); + } + + if (g_redirect_flags & LB_REDIRECTION_GUID) + { + warning("LB_REDIRECTION_GUID set\n"); + } + + if (g_redirect_flags & LB_TARGET_CERTIFICATE) + { + warning("LB_TARGET_CERTIFICATE set\n"); } return True; Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/secure.c [iso-8859-1] Tue May 16 16:37:29 2017 @@ -21,43 +21,43 @@ #include "precomp.h" void * -ssl_sha1_info_create(void); -void -ssl_sha1_info_delete(void * sha1_info); -void -ssl_sha1_clear(void * sha1_info); -void -ssl_sha1_transform(void * sha1_info, char * data, int len); -void -ssl_sha1_complete(void * sha1_info, char * data); +rdssl_sha1_info_create(void); +void +rdssl_sha1_info_delete(void * sha1_info); +void +rdssl_sha1_clear(void * sha1_info); +void +rdssl_sha1_transform(void * sha1_info, char * data, int len); +void +rdssl_sha1_complete(void * sha1_info, char * data); void * -ssl_md5_info_create(void); -void -ssl_md5_info_delete(void * md5_info); +rdssl_md5_info_create(void); +void +rdssl_md5_info_delete(void * md5_info); void * -ssl_md5_info_create(void); -void -ssl_md5_info_delete(void * md5_info); -void -ssl_md5_clear(void * md5_info); -void -ssl_md5_transform(void * md5_info, char * data, int len); -void -ssl_md5_complete(void * md5_info, char * data); +rdssl_md5_info_create(void); +void +rdssl_md5_info_delete(void * md5_info); +void +rdssl_md5_clear(void * md5_info); +void +rdssl_md5_transform(void * md5_info, char * data, int len); +void +rdssl_md5_complete(void * md5_info, char * data); void * -ssl_rc4_info_create(void); -void -ssl_rc4_info_delete(void * rc4_info); -void -ssl_rc4_set_key(void * rc4_info, char * key, int len); -void -ssl_rc4_crypt(void * rc4_info, char * in_data, char * out_data, int len); +rdssl_rc4_info_create(void); +void +rdssl_rc4_info_delete(void * rc4_info); +void +rdssl_rc4_set_key(void * rc4_info, char * key, int len); +void +rdssl_rc4_crypt(void * rc4_info, char * in_data, char * out_data, int len); int -ssl_mod_exp(char* out, int out_len, char* in, int in_len, +rdssl_mod_exp(char* out, int out_len, char* in, int in_len, char* mod, int mod_len, char* exp, int exp_len); -//int -//ssl_sig_ok(char * exp, int exp_size, char * mod, int mod_len, -// char * sig, int sig_len); +int +rdssl_sign_ok(char* e_data, int e_len, char* n_data, int n_len, + char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey); extern char g_hostname[16]; extern int g_width; @@ -96,37 +96,6 @@ static int g_sec_decrypt_use_count = 0; #define SEC_MODULUS_SIZE 64 - -static uint8 g_ppk_n[72] = -{ - 0x3D, 0x3A, 0x5E, 0xBD, 0x72, 0x43, 0x3E, 0xC9, - 0x4D, 0xBB, 0xC1, 0x1E, 0x4A, 0xBA, 0x5F, 0xCB, - 0x3E, 0x88, 0x20, 0x87, 0xEF, 0xF5, 0xC1, 0xE2, - 0xD7, 0xB7, 0x6B, 0x9A, 0xF2, 0x52, 0x45, 0x95, - 0xCE, 0x63, 0x65, 0x6B, 0x58, 0x3A, 0xFE, 0xEF, - 0x7C, 0xE7, 0xBF, 0xFE, 0x3D, 0xF6, 0x5C, 0x7D, - 0x6C, 0x5E, 0x06, 0x09, 0x1A, 0xF5, 0x61, 0xBB, - 0x20, 0x93, 0x09, 0x5F, 0x05, 0x6D, 0xEA, 0x87, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; - -static uint8 g_ppk_d[108] = -{ - 0x87, 0xA7, 0x19, 0x32, 0xDA, 0x11, 0x87, 0x55, - 0x58, 0x00, 0x16, 0x16, 0x25, 0x65, 0x68, 0xF8, - 0x24, 0x3E, 0xE6, 0xFA, 0xE9, 0x67, 0x49, 0x94, - 0xCF, 0x92, 0xCC, 0x33, 0x99, 0xE8, 0x08, 0x60, - 0x17, 0x9A, 0x12, 0x9F, 0x24, 0xDD, 0xB1, 0x24, - 0x99, 0xC7, 0x3A, 0xB8, 0x0A, 0x7B, 0x0D, 0xDD, - 0x35, 0x07, 0x79, 0x17, 0x0B, 0x51, 0x9B, 0xB3, - 0xC7, 0x10, 0x01, 0x13, 0xE7, 0x3F, 0xF3, 0x5F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 -}; static uint8 g_testkey[176] = { @@ -181,20 +150,20 @@ for (i = 0; i < 3; i++) { memset(pad, salt + i, i + 1); - sha = ssl_sha1_info_create(); - ssl_sha1_clear(sha); - ssl_sha1_transform(sha, (char *)pad, i + 1); - ssl_sha1_transform(sha, (char *)in, 48); - ssl_sha1_transform(sha, (char *)salt1, 32); - ssl_sha1_transform(sha, (char *)salt2, 32); - ssl_sha1_complete(sha, (char *)shasig); - ssl_sha1_info_delete(sha); - md5 = ssl_md5_info_create(); - ssl_md5_clear(md5); - ssl_md5_transform(md5, (char *)in, 48); - ssl_md5_transform(md5, (char *)shasig, 20); - ssl_md5_complete(md5, (char *)out + i * 16); - ssl_md5_info_delete(md5); + sha = rdssl_sha1_info_create(); + rdssl_sha1_clear(sha); + rdssl_sha1_transform(sha, (char *)pad, i + 1); + rdssl_sha1_transform(sha, (char *)in, 48); + rdssl_sha1_transform(sha, (char *)salt1, 32); + rdssl_sha1_transform(sha, (char *)salt2, 32); + rdssl_sha1_complete(sha, (char *)shasig); + rdssl_sha1_info_delete(sha); + md5 = rdssl_md5_info_create(); + rdssl_md5_clear(md5); + rdssl_md5_transform(md5, (char *)in, 48); + rdssl_md5_transform(md5, (char *)shasig, 20); + rdssl_md5_complete(md5, (char *)out + i * 16); + rdssl_md5_info_delete(md5); } } @@ -206,13 +175,13 @@ { void * md5; - md5 = ssl_md5_info_create(); - ssl_md5_clear(md5); - ssl_md5_transform(md5, (char *)in, 16); - ssl_md5_transform(md5, (char *)salt1, 32); - ssl_md5_transform(md5, (char *)salt2, 32); - ssl_md5_complete(md5, (char *)out); - ssl_md5_info_delete(md5); + md5 = rdssl_md5_info_create(); + rdssl_md5_clear(md5); + rdssl_md5_transform(md5, (char *)in, 16); + rdssl_md5_transform(md5, (char *)salt1, 32); + rdssl_md5_transform(md5, (char *)salt2, 32); + rdssl_md5_complete(md5, (char *)out); + rdssl_md5_info_delete(md5); } /* @@ -222,12 +191,12 @@ sec_hash_sha1_16(uint8 * out, uint8 * in, uint8 * salt1) { void * sha; - sha = ssl_sha1_info_create(); - ssl_sha1_clear(sha); - ssl_sha1_transform(&sha, (char *)in, 16); - ssl_sha1_transform(&sha, (char *)salt1, 16); - ssl_sha1_complete(&sha, (char *)out); - ssl_sha1_info_delete(sha); + sha = rdssl_sha1_info_create(); + rdssl_sha1_clear(sha); + rdssl_sha1_transform(&sha, (char *)in, 16); + rdssl_sha1_transform(&sha, (char *)salt1, 16); + rdssl_sha1_complete(&sha, (char *)out); + rdssl_sha1_info_delete(sha); } /* create string from hash */ @@ -294,13 +263,13 @@ /* Initialise RC4 state arrays */ - ssl_rc4_info_delete(g_rc4_decrypt_key); - g_rc4_decrypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(g_rc4_decrypt_key, (char *)g_sec_decrypt_key, g_rc4_key_len); - - ssl_rc4_info_delete(g_rc4_encrypt_key); - g_rc4_encrypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(g_rc4_encrypt_key, (char *)g_sec_encrypt_key, g_rc4_key_len); + rdssl_rc4_info_delete(g_rc4_decrypt_key); + g_rc4_decrypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(g_rc4_decrypt_key, (char *)g_sec_decrypt_key, g_rc4_key_len); + + rdssl_rc4_info_delete(g_rc4_encrypt_key); + g_rc4_encrypt_key = rdssl_rc4_info_create(); + rdssl_rc4_set_key(g_rc4_encrypt_key, (char *)g_sec_encrypt_key, g_rc4_key_len); } static uint8 pad_54[40] = { @@ -339,22 +308,22 @@ buf_out_uint32(lenhdr, datalen); - sha = ssl_sha1_info_create(); - ssl_sha1_clear(sha); - ssl_sha1_transform(sha, (char *)session_key, keylen); - ssl_sha1_transform(sha, (char *)pad_54, 40); - ssl_sha1_transform(sha, (char *)lenhdr, 4); - ssl_sha1_transform(sha, (char *)data, datalen); - ssl_sha1_complete(sha, (char *)shasig); - ssl_sha1_info_delete(sha); - - md5 = ssl_md5_info_create(); - ssl_md5_clear(md5); - ssl_md5_transform(md5, (char *)session_key, keylen); - ssl_md5_transform(md5, (char *)pad_92, 48); - ssl_md5_transform(md5, (char *)shasig, 20); - ssl_md5_complete(md5, (char *)md5sig); - ssl_md5_info_delete(md5); + sha = rdssl_sha1_info_create(); + rdssl_sha1_clear(sha); + rdssl_sha1_transform(sha, (char *)session_key, keylen); + rdssl_sha1_transform(sha, (char *)pad_54, 40); + rdssl_sha1_transform(sha, (char *)lenhdr, 4); + rdssl_sha1_transform(sha, (char *)data, datalen); + rdssl_sha1_complete(sha, (char *)shasig); + rdssl_sha1_info_delete(sha); + + md5 = rdssl_md5_info_create(); + rdssl_md5_clear(md5); + rdssl_md5_transform(md5, (char *)session_key, keylen); + rdssl_md5_transform(md5, (char *)pad_92, 48); + rdssl_md5_transform(md5, (char *)shasig, 20); + rdssl_md5_complete(md5, (char *)md5sig); + rdssl_md5_info_delete(md5); memcpy(signature, md5sig, siglen); } @@ -368,27 +337,27 @@ void * md5; void * update; - sha = ssl_sha1_info_create(); - ssl_sha1_clear(sha); - ssl_sha1_transform(sha, (char *)update_key, g_rc4_key_len); - ssl_sha1_transform(sha, (char *)pad_54, 40); - ssl_sha1_transform(sha, (char *)key, g_rc4_key_len); - ssl_sha1_complete(sha, (char *)shasig); - ssl_sha1_info_delete(sha); - - md5 = ssl_md5_info_create(); - ssl_md5_clear(md5); - ssl_md5_transform(md5, (char *)update_key, g_rc4_key_len); - ssl_md5_transform(md5, (char *)pad_92, 48); - ssl_md5_transform(md5, (char *)shasig, 20); - ssl_md5_complete(md5, (char *)key); - ssl_md5_info_delete(md5); - - - update = ssl_rc4_info_create(); - ssl_rc4_set_key(update, (char *)key, g_rc4_key_len); - ssl_rc4_crypt(update, (char *)key, (char *)key, g_rc4_key_len); - ssl_rc4_info_delete(update); + sha = rdssl_sha1_info_create(); + rdssl_sha1_clear(sha); + rdssl_sha1_transform(sha, (char *)update_key, g_rc4_key_len); + rdssl_sha1_transform(sha, (char *)pad_54, 40); + rdssl_sha1_transform(sha, (char *)key, g_rc4_key_len); + rdssl_sha1_complete(sha, (char *)shasig); + rdssl_sha1_info_delete(sha); + + md5 = rdssl_md5_info_create(); + rdssl_md5_clear(md5); + rdssl_md5_transform(md5, (char *)update_key, g_rc4_key_len); + rdssl_md5_transform(md5, (char *)pad_92, 48); + rdssl_md5_transform(md5, (char *)shasig, 20); + rdssl_md5_complete(md5, (char *)key); + rdssl_md5_info_delete(md5); + + + update = rdssl_rc4_info_create(); + rdssl_rc4_set_key(update, (char *)key, g_rc4_key_len); + rdssl_rc4_crypt(update, (char *)key, (char *)key, g_rc4_key_len); + rdssl_rc4_info_delete(update); if (g_rc4_key_len == 8) sec_make_40bit(key); @@ -401,11 +370,11 @@ if (g_sec_encrypt_use_count == 4096) { sec_update(g_sec_encrypt_key, g_sec_encrypt_update_key); - ssl_rc4_set_key(g_rc4_encrypt_key, (char *)g_sec_encrypt_key, g_rc4_key_len); + rdssl_rc4_set_key(g_rc4_encrypt_key, (char *)g_sec_encrypt_key, g_rc4_key_len); g_sec_encrypt_use_count = 0; } - ssl_rc4_crypt(g_rc4_encrypt_key, (char *)data, (char *)data, length); + rdssl_rc4_crypt(g_rc4_encrypt_key, (char *)data, (char *)data, length); g_sec_encrypt_use_count++; } @@ -416,11 +385,11 @@ if (g_sec_decrypt_use_count == 4096) { sec_update(g_sec_decrypt_key, g_sec_decrypt_update_key); - ssl_rc4_set_key(g_rc4_decrypt_key, (char *)g_sec_decrypt_key, g_rc4_key_len); + rdssl_rc4_set_key(g_rc4_decrypt_key, (char *)g_sec_decrypt_key, g_rc4_key_len); g_sec_decrypt_use_count = 0; } - ssl_rc4_crypt(g_rc4_decrypt_key,(char *)data, (char *)data, length); + rdssl_rc4_crypt(g_rc4_decrypt_key,(char *)data, (char *)data, length); g_sec_decrypt_use_count++; } @@ -429,48 +398,7 @@ sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, uint8 * exponent) { - ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); -} - -static int -sec_sign_ok(char* e_data, int e_len, char* n_data, int n_len, - char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey) -{ - char* key; - char* md5_final; - void* md5; - - if ((e_len != 4) || (n_len != 64) || (sign_len != 64) || (sign_len2 != 64)) - { - return 1; - } - key = (char*)xmalloc(176); - md5_final = (char*)xmalloc(64); - md5 = ssl_md5_info_create(); - // copy the test key - memcpy(key, testkey, 176); - // replace e and n - memcpy(key + 32, e_data, 4); - memcpy(key + 36, n_data, 64); - ssl_md5_clear(md5); - // the first 108 bytes - ssl_md5_transform(md5, key, 108); - // set the whole thing with 0xff - memset(md5_final, 0xff, 64); - // digest 16 bytes - ssl_md5_complete(md5, md5_final); - // set non 0xff array items - md5_final[16] = 0; - md5_final[62] = 1; - md5_final[63] = 0; - // encrypt - ssl_mod_exp(sign_data, 64, md5_final, 64, (char*)g_ppk_n, 64, - (char*)g_ppk_d, 64); - // cleanup - ssl_md5_info_delete(md5); - xfree(key); - xfree(md5_final); - return memcmp(sign_data, sign_data2, sign_len2); + rdssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); } /* Initialise secure transport packet */ @@ -539,7 +467,7 @@ sec_establish_key(void) { uint32 length = g_server_public_key_len + SEC_PADDING_SIZE; - uint32 flags = SEC_CLIENT_RANDOM; + uint32 flags = SEC_EXCHANGE_PKT; STREAM s; s = sec_init(flags, length + 4); @@ -698,8 +626,8 @@ memset(signature, 0, sizeof(signature)); sig_len = len - 8; in_uint8a(s, signature, sig_len); - if(sec_sign_ok((char *)exponent, SEC_EXPONENT_SIZE, (char *)modulus, g_server_public_key_len, - (char *)signature_, SEC_MODULUS_SIZE, (char *)signature, sig_len, (char *)g_testkey)) + if(rdssl_sign_ok((char *)exponent, SEC_EXPONENT_SIZE, (char *)modulus, g_server_public_key_len, + (char *)signature_, SEC_MODULUS_SIZE, (char *)signature, sig_len, (char *)g_testkey)) { DEBUG_RDP5(("key signature doesn't match test key\n")); } @@ -963,7 +891,8 @@ STREAM sec_recv(uint8 * rdpver) { - uint32 sec_flags; + uint16 sec_flags; + uint16 sec_flags_hi; uint16 channel; STREAM s; @@ -983,7 +912,9 @@ } if (g_encryption || (!g_licence_issued && !g_licence_error_result)) { - in_uint32_le(s, sec_flags); + /* TS_SECURITY_HEADER */ + in_uint16_le(s, sec_flags); + in_uint16_le(s, sec_flags_hi); if (g_encryption) { @@ -993,13 +924,13 @@ sec_decrypt(s->p, s->end - s->p); } - if (sec_flags & SEC_LICENCE_NEG) + if (sec_flags & SEC_LICENSE_PKT) { licence_process(s); continue; } - if (sec_flags & 0x0400) /* SEC_REDIRECT_ENCRYPT */ + if (sec_flags & SEC_REDIRECTION_PKT) /* SEC_REDIRECT_ENCRYPT */ { uint8 swapbyte; @@ -1035,8 +966,8 @@ } else { - if ((sec_flags & 0xffff) == SEC_LICENCE_NEG) - { + if (sec_flags & SEC_LICENSE_PKT) + { licence_process(s); continue; } Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c [iso-8859-1] Tue May 16 16:37:29 2017 @@ -59,21 +59,21 @@ /*****************************************************************************/ void* APP_CC -ssl_rc4_info_create(void) +rdssl_rc4_info_create(void) { return g_malloc(sizeof(struct rc4_state), 1); } /*****************************************************************************/ void APP_CC -ssl_rc4_info_delete(void* rc4_info) +rdssl_rc4_info_delete(void* rc4_info) { g_free(rc4_info); } /*****************************************************************************/ void APP_CC -ssl_rc4_set_key(void* rc4_info, char* key, int len) +rdssl_rc4_set_key(void* rc4_info, char* key, int len) { int i; int j; @@ -108,7 +108,7 @@ /*****************************************************************************/ void APP_CC -ssl_rc4_crypt(void* rc4_info, char* in_data, char* out_data, int len) +rdssl_rc4_crypt(void* rc4_info, char* in_data, char* out_data, int len) { int i; int x; @@ -152,21 +152,21 @@ /*****************************************************************************/ void* APP_CC -ssl_sha1_info_create(void) +rdssl_sha1_info_create(void) { return g_malloc(sizeof(struct sha1_context), 1); } /*****************************************************************************/ void APP_CC -ssl_sha1_info_delete(void* sha1_info) +rdssl_sha1_info_delete(void* sha1_info) { g_free(sha1_info); } /*****************************************************************************/ void APP_CC -ssl_sha1_clear(void* sha1_info) +rdssl_sha1_clear(void* sha1_info) { struct sha1_context* ctx; @@ -370,7 +370,7 @@ /*****************************************************************************/ void APP_CC -ssl_sha1_transform(void* sha1_info, char* data, int len) +rdssl_sha1_transform(void* sha1_info, char* data, int len) { int left; int fill; @@ -419,7 +419,7 @@ /*****************************************************************************/ void APP_CC -ssl_sha1_complete(void* sha1_info, char* data) +rdssl_sha1_complete(void* sha1_info, char* data) { int last; int padn; @@ -435,8 +435,8 @@ PUT_UINT32(low, msglen, 4); last = ctx->total[0] & 0x3F; padn = (last < 56) ? (56 - last) : (120 - last); - ssl_sha1_transform(ctx, (char *)sha1_padding, padn); - ssl_sha1_transform(ctx, msglen, 8); + rdssl_sha1_transform(ctx, (char *)sha1_padding, padn); + rdssl_sha1_transform(ctx, msglen, 8); PUT_UINT32(ctx->state[0], data, 0); PUT_UINT32(ctx->state[1], data, 4); PUT_UINT32(ctx->state[2], data, 8); @@ -461,21 +461,21 @@ /*****************************************************************************/ void* APP_CC -ssl_md5_info_create(void) +rdssl_md5_info_create(void) { return g_malloc(sizeof(struct md5_context), 1); } /*****************************************************************************/ void APP_CC -ssl_md5_info_delete(void* md5_info) +rdssl_md5_info_delete(void* md5_info) { g_free(md5_info); } /*****************************************************************************/ void APP_CC -ssl_md5_clear(void* md5_info) +rdssl_md5_clear(void* md5_info) { struct md5_context* ctx; @@ -640,7 +640,7 @@ /*****************************************************************************/ void APP_CC -ssl_md5_transform(void* md5_info, char* data, int len) +rdssl_md5_transform(void* md5_info, char* data, int len) { int left; int fill; @@ -689,7 +689,7 @@ /*****************************************************************************/ void APP_CC -ssl_md5_complete(void* md5_info, char* data) +rdssl_md5_complete(void* md5_info, char* data) { int last; int padn; @@ -705,15 +705,16 @@ PUT_UINT32(high, msglen, 4); last = ctx->total[0] & 0x3F; padn = (last < 56) ? (56 - last) : (120 - last); - ssl_md5_transform(ctx, (char *)md5_padding, padn); - ssl_md5_transform(ctx, msglen, 8); + rdssl_md5_transform(ctx, (char *)md5_padding, padn); + rdssl_md5_transform(ctx, msglen, 8); PUT_UINT32(ctx->state[0], data, 0); PUT_UINT32(ctx->state[1], data, 4); PUT_UINT32(ctx->state[2], data, 8); PUT_UINT32(ctx->state[3], data, 12); } -void APP_CC ssl_hmac_md5(char* key, int keylen, char* data, int len, char* output) +void APP_CC +rdssl_hmac_md5(char* key, int keylen, char* data, int len, char* output) { int i; char ipad[64]; @@ -723,10 +724,10 @@ if( keylen > 64 ) { - ctx = ssl_md5_info_create(); - ssl_md5_transform(ctx, key, keylen); - ssl_md5_complete(ctx, sum); - ssl_md5_info_delete(ctx); + ctx = rdssl_md5_info_create(); + rdssl_md5_transform(ctx, key, keylen); + rdssl_md5_complete(ctx, sum); + rdssl_md5_info_delete(ctx); keylen = 16; key = sum; } @@ -739,15 +740,15 @@ ipad[i] = ipad[i] ^ key[i]; opad[i] = opad[i] ^ key[i]; } - ctx = ssl_md5_info_create(); - ssl_md5_transform(ctx, ipad, sizeof(ipad)); - ssl_md5_transform(ctx, data, len); - ssl_md5_complete(ctx, sum); - ssl_md5_info_delete(ctx); - ctx = ssl_md5_info_create(); - ssl_md5_transform(ctx, opad, sizeof(opad)); - ssl_md5_complete(ctx, output); - ssl_md5_info_delete(ctx); + ctx = rdssl_md5_info_create(); + rdssl_md5_transform(ctx, ipad, sizeof(ipad)); + rdssl_md5_transform(ctx, data, len); + rdssl_md5_complete(ctx, sum); + rdssl_md5_info_delete(ctx); + ctx = rdssl_md5_info_create(); + rdssl_md5_transform(ctx, opad, sizeof(opad)); + rdssl_md5_complete(ctx, output); + rdssl_md5_info_delete(ctx); } /*****************************************************************************/ @@ -1602,8 +1603,8 @@ /*****************************************************************************/ int APP_CC -ssl_mod_exp(char* out, int out_len, char* in, int in_len, - char* mod, int mod_len, char* exp, int exp_len) +rdssl_mod_exp(char* out, int out_len, char* in, int in_len, + char* mod, int mod_len, char* exp, int exp_len) { /* Computes y = x ^ e mod m */ /* Binary left-to-right method */ @@ -1679,3 +1680,75 @@ return out_len; } +static uint8 g_ppk_n[72] = +{ + 0x3D, 0x3A, 0x5E, 0xBD, 0x72, 0x43, 0x3E, 0xC9, + 0x4D, 0xBB, 0xC1, 0x1E, 0x4A, 0xBA, 0x5F, 0xCB, + 0x3E, 0x88, 0x20, 0x87, 0xEF, 0xF5, 0xC1, 0xE2, + 0xD7, 0xB7, 0x6B, 0x9A, 0xF2, 0x52, 0x45, 0x95, + 0xCE, 0x63, 0x65, 0x6B, 0x58, 0x3A, 0xFE, 0xEF, + 0x7C, 0xE7, 0xBF, 0xFE, 0x3D, 0xF6, 0x5C, 0x7D, + 0x6C, 0x5E, 0x06, 0x09, 0x1A, 0xF5, 0x61, 0xBB, + 0x20, 0x93, 0x09, 0x5F, 0x05, 0x6D, 0xEA, 0x87, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static uint8 g_ppk_d[108] = +{ + 0x87, 0xA7, 0x19, 0x32, 0xDA, 0x11, 0x87, 0x55, + 0x58, 0x00, 0x16, 0x16, 0x25, 0x65, 0x68, 0xF8, + 0x24, 0x3E, 0xE6, 0xFA, 0xE9, 0x67, 0x49, 0x94, + 0xCF, 0x92, 0xCC, 0x33, 0x99, 0xE8, 0x08, 0x60, + 0x17, 0x9A, 0x12, 0x9F, 0x24, 0xDD, 0xB1, 0x24, + 0x99, 0xC7, 0x3A, 0xB8, 0x0A, 0x7B, 0x0D, 0xDD, + 0x35, 0x07, 0x79, 0x17, 0x0B, 0x51, 0x9B, 0xB3, + 0xC7, 0x10, 0x01, 0x13, 0xE7, 0x3F, 0xF3, 0x5F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 +}; + +int +rdssl_sign_ok(char* e_data, int e_len, char* n_data, int n_len, + char* sign_data, int sign_len, char* sign_data2, int sign_len2, char* testkey) +{ + char* key; + char* md5_final; + void* md5; + + if ((e_len != 4) || (n_len != 64) || (sign_len != 64) || (sign_len2 != 64)) + { + return 1; + } + key = (char*)xmalloc(176); + md5_final = (char*)xmalloc(64); + md5 = rdssl_md5_info_create(); + // copy the test key + memcpy(key, testkey, 176); + // replace e and n + memcpy(key + 32, e_data, 4); + memcpy(key + 36, n_data, 64); + rdssl_md5_clear(md5); + // the first 108 bytes + rdssl_md5_transform(md5, key, 108); + // set the whole thing with 0xff + memset(md5_final, 0xff, 64); + // digest 16 bytes + rdssl_md5_complete(md5, md5_final); + // set non 0xff array items + md5_final[16] = 0; + md5_final[62] = 1; + md5_final[63] = 0; + // encrypt + rdssl_mod_exp(sign_data, 64, md5_final, 64, (char*)g_ppk_n, 64, + (char*)g_ppk_d, 64); + // cleanup + rdssl_md5_info_delete(md5); + xfree(key); + xfree(md5_final); + return memcmp(sign_data, sign_data2, sign_len2); +} + Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] Tue May 16 16:37:29 2017 @@ -33,7 +33,7 @@ RD_BOOL g_polygon_ellipse_orders = False; /* polygon / ellipse orders */ RD_BOOL g_bitmap_compression = True; uint32 g_rdp5_performanceflags = - RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_CURSOR_SHADOW; + PERF_DISABLE_WALLPAPER | PERF_DISABLE_FULLWINDOWDRAG | PERF_DISABLE_MENUANIMATIONS | PERF_DISABLE_CURSOR_SHADOW; RD_BOOL g_bitmap_cache_persist_enable = False; RD_BOOL g_bitmap_cache_precache = True; RD_BOOL g_bitmap_cache = True;

1 0

[ekohl] 74555: [INTL] Advanced page: Show code pages again. - Use SetupFindFirstLine and SetupFindNextLine to enumerate all code pages. - Use heap memory functions instead of global memory function...
by ekohl＠svn.reactos.org 15 May '17

15 May '17

Author: ekohl Date: Mon May 15 20:02:48 2017 New Revision: 74555 URL: http://svn.reactos.org/svn/reactos?rev=74555&view=rev Log: [INTL] Advanced page: Show code pages again. - Use SetupFindFirstLine and SetupFindNextLine to enumerate all code pages. - Use heap memory functions instead of global memory functions. - Get rid of TCHAR. - Rename LPCPAGE to PCPAGE. - Hack: Do not fail if EnumSystemCodePages returns FALSE. Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Mon May 15 20:02:48 2017 @@ -1,60 +1,68 @@ #include "intl.h" +#include <debug.h> + typedef struct CPStruct { - WORD Status; - UINT CPage; - HANDLE hCPage; - TCHAR Name[MAX_PATH]; - struct CPStruct *NextItem; -} CPAGE, *LPCPAGE; - -static LPCPAGE PCPage = NULL; -static HINF hIntlInf; + WORD Status; + UINT CodePage; + WCHAR Name[MAX_PATH]; + struct CPStruct *NextItem; +} CPAGE, *PCPAGE; + +static PCPAGE PCPage = NULL; static BOOL bSpain = FALSE; static HWND hLangList; static BOOL -GetSupportedCP(VOID) -{ - UINT uiCPage, Number; - LONG Count; - INFCONTEXT infCont; - LPCPAGE lpCPage; - HANDLE hCPage; +GetSupportedCP( + HINF hInf) +{ + INFCONTEXT Context; + PCPAGE pCodePage; CPINFOEX cpInfEx; - //TCHAR Section[MAX_PATH]; - - Count = SetupGetLineCountW(hIntlInf, L"CodePages"); - if (Count <= 0) return FALSE; - - for (Number = 0; Number < (UINT)Count; Number++) - { - if (SetupGetLineByIndexW(hIntlInf, L"CodePages", Number, &infCont) && - SetupGetIntField(&infCont, 0, (PINT)&uiCPage)) - { - if (!(hCPage = GlobalAlloc(GHND, sizeof(CPAGE)))) return FALSE; - - lpCPage = GlobalLock(hCPage); - lpCPage->CPage = uiCPage; - lpCPage->hCPage = hCPage; - lpCPage->Status = 0; - (lpCPage->Name)[0] = 0; - - if (GetCPInfoEx(uiCPage, 0, &cpInfEx)) - { - wcscpy(lpCPage->Name, cpInfEx.CodePageName); - } - else if (!SetupGetStringFieldW(&infCont, 1, lpCPage->Name, MAX_PATH, NULL)) - { - GlobalUnlock(hCPage); - GlobalFree(hCPage); - continue; - } - - lpCPage->NextItem = PCPage; - PCPage = lpCPage; - } + UINT uiCodePage; + + if (!SetupFindFirstLine(hInf, + L"CodePages", + NULL, + &Context)) + return FALSE; + + for (;;) + { + if (SetupGetIntField(&Context, 0, (PINT)&uiCodePage)) + { + pCodePage = HeapAlloc(GetProcessHeap(), 0, sizeof(CPAGE)); + if (pCodePage == NULL) + return FALSE; + + pCodePage->CodePage = uiCodePage; + pCodePage->Status = 0; + (pCodePage->Name)[0] = UNICODE_NULL; + + if (GetCPInfoExW(uiCodePage, 0, &cpInfEx)) + { + wcscpy(pCodePage->Name, cpInfEx.CodePageName); + } + else + { + SetupGetStringFieldW(&Context, 1, pCodePage->Name, MAX_PATH, NULL); + } + + if (wcslen(pCodePage->Name) != 0) + { + pCodePage->NextItem = PCPage; + PCPage = pCodePage; + } + else + { + HeapFree(GetProcessHeap(), 0, pCodePage); + } + } + + if (!SetupFindNextLine(&Context, &Context)) + break; } return TRUE; @@ -63,7 +71,7 @@ static BOOL CALLBACK InstalledCPProc(PWSTR lpStr) { - LPCPAGE lpCP; + PCPAGE lpCP; UINT uiCP; lpCP = PCPage; @@ -71,12 +79,15 @@ for (;;) { - if (!lpCP) break; - if (lpCP->CPage == uiCP) + if (!lpCP) + break; + + if (lpCP->CodePage == uiCP) { lpCP->Status |= 0x0001; break; } + lpCP = lpCP->NextItem; } @@ -86,17 +97,15 @@ static VOID InitCodePagesList(HWND hwndDlg) { - LPCPAGE lpCPage; + PCPAGE pCodePage; INT ItemIndex; HWND hList; LV_COLUMN column; LV_ITEM item; RECT ListRect; - - hList = GetDlgItem(hwndDlg, IDC_CONV_TABLES); + HINF hIntlInf; hIntlInf = SetupOpenInfFileW(L"intl.inf", NULL, INF_STYLE_WIN4, NULL); - if (hIntlInf == INVALID_HANDLE_VALUE) return; @@ -107,40 +116,46 @@ return; } - if (!GetSupportedCP()) + if (!GetSupportedCP(hIntlInf)) return; SetupCloseInfFile(hIntlInf); - if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) - return; + if (!EnumSystemCodePagesW(InstalledCPProc, CP_INSTALLED)) + { + /* Hack: EnumSystemCodePages returns FALSE on successful completion! */ + /* return; */ + } + + hList = GetDlgItem(hwndDlg, IDC_CONV_TABLES); ZeroMemory(&column, sizeof(LV_COLUMN)); - column.mask = LVCF_FMT|LVCF_TEXT|LVCF_WIDTH; - column.fmt = LVCFMT_LEFT; + column.mask = LVCF_FMT | LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; GetClientRect(hList, &ListRect); - column.cx = ListRect.right - GetSystemMetrics(SM_CYHSCROLL); - (VOID) ListView_InsertColumn(hList, 0, &column); - - (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_CHECKBOXES|LVS_EX_FULLROWSELECT); - - lpCPage = PCPage; + column.cx = ListRect.right - GetSystemMetrics(SM_CYHSCROLL); + ListView_InsertColumn(hList, 0, &column); + + (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT); + + pCodePage = PCPage; for (;;) { - if (!lpCPage) break; + if (pCodePage == NULL) + break; + ZeroMemory(&item, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT|LVIF_PARAM|LVIF_STATE; + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; item.state = 0; item.stateMask = LVIS_STATEIMAGEMASK; - item.pszText = lpCPage->Name; - item.lParam = (LPARAM)lpCPage; + item.pszText = pCodePage->Name; + item.lParam = (LPARAM)pCodePage; ItemIndex = ListView_InsertItem(hList, &item); - - if (ItemIndex >= 0) - { - if (lpCPage->Status & 0x0001) + if (ItemIndex != -1) + { + if (pCodePage->Status & 0x0001) { ListView_SetItemState(hList, ItemIndex, INDEXTOSTATEIMAGEMASK(LVIS_SELECTED), @@ -154,7 +169,7 @@ } } - lpCPage = lpCPage->NextItem; + pCodePage = pCodePage->NextItem; } } @@ -278,7 +293,7 @@ return; } - Count = (UINT) SetupGetLineCount(hFontInf, szSection); + Count = (UINT)SetupGetLineCount(hFontInf, szSection); if (Count <= 0) return;

1 0

[hbelusca] 74554: [USETUP]: Similarly to what was done for GenLists, factor out the UI code from the partition list code. This will allow to reuse it for the 1st-stage GUI setup too, while using an...
by hbelusca＠svn.reactos.org 15 May '17

15 May '17

Author: hbelusca Date: Mon May 15 19:41:18 2017 New Revision: 74554 URL: http://svn.reactos.org/svn/reactos?rev=74554&view=rev Log: [USETUP]: Similarly to what was done for GenLists, factor out the UI code from the partition list code. This will allow to reuse it for the 1st-stage GUI setup too, while using another UI representation. - Add also two partition iterator functions: GetNextPartition and GetPrevPartition. Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/usetup/partlist.h Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon May 15 19:41:18 2017 @@ -789,38 +789,15 @@ static PAGE_NUMBER SetupStartPage(PINPUT_RECORD Ir) { - //SYSTEM_DEVICE_INFORMATION Sdi; NTSTATUS Status; WCHAR FileNameBuffer[MAX_PATH]; INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - //ULONG ReturnSize; PGENERIC_LIST_ENTRY ListEntry; INT IntValue; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - -#if 0 - /* Check whether a harddisk is available */ - Status = NtQuerySystemInformation(SystemDeviceInformation, - &Sdi, - sizeof(SYSTEM_DEVICE_INFORMATION), - &ReturnSize); - - if (!NT_SUCCESS(Status)) - { - CONSOLE_PrintTextXY(6, 15, "NtQuerySystemInformation() failed (Status 0x%08lx)", Status); - MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - if (Sdi.NumberOfDisks == 0) - { - MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } -#endif /* Get the source path and source root path */ Status = GetSourcePaths(&SourcePath, @@ -895,7 +872,7 @@ RequiredPartitionDiskSpace = (ULONG)IntValue; - /* Start PnP thread */ + /* Start the PnP thread */ if (hPnpThread != INVALID_HANDLE_VALUE) { NtResumeThread(hPnpThread, NULL); @@ -906,8 +883,7 @@ if (IsUnattendedSetup) { - //TODO - //read options from inf + // TODO: Read options from inf ComputerList = CreateComputerTypeList(SetupInf); DisplayList = CreateDisplayDriverList(SetupInf); KeyboardList = CreateKeyboardDriverList(SetupInf); @@ -992,7 +968,7 @@ { return REPAIR_INTRO_PAGE; } - else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* R */ + else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* L */ { return LICENSE_PAGE; } @@ -1532,19 +1508,18 @@ static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { + PARTLIST_UI ListUi; ULONG Error; MUIDisplayPage(SELECT_PARTITION_PAGE); if (PartitionList == NULL) { - PartitionList = CreatePartitionList(2, - 23, - xScreen - 3, - yScreen - 3); + PartitionList = CreatePartitionList(); if (PartitionList == NULL) { /* FIXME: show an error dialog */ + MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } else if (IsListEmpty(&PartitionList->DiskListHead)) @@ -1554,7 +1529,12 @@ } } - DrawPartitionList(PartitionList); + InitPartitionListUi(&ListUi, PartitionList, + 2, + 23, + xScreen - 3, + yScreen - 3); + DrawPartitionList(&ListUi); if (IsUnattendedSetup) { @@ -1575,6 +1555,7 @@ TRUE); } +// FIXME?? Aren't we going to enter an infinite loop, if this test fails?? if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, @@ -1589,6 +1570,9 @@ } else { + DrawPartitionList(&ListUi); + +// FIXME?? Aren't we going to enter an infinite loop, if this test fails?? if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, @@ -1656,14 +1640,12 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - if (ScrollDownPartitionList(PartitionList)) - DrawPartitionList(PartitionList); + ScrollDownPartitionList(&ListUi); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - if (ScrollUpPartitionList(PartitionList)) - DrawPartitionList(PartitionList); + ScrollUpPartitionList(&ListUi); } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] Mon May 15 19:41:18 2017 @@ -1418,11 +1418,7 @@ PPARTLIST -CreatePartitionList( - SHORT Left, - SHORT Top, - SHORT Right, - SHORT Bottom) +CreatePartitionList(VOID) { PPARTLIST List; OBJECT_ATTRIBUTES ObjectAttributes; @@ -1441,14 +1437,6 @@ if (List == NULL) return NULL; - List->Left = Left; - List->Top = Top; - List->Right = Right; - List->Bottom = Bottom; - - List->Line = 0; - List->Offset = 0; - List->CurrentDisk = NULL; List->CurrentPartition = NULL; @@ -1465,10 +1453,11 @@ Status = NtQuerySystemInformation(SystemDeviceInformation, &Sdi, - sizeof(SYSTEM_DEVICE_INFORMATION), + sizeof(Sdi), &ReturnSize); if (!NT_SUCCESS(Status)) { + DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx", Status); RtlFreeHeap(ProcessHeap, 0, List); return NULL; } @@ -1592,23 +1581,47 @@ } +VOID +InitPartitionListUi( + IN OUT PPARTLIST_UI ListUi, + IN PPARTLIST List, + IN SHORT Left, + IN SHORT Top, + IN SHORT Right, + IN SHORT Bottom) +{ + ListUi->List = List; + // ListUi->FirstShown = NULL; + // ListUi->LastShown = NULL; + + ListUi->Left = Left; + ListUi->Top = Top; + ListUi->Right = Right; + ListUi->Bottom = Bottom; + + ListUi->Line = 0; + ListUi->Offset = 0; + + // ListUi->Redraw = TRUE; +} + static VOID PrintEmptyLine( - IN PPARTLIST List) + IN PPARTLIST_UI ListUi) { COORD coPos; ULONG Written; USHORT Width; USHORT Height; - Width = List->Right - List->Left - 1; - Height = List->Bottom - List->Top - 2; - - coPos.X = List->Left + 1; - coPos.Y = List->Top + 1 + List->Line; - - if (List->Line >= 0 && List->Line <= Height) + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; + + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; + + if (ListUi->Line >= 0 && ListUi->Line <= Height) { FillConsoleOutputAttribute(StdOutput, FOREGROUND_WHITE | BACKGROUND_BLUE, @@ -1623,17 +1636,18 @@ &Written); } - List->Line++; + ListUi->Line++; } static VOID PrintPartitionData( - IN PPARTLIST List, + IN PPARTLIST_UI ListUi, IN PDISKENTRY DiskEntry, IN PPARTENTRY PartEntry) { + PPARTLIST List = ListUi->List; CHAR LineBuffer[128]; COORD coPos; ULONG Written; @@ -1643,14 +1657,13 @@ PCHAR Unit; UCHAR Attribute; CHAR PartTypeString[32]; - PCHAR PartType; - PartType = PartTypeString; - - Width = List->Right - List->Left - 1; - Height = List->Bottom - List->Top - 2; - - coPos.X = List->Left + 1; - coPos.Y = List->Top + 1 + List->Line; + PCHAR PartType = PartTypeString; + + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; + + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; if (PartEntry->IsPartitioned == FALSE) { @@ -1750,7 +1763,7 @@ FOREGROUND_BLUE | BACKGROUND_WHITE : FOREGROUND_WHITE | BACKGROUND_BLUE; - if (List->Line >= 0 && List->Line <= Height) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { FillConsoleOutputCharacterA(StdOutput, ' ', @@ -1760,7 +1773,7 @@ } coPos.X += 4; Width -= 8; - if (List->Line >= 0 && List->Line <= Height) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { FillConsoleOutputAttribute(StdOutput, Attribute, @@ -1770,7 +1783,7 @@ } coPos.X++; Width -= 2; - if (List->Line >= 0 && List->Line <= Height) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { WriteConsoleOutputCharacterA(StdOutput, LineBuffer, @@ -1779,16 +1792,17 @@ &Written); } - List->Line++; + ListUi->Line++; } static VOID PrintDiskData( - IN PPARTLIST List, + IN PPARTLIST_UI ListUi, IN PDISKENTRY DiskEntry) { + // PPARTLIST List = ListUi->List; PPARTENTRY PrimaryPartEntry, LogicalPartEntry; PLIST_ENTRY PrimaryEntry, LogicalEntry; CHAR LineBuffer[128]; @@ -1799,11 +1813,11 @@ ULARGE_INTEGER DiskSize; PCHAR Unit; - Width = List->Right - List->Left - 1; - Height = List->Bottom - List->Top - 2; - - coPos.X = List->Left + 1; - coPos.Y = List->Top + 1 + List->Line; + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; + + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ @@ -1843,7 +1857,7 @@ DiskEntry->Id); } - if (List->Line >= 0 && List->Line <= Height) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { FillConsoleOutputAttribute(StdOutput, FOREGROUND_WHITE | BACKGROUND_BLUE, @@ -1859,7 +1873,7 @@ } coPos.X++; - if (List->Line >= 0 && List->Line <= Height) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { WriteConsoleOutputCharacterA(StdOutput, LineBuffer, @@ -1868,10 +1882,10 @@ &Written); } - List->Line++; + ListUi->Line++; /* Print separator line */ - PrintEmptyLine(List); + PrintEmptyLine(ListUi); /* Print partition lines */ PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; @@ -1879,7 +1893,7 @@ { PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry); - PrintPartitionData(List, + PrintPartitionData(ListUi, DiskEntry, PrimaryPartEntry); @@ -1890,7 +1904,7 @@ { LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); - PrintPartitionData(List, + PrintPartitionData(ListUi, DiskEntry, LogicalPartEntry); @@ -1902,14 +1916,15 @@ } /* Print separator line */ - PrintEmptyLine(List); + PrintEmptyLine(ListUi); } VOID DrawPartitionList( - IN PPARTLIST List) -{ + IN PPARTLIST_UI ListUi) +{ + PPARTLIST List = ListUi->List; PLIST_ENTRY Entry, Entry2; PDISKENTRY DiskEntry; PPARTENTRY PartEntry = NULL; @@ -2000,37 +2015,37 @@ } /* If it possible, make the disk name visible */ - if (CurrentPartLine < List->Offset) - { - List->Offset = CurrentPartLine; - } - else if (CurrentPartLine - List->Offset > List->Bottom - List->Top - 2) - { - List->Offset = CurrentPartLine - (List->Bottom - List->Top - 2); - } - - if (CurrentDiskLine < List->Offset && CurrentPartLine - CurrentDiskLine < List->Bottom - List->Top - 2) - { - List->Offset = CurrentDiskLine; - } - - /* draw upper left corner */ - coPos.X = List->Left; - coPos.Y = List->Top; + if (CurrentPartLine < ListUi->Offset) + { + ListUi->Offset = CurrentPartLine; + } + else if (CurrentPartLine - ListUi->Offset > ListUi->Bottom - ListUi->Top - 2) + { + ListUi->Offset = CurrentPartLine - (ListUi->Bottom - ListUi->Top - 2); + } + + if (CurrentDiskLine < ListUi->Offset && CurrentPartLine - CurrentDiskLine < ListUi->Bottom - ListUi->Top - 2) + { + ListUi->Offset = CurrentDiskLine; + } + + /* Draw upper left corner */ + coPos.X = ListUi->Left; + coPos.Y = ListUi->Top; FillConsoleOutputCharacterA(StdOutput, 0xDA, // '+', 1, coPos, &Written); - /* draw upper edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Top; - if (List->Offset == 0) + /* Draw upper edge */ + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top; + if (ListUi->Offset == 0) { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - List->Right - List->Left - 1, + ListUi->Right - ListUi->Left - 1, coPos, &Written); } @@ -2038,16 +2053,16 @@ { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - List->Right - List->Left - 5, + ListUi->Right - ListUi->Left - 5, coPos, &Written); - coPos.X = List->Right - 5; + coPos.X = ListUi->Right - 5; WriteConsoleOutputCharacterA(StdOutput, "(\x18)", // "(up)" 3, coPos, &Written); - coPos.X = List->Right - 2; + coPos.X = ListUi->Right - 2; FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', 2, @@ -2055,19 +2070,19 @@ &Written); } - /* draw upper right corner */ - coPos.X = List->Right; - coPos.Y = List->Top; + /* Draw upper right corner */ + coPos.X = ListUi->Right; + coPos.Y = ListUi->Top; FillConsoleOutputCharacterA(StdOutput, 0xBF, // '+', 1, coPos, &Written); - /* draw left and right edge */ - for (i = List->Top + 1; i < List->Bottom; i++) - { - coPos.X = List->Left; + /* Draw left and right edge */ + for (i = ListUi->Top + 1; i < ListUi->Bottom; i++) + { + coPos.X = ListUi->Left; coPos.Y = i; FillConsoleOutputCharacterA(StdOutput, 0xB3, // '|', @@ -2075,7 +2090,7 @@ coPos, &Written); - coPos.X = List->Right; + coPos.X = ListUi->Right; FillConsoleOutputCharacterA(StdOutput, 0xB3, //'|', 1, @@ -2083,23 +2098,23 @@ &Written); } - /* draw lower left corner */ - coPos.X = List->Left; - coPos.Y = List->Bottom; + /* Draw lower left corner */ + coPos.X = ListUi->Left; + coPos.Y = ListUi->Bottom; FillConsoleOutputCharacterA(StdOutput, 0xC0, // '+', 1, coPos, &Written); - /* draw lower edge */ - coPos.X = List->Left + 1; - coPos.Y = List->Bottom; - if (LastLine - List->Offset <= List->Bottom - List->Top - 2) + /* Draw lower edge */ + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Bottom; + if (LastLine - ListUi->Offset <= ListUi->Bottom - ListUi->Top - 2) { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - List->Right - List->Left - 1, + ListUi->Right - ListUi->Left - 1, coPos, &Written); } @@ -2107,16 +2122,16 @@ { FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', - List->Right - List->Left - 5, + ListUi->Right - ListUi->Left - 5, coPos, &Written); - coPos.X = List->Right - 5; + coPos.X = ListUi->Right - 5; WriteConsoleOutputCharacterA(StdOutput, "(\x19)", // "(down)" 3, coPos, &Written); - coPos.X = List->Right - 2; + coPos.X = ListUi->Right - 2; FillConsoleOutputCharacterA(StdOutput, 0xC4, // '-', 2, @@ -2124,9 +2139,9 @@ &Written); } - /* draw lower right corner */ - coPos.X = List->Right; - coPos.Y = List->Bottom; + /* Draw lower right corner */ + coPos.X = ListUi->Right; + coPos.Y = ListUi->Bottom; FillConsoleOutputCharacterA(StdOutput, 0xD9, // '+', 1, @@ -2134,7 +2149,7 @@ &Written); /* print list entries */ - List->Line = - List->Offset; + ListUi->Line = - ListUi->Offset; Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -2142,8 +2157,7 @@ DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); /* Print disk entry */ - PrintDiskData(List, - DiskEntry); + PrintDiskData(ListUi, DiskEntry); Entry = Entry->Flink; } @@ -2158,8 +2172,7 @@ { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; + PLIST_ENTRY Entry1, Entry2; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) @@ -2180,10 +2193,9 @@ if (PartEntry->PartitionNumber == PartitionNumber) { - List->CurrentDisk = DiskEntry; - List->CurrentPartition = PartEntry; - DrawPartitionList(List); - return TRUE; + List->CurrentDisk = DiskEntry; + List->CurrentPartition = PartEntry; + return TRUE; } Entry2 = Entry2->Flink; @@ -2199,8 +2211,8 @@ } -BOOL -ScrollDownPartitionList( +PPARTENTRY +GetNextPartition( IN PPARTLIST List) { PLIST_ENTRY DiskListEntry; @@ -2210,7 +2222,7 @@ /* Fail, if no disks are available */ if (IsListEmpty(&List->DiskListHead)) - return FALSE; + return NULL; /* Check for next usable entry on current disk */ if (List->CurrentPartition != NULL) @@ -2226,7 +2238,7 @@ PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } else { @@ -2236,7 +2248,7 @@ PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } } } @@ -2254,7 +2266,7 @@ PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } } else @@ -2266,7 +2278,7 @@ PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry); List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } } } @@ -2285,18 +2297,17 @@ List->CurrentDisk = DiskEntry; List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } DiskListEntry = DiskListEntry->Flink; } - return FALSE; -} - - -BOOL -ScrollUpPartitionList( + return NULL; +} + +PPARTENTRY +GetPrevPartition( IN PPARTLIST List) { PLIST_ENTRY DiskListEntry; @@ -2306,7 +2317,7 @@ /* Fail, if no disks are available */ if (IsListEmpty(&List->DiskListHead)) - return FALSE; + return NULL; /* Check for previous usable entry on current disk */ if (List->CurrentPartition != NULL) @@ -2322,12 +2333,12 @@ } else { - /* Extended partition*/ + /* Extended partition */ PartEntry = List->CurrentDisk->ExtendedPartition; } List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } else { @@ -2346,9 +2357,8 @@ } List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } - } } @@ -2373,21 +2383,39 @@ List->CurrentDisk = DiskEntry; List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } } else { List->CurrentDisk = DiskEntry; List->CurrentPartition = PartEntry; - return TRUE; + return List->CurrentPartition; } } DiskListEntry = DiskListEntry->Blink; } - return FALSE; + return NULL; +} + + + +VOID +ScrollDownPartitionList( + IN PPARTLIST_UI ListUi) +{ + if (GetNextPartition(ListUi->List)) + DrawPartitionList(ListUi); +} + +VOID +ScrollUpPartitionList( + IN PPARTLIST_UI ListUi) +{ + if (GetPrevPartition(ListUi->List)) + DrawPartitionList(ListUi); } Modified: branches/setup_improvements/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] Mon May 15 19:41:18 2017 @@ -152,16 +152,9 @@ typedef struct _PARTLIST { - /* UI stuff */ - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; - - SHORT Line; - SHORT Offset; - /* + * Disk & Partition iterators. + * * NOTE that when CurrentPartition != NULL, then CurrentPartition->DiskEntry * must be the same as CurrentDisk. We should however keep the two members * separated as we can have a current (selected) disk without any current @@ -239,18 +232,10 @@ IN ULONG cchPartType); PPARTLIST -CreatePartitionList( - SHORT Left, - SHORT Top, - SHORT Right, - SHORT Bottom); +CreatePartitionList(VOID); VOID DestroyPartitionList( - IN PPARTLIST List); - -VOID -DrawPartitionList( IN PPARTLIST List); ULONG @@ -259,12 +244,12 @@ IN ULONG DiskNumber, IN ULONG PartitionNumber); -BOOL -ScrollDownPartitionList( - IN PPARTLIST List); - -BOOL -ScrollUpPartitionList( +PPARTENTRY +GetNextPartition( + IN PPARTLIST List); + +PPARTENTRY +GetPrevPartition( IN PPARTLIST List); VOID @@ -330,4 +315,47 @@ OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry); + + + + +typedef struct _PARTLIST_UI +{ + PPARTLIST List; + + // PLIST_ENTRY FirstShown; + // PLIST_ENTRY LastShown; + + SHORT Left; + SHORT Top; + SHORT Right; + SHORT Bottom; + + SHORT Line; + SHORT Offset; + + // BOOL Redraw; +} PARTLIST_UI, *PPARTLIST_UI; + +VOID +InitPartitionListUi( + IN OUT PPARTLIST_UI ListUi, + IN PPARTLIST List, + IN SHORT Left, + IN SHORT Top, + IN SHORT Right, + IN SHORT Bottom); + +VOID +ScrollDownPartitionList( + IN PPARTLIST_UI ListUi); + +VOID +ScrollUpPartitionList( + IN PPARTLIST_UI ListUi); + +VOID +DrawPartitionList( + IN PPARTLIST_UI ListUi); + /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs