March 2018 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture().
by Henri Verbeet 26 Mar '18

26 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f211f23fec..29083ea1c7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3820,12 +3820,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); + src_size = max(src_size, src_texture->resource.depth); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); - if (type == WINED3D_RTYPE_TEXTURE_3D) - { - src_size = max(src_size, src_texture->resource.depth); - dst_size = max(dst_size, dst_texture->resource.depth); - } + dst_size = max(dst_size, dst_texture->resource.depth); while (src_size > dst_size) { src_size >>= 1; -- 2.11.0

1 0

[PATCH v2] comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.
by Zhiyi Zhang 26 Mar '18

26 Mar '18

Supersede 143620 This avoids a clang warning of uninitialized value usage. Also removes redundant argument check and not useful trace. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)

2 1

[PATCH 1/4] wsdapi: Add support for writing XML attributes.
by Owen Rudge 26 Mar '18

26 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)

2 1

[PATCH] explorer.c: Test for explorer.exe (try 3)
by Carlos Vega García 26 Mar '18

26 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> Makefile.in: Makefile for explorer.exe tests (try 3) Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> Makefile.in: Makefile for explorer.exe tests (try 3) Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/Makefile.in | 6 ++ programs/explorer/tests/explorer.c | 180 ++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..041549a --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c + diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..d195486 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,180 @@ +/* + * Unit tests for explorer.exe + * + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 10; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*I test two window name because in some Windows versions when I open the explorer it creates +*the window with another header. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + BOOL is_window_created; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name_alternative[] = {'C',':',92,'W', 'I', 'N', 'D', 'O', 'W', 'S', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + is_window_created = check_window_exists(window_name); + + /*Checks if the window has been created*/ + if (is_window_created) + { + return TRUE; + } + + /*If the first window has not been detected it checks with the alterntive name*/ + if (!is_window_created) + { + if(check_window_exists(window_name_alternative)){ + return TRUE; + } + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

3 2

[PATCH] testbot/web: Tweak ItemPage to save the Item directly.
by Francois Gouget 26 Mar '18

26 Mar '18

This avoids depending on whether Items retrieved with Collection::GetItem() are stored in the Collection or not. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 4086a9385..b44e5b2d3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -137,6 +137,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SaveProperties()); + + ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + return ! defined($self->{ErrMessage}); +} + sub OnAction($$) { my ($self, $Action) = @_; -- 2.16.2

1 0

[PATCH] testbot: Always allow direct access to the table rows.
by Francois Gouget 26 Mar '18

26 Mar '18

So far it was always necessary to go through the hierarchies like Job -> Step -> Task. Now it is possible to directly retrieve all the rows in any table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 17 ++++++++++++++++- testbot/lib/ObjectModel/Item.pm | 4 +--- testbot/lib/ObjectModel/PropertyDescriptor.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatchSets.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 16 ++++++++++++++-- testbot/lib/WineTestBot/RecordGroups.pm | 1 + testbot/lib/WineTestBot/Steps.pm | 16 +++++++++++----- testbot/lib/WineTestBot/Tasks.pm | 14 ++++++++++++-- testbot/lib/WineTestBot/UserRoles.pm | 13 +++++++++++-- testbot/lib/WineTestBot/Users.pm | 1 + 11 files changed, 70 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index dbef8ac21..d60fe6395 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -29,7 +29,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); -(a)EXPORT = qw(&CreateDetailrefPropertyDescriptor); +(a)EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { @@ -66,4 +66,19 @@ sub CreateDetailrefPropertyDescriptor($$$$$) return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); } +sub SetDetailrefKeyPrefix($@) +{ + my $KeyPrefix = shift; + foreach my $PropertyDescriptor (@_) + { + if ($PropertyDescriptor->{IsKey}) + { + # Defines the prefix to prepend to the field name when the key is + # inherited by a child object through a DetailrefPropertyDescriptor + # relation. + $PropertyDescriptor->{KeyPrefix} = $KeyPrefix; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 424826f23..201577c98 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -305,8 +305,6 @@ sub GetMasterKey($) { my ($self) = @_; - my $ColNamePrefix = ref($self); - $ColNamePrefix =~ s/.*://; my @MasterColNames, my @MasterColValues; if (defined($self->{MasterColNames})) { @@ -319,7 +317,7 @@ sub GetMasterKey($) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - push @MasterColNames, $ColNamePrefix . $ColName; + push @MasterColNames, $PropertyDescriptor->{KeyPrefix} . $ColName; push @MasterColValues, $self->GetColValue($ColName); } } diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 9c13b1ca2..583082e81 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -50,6 +50,7 @@ sub new($$$$$@) IsKey => $IsKey, IsRequired => $IsRequired, Class => undef}; + $self->{KeyPrefix} = "" if ($IsKey); $self = bless $self, $class; $self->_initialize(@_); return $self; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index bcbcae91f..f810b4f12 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -431,6 +431,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); +SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 520fb653c..d51652221 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -180,6 +180,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TotalParts", "Expected number of parts in series", 1, 1, "N", 2), CreateDetailrefPropertyDescriptor("Parts", "Parts received so far", !1, !1, \&CreatePendingPatches), ); +SetDetailrefKeyPrefix("PendingPatchSet", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 053f7123d..281db60ef 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -69,13 +69,24 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), + CreateBasicPropertyDescriptor("PendingPatchSetTotalParts", "Expected number of parts in series", 1, 1, "N", 2), + @PropertyDescriptors +); =pod =over 12 =item C<CreatePendingPatches()> -Creates a collection of PendingPatch objects. +When given a PendingPatchSet object returns a collection containing the +corresponding parts. In this case the PendingPatch objects don't store the +key of their parent. + +If no PendingPatchSet object is specified all the table rows are returned and +the PendingPatch objects have PendingPatchSetEMail and +PendingPatchSetTotalParts properties. =back =cut @@ -86,7 +97,8 @@ sub CreatePendingPatches(;$$) return WineTestBot::PendingPatches->new( "PendingPatches", "PendingPatches", "PendingPatch", - \@PropertyDescriptors, $ScopeObject, $PendingPatchSet); + $PendingPatchSet ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $PendingPatchSet); } 1; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 252545569..1e5dbbdd4 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -80,6 +80,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Timestamp", "Timestamp", !1, 1, "DT", 19), CreateDetailrefPropertyDescriptor("Records", "Records", !1, !1, \&CreateRecords), ); +SetDetailrefKeyPrefix("RecordGroup", @PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index f91b70e3f..ef2b3872b 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -216,17 +216,22 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), ); +SetDetailrefKeyPrefix("Step", @PropertyDescriptors); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + @PropertyDescriptors +); =pod =over 12 =item C<CreateSteps()> -Creates a collection containing the steps of the specified Job. In -this case the Step objects don't store the key of their parent. +When given a Job object returns a collection containing the corresponding +steps. In this case the Step objects don't store the key of their parent. -If no Job is specified all the table rows are returned and the -Step objects have a JobId property. +If no Job object is specified all the table rows are returned and the Step +objects have a JobId property. =back =cut @@ -236,7 +241,8 @@ sub CreateSteps(;$$) my ($ScopeObject, $Job) = @_; return WineTestBot::Steps->new("Steps", "Steps", "Step", - \@PropertyDescriptors, $ScopeObject, $Job); + $Job ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $Job); } 1; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dcc222b52..f16dfe201 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -233,13 +233,22 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 5), + CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), + @PropertyDescriptors +); =pod =over 12 =item C<CreateTasks()> -Creates a collection of Patch objects. +When given a Step object returns a collection containing the corresponding +tasks. In this case the Task objects don't store the key of their parent. + +If no Step object is specified all the table rows are returned and the Task +objects have JobId and StepNo properties. =back =cut @@ -248,7 +257,8 @@ sub CreateTasks(;$$) { my ($ScopeObject, $Step) = @_; return WineTestBot::Tasks->new("Tasks", "Tasks", "Task", - \@PropertyDescriptors, $ScopeObject, $Step); + $Step ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $Step); } 1; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 417baf994..972bdc0e9 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -62,13 +62,21 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), ); +my @FlatPropertyDescriptors = ( + CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), + @PropertyDescriptors +); =pod =over 12 =item C<CreateUserRoles()> -Creates a collection of UserRole objects. +When given a User object returns a collection containing the corresponding +roles. In this case the Role objects don't store the key of their parent. + +If no User object is specified all the table rows are returned and the UserRole +objects have a UserName property. =back =cut @@ -77,7 +85,8 @@ sub CreateUserRoles(;$$) { my ($ScopeObject, $User) = @_; return WineTestBot::UserRoles->new("UserRoles", "UserRoles", "UserRole", - \@PropertyDescriptors, $ScopeObject, $User); + $User ? \@PropertyDescriptors : \@FlatPropertyDescriptors, + $ScopeObject, $User); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 95c7c2561..178b377b9 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -326,6 +326,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("ResetCode", "Password reset code", !1, !1, "A", 32), CreateDetailrefPropertyDescriptor("Roles", "Roles", !1, !1, \&CreateUserRoles), ); +SetDetailrefKeyPrefix("User", @PropertyDescriptors); =pod =over 12 -- 2.16.2

1 0

[PATCH] testbot/testagentd: Show a message when testagentd is restarted.
by Francois Gouget 26 Mar '18

26 Mar '18

It can be useful to set up a VM to auto-login on Windows and have TestAgentd start automatically on boot. However in such a configuration it can be hard to detect when a test causes Windows to reboot: the client reconnects automatically just like after a network glitch and the VM desktop looks normal. So with this patch TestAgentd can keep track of its restarts, lets the client query that value, and brings up a dialog if an unexpected restart occurs. The start count can also be overriden to deal with cases where some automated process causes a Windows reboot as part of the VM set up process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 20 +++++ testbot/scripts/TestAgent | 15 +++- testbot/src/testagentd/platform.h | 8 ++ testbot/src/testagentd/platform_unix.c | 9 ++ testbot/src/testagentd/platform_windows.c | 31 +++++++ testbot/src/testagentd/testagentd.c | 131 +++++++++++++++++++++++++++++- 6 files changed, 210 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 255c1a19b..2f7ec4def 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -42,6 +42,7 @@ my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; my $RPC_RMCHILDPROC = 10; my $RPC_GETCWD = 11; +my $RPC_SETPROPERTY = 12; my %RpcNames=( $RPC_PING => 'ping', @@ -56,6 +57,7 @@ my %RpcNames=( $RPC_UPGRADE => 'upgrade', $RPC_RMCHILDPROC => 'rmchildproc', $RPC_GETCWD => 'getcwd', + $RPC_SETPROPERTY => 'setproperty', ); my $Debug = 0; @@ -1386,6 +1388,24 @@ sub GetProperties($;$) return $Properties; } +sub SetProperty($$$) +{ + my ($self, $PropName, $PropValue) = @_; + debug("SetProperty\n"); + + # Send the command + if (!$self->_StartRPC($RPC_SETPROPERTY) or + !$self->_SendListSize('ArgC', 2) or + !$self->_SendString('PropName', $PropName) or + !$self->_SendString('PropValue', $PropValue)) + { + return undef; + } + + # Get the reply + return $self->_RecvList(''); +} + sub Upgrade($$) { my ($self, $Filename) = @_; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index c41055616..25fc0d426 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -52,7 +52,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); +my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, $PropValue, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; @@ -229,6 +229,12 @@ while (@ARGV) set_cmd($arg); $PropName = @ARGV ? check_opt_val($arg, $PropName) : '*'; } + elsif ($arg eq "setproperty") + { + set_cmd($arg); + $PropName = check_opt_val($arg, $PropName); + $PropValue = check_opt_val($arg, $PropValue); + } elsif ($arg eq "upgrade") { set_cmd($arg); @@ -319,6 +325,8 @@ if (defined $Usage) print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; + print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> setproperty <name> <value>\n"; print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; @@ -346,6 +354,7 @@ if (defined $Usage) print " getproperty <name> Retrieves and prints the specified server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; + print " setproperty <name> <value> Sets the specified property.\n"; print " getcwd Returns the server's current working directory.\n"; print " ping Makes sure the server is still alive.\n"; print " upgrade Replaces the server executable with the specified file and\n"; @@ -480,6 +489,10 @@ elsif ($Cmd eq "getversion") $Result = $TA->GetVersion(); print "Version=$Result\n" if (defined $Result); } +elsif ($Cmd eq "setproperty") +{ + $Result = $TA->SetProperty($PropName, $PropValue); +} elsif ($Cmd eq "ping") { $Result = $TA->Ping(); diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 84ab4917c..98dfe394c 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -103,6 +103,14 @@ int platform_settime(uint64_t epoch, uint32_t leeway); */ int platform_upgrade_script(const char* script, const char* tmpserver, char** argv); +/* Called when the message has been dismissed by the user. + */ +typedef void (*message_dismissed_func)(void); + +/* Shows the specified message. + */ +void platform_show_message(const char* message, message_dismissed_func func); + /* Returns a string describing the last socket-related error */ int sockeintr(void); const char* sockerror(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index dcd4d69b6..fbaa995b0 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -270,6 +270,15 @@ int platform_upgrade_script(const char* script, const char* tmpserver, char** ar return 1; } +void platform_show_message(const char* message, message_dismissed_func dismissed) +{ + /* Don't bother trying to pop up a GUI. There may not be one anyway. + * Since the user has no way to dismiss the dialog the dismissed function + * is not called. + */ + fprintf(stderr, "%s", message); +} + int sockeintr(void) { return errno == EINTR; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 1efac1c77..5c55b2004 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -312,6 +312,37 @@ int platform_upgrade_script(const char* script, const char* tmpserver, char** ar return 1; } +struct msg_thread_t +{ + char* message; + message_dismissed_func dismissed; +}; + +DWORD WINAPI msg_thread(LPVOID parameter) +{ + struct msg_thread_t* data = parameter; + + MessageBoxA(NULL, data->message, "Message", MB_OK); + free(data->message); + if (data->dismissed) + (*data->dismissed)(); + free(data); + return 0; +} + +void platform_show_message(const char* message, message_dismissed_func dismissed) +{ + HANDLE thread; + struct msg_thread_t* data = malloc(sizeof(struct msg_thread_t)); + + fprintf(stderr, message); + + data->message = strdup(message); + data->dismissed = dismissed; + thread = CreateThread(NULL, 0, &msg_thread, data, 0, NULL); + CloseHandle(thread); +} + int sockretry(void) { return (WSAGetLastError() == WSAEINTR); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 5f0f54ca2..79016c067 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,9 +37,10 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. - * 1.6: Add support for the rmchildproc and getcwd RPC. + * 1.6: Add the rmchildproc and getcwd RPCs. + * 1.7: Add --show-restarts and the setproperty RPC. */ -#define PROTOCOL_VERSION "testagentd 1.6" +#define PROTOCOL_VERSION "testagentd 1.7" #define BLOCK_SIZE 65536 @@ -91,6 +92,7 @@ enum rpc_ids_t RPCID_UPGRADE, RPCID_RMCHILDPROC, RPCID_GETCWD, + RPCID_SETPROPERTY, }; /* This is the RPC currently being processed */ @@ -113,6 +115,7 @@ static const char* rpc_name(uint32_t id) "upgrade", "rmchildproc", "getcwd", + "setproperty", }; if (id < sizeof(names) / sizeof(*names)) @@ -619,6 +622,47 @@ static int send_file(SOCKET client, int fd, const char* filename) } +/* + * TestAgentd restart / Windows reboot tracking. + */ + +static unsigned int start_count = 0; + +static char* start_count_filename(void) +{ + char* filename = malloc(strlen(name0) + 5 + 1); + sprintf(filename, "%s.data", name0); + return filename; +} + +static void load_start_count(void) +{ + FILE *fh; + char* filename = start_count_filename(); + fh = fopen(filename, "r"); + if (fh) + { + if (!fscanf(fh, "%d", &start_count)) + start_count = 0; + fclose(fh); + } + free(filename); +} + +static void save_start_count(void) +{ + FILE *fh; + char* filename = start_count_filename(); + fh = fopen(filename, "w"); + if (fh) + { + fprintf(fh, "%d\n", start_count); + fclose(fh); + } + free(filename); +} + + /* * High-level operations. */ @@ -969,7 +1013,7 @@ static void do_getproperties(SOCKET client) send_error(client); return; } - send_list_size(client, 2); + send_list_size(client, 3); format_msg(&buf, &size, "protocol.version=%s", PROTOCOL_VERSION); send_string(client, buf); @@ -984,9 +1028,53 @@ static void do_getproperties(SOCKET client) #endif format_msg(&buf, &size, "server.arch=%s", arch); send_string(client, buf); + + format_msg(&buf, &size, "start.count=%u", start_count); + send_string(client, buf); + free(buf); } +static void do_setproperty(SOCKET client) +{ + char *name = NULL, *value = NULL; + + if (!expect_list_size(client, 2) || + !recv_string(client, &name) || + !recv_string(client, &value)) + { + send_error(client); + return; + } + + if (strcmp(name, "start.count") == 0) + { + unsigned int val; + if (sscanf(value, "%u", &val) == 1) + { + start_count = val; + save_start_count(); + send_list_size(client, 0); + } + else + { + set_status(ST_ERROR, "'%s' is not a valid %s value", value, name); + send_error(client); + } + } + else if (strcmp(name, "protocol.version") == 0 || + strcmp(name, "server.arch") == 0) + { + set_status(ST_ERROR, "%s is read-only", name); + send_error(client); + } + else + { + set_status(ST_ERROR, "unknown property %s", name); + send_error(client); + } +} + static void do_upgrade(SOCKET client) { static const char *filename = "testagentd.tmp"; @@ -1033,6 +1121,10 @@ static void do_upgrade(SOCKET client) free(args[0]); if (success) { + /* Decrement the start count since this one is intentional */ + start_count--; + save_start_count(); + broken = 1; quit = 1; } @@ -1129,6 +1221,9 @@ static void process_rpc(SOCKET client) case RPCID_RMCHILDPROC: do_rmchildproc(client); break; + case RPCID_SETPROPERTY: + do_setproperty(client); + break; default: do_unknown(client, rpcid); } @@ -1214,11 +1309,33 @@ static int is_host_allowed(SOCKET client, const char* srchost, int addrlen) return 0; } + +static void reset_start_count(void) +{ + start_count = 1; + save_start_count(); +} + +static void check_start_count(void) +{ + load_start_count(); + start_count++; + save_start_count(); + + if (start_count > 1) + { + char msg[255]; + sprintf(msg, "%s was restarted (%d). Did Windows reboot?\n", name0, start_count); + platform_show_message(msg, &reset_start_count); + } +} + int main(int argc, char** argv) { const char* p; char** arg; int opt_detach = 0; + int opt_show_restarts = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1247,6 +1364,10 @@ int main(int argc, char** argv) { opt_detach = 1; } + else if (strcmp(*arg, "--show-restarts") == 0) + { + opt_show_restarts = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1328,11 +1449,15 @@ int main(int argc, char** argv) printf(" --debug Prints detailed information about what happens.\n"); printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); printf(" combine this with start: start %s --detach ...\n", name0); + printf(" --show-restarts Shows a message if %s has been restarted (for instance\n", name0); + printf(" because of a Windows reboot).\n"); printf(" --help Shows this usage message.\n"); exit(0); } if (opt_detach) platform_detach_console(); + if (opt_show_restarts) + check_start_count(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC -- 2.16.2

1 0

[PATCH 6/6] bcrypt: Store full ECCKEY_BLOB struct in BCryptImportKeyPair.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2dd588a..82bece5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1401,6 +1401,7 @@ static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) { + BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; gnutls_datum_t x, y; int ret; @@ -1421,10 +1422,11 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_INTERNAL_ERROR; } - x.data = key->u.a.pubkey; - x.size = key->u.a.pubkey_len / 2; - y.data = key->u.a.pubkey + x.size; - y.size = x.size; + ecc_blob = (BCRYPT_ECCKEY_BLOB *)key->u.a.pubkey; + x.data = key->u.a.pubkey + sizeof(*ecc_blob); + x.size = ecc_blob->cbKey; + y.data = key->u.a.pubkey + sizeof(*ecc_blob) + ecc_blob->cbKey; + y.size = ecc_blob->cbKey; if ((ret = pgnutls_pubkey_import_ecc_raw( *gnutls_key, curve, &x, &y ))) { @@ -2058,7 +2060,7 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, (BYTE *)(ecc_blob + 1), ecc_blob->cbKey * 2 ))) + if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) { heap_free( key ); return status; -- 1.9.1

1 0

[PATCH 5/6] bcrypt/tests: Add simple test for RSA.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Based on patch from Bernhard Übelacker. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/tests/bcrypt.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 57d0488..7d59f6d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1495,6 +1495,100 @@ static void test_ECDSA(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static UCHAR rsaPublicBlob[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xad, 0x41, 0x09, 0xa2, 0x56, + 0x3a, 0x7b, 0x75, 0x4b, 0x72, 0x9b, 0x28, 0x72, 0x3b, 0xae, 0x9f, 0xd8, 0xa8, 0x25, 0x4a, 0x4c, + 0x19, 0xf5, 0xa6, 0xd0, 0x05, 0x1c, 0x59, 0x8f, 0xe3, 0xf3, 0x2d, 0x29, 0x47, 0xf8, 0x80, 0x25, + 0x25, 0x21, 0x58, 0xc2, 0xac, 0xa1, 0x9e, 0x93, 0x8e, 0x82, 0x6d, 0xd7, 0xf3, 0xe7, 0x8f, 0x0b, + 0xc0, 0x41, 0x85, 0x29, 0x3c, 0xf1, 0x0b, 0x2c, 0x5d, 0x49, 0xed, 0xb4, 0x30, 0x6e, 0x02, 0x15, + 0x4b, 0x9a, 0x08, 0x0d, 0xe1, 0x6f, 0xa8, 0xd3, 0x12, 0xab, 0x66, 0x48, 0x4d, 0xd9, 0x28, 0x03, + 0x6c, 0x9d, 0x44, 0x7a, 0xed, 0xc9, 0x43, 0x4f, 0x9d, 0x4e, 0x3c, 0x7d, 0x0e, 0xff, 0x07, 0x87, + 0xeb, 0xca, 0xca, 0x65, 0x6d, 0xbe, 0xc5, 0x31, 0x8b, 0xcc, 0x7e, 0x0a, 0x71, 0x4a, 0x4d, 0x9d, + 0x3d, 0xfd, 0x7a, 0x56, 0x32, 0x8a, 0x6c, 0x6d, 0x9d, 0x2a, 0xd9, 0x8e, 0x68, 0x89, 0x63, 0xc6, + 0x4f, 0x24, 0xd1, 0x2a, 0x72, 0x69, 0x08, 0x77, 0xa0, 0x7f, 0xfe, 0xc6, 0x33, 0x8d, 0xb4, 0x7d, + 0x73, 0x91, 0x13, 0x9c, 0x47, 0x53, 0x6a, 0x13, 0xdf, 0x19, 0xc7, 0xed, 0x48, 0x81, 0xed, 0xd8, + 0x1f, 0x11, 0x11, 0xbb, 0x41, 0x15, 0x5b, 0xa4, 0xf5, 0xc9, 0x2b, 0x48, 0x5e, 0xd8, 0x4b, 0x52, + 0x1f, 0xf7, 0x87, 0xf2, 0x68, 0x25, 0x28, 0x79, 0xee, 0x39, 0x41, 0xc9, 0x0e, 0xc8, 0xf9, 0xf2, + 0xd8, 0x24, 0x09, 0xb4, 0xd4, 0xb7, 0x90, 0xba, 0x26, 0xe8, 0x1d, 0xb4, 0xd7, 0x09, 0x00, 0xc4, + 0xa0, 0xb6, 0x14, 0xe8, 0x4c, 0x29, 0x60, 0x54, 0x2e, 0x01, 0xde, 0x54, 0x66, 0x40, 0x22, 0x50, + 0x27, 0xf1, 0xe7, 0x62, 0xa9, 0x00, 0x5a, 0x61, 0x2e, 0xfa, 0xfe, 0x16, 0xd8, 0xe0, 0xe7, 0x66, + 0x17, 0xda, 0xb8, 0x0c, 0xa6, 0x04, 0x8d, 0xf8, 0x21, 0x68, 0x39 +}; + +static UCHAR rsaHash[] = +{ + 0x96, 0x1f, 0xa6, 0x49, 0x58, 0x81, 0x8f, 0x76, 0x77, 0x07, 0x07, 0x27, 0x55, 0xd7, 0x01, 0x8d, + 0xcd, 0x27, 0x8e, 0x94 +}; + +static UCHAR rsaSignature[] = +{ + 0xa8, 0x3a, 0x9d, 0xaf, 0x92, 0x94, 0xa4, 0x4d, 0x34, 0xba, 0x41, 0x0c, 0xc1, 0x23, 0x91, 0xc7, + 0x91, 0xa8, 0xf8, 0xfc, 0x94, 0x87, 0x4d, 0x05, 0x85, 0x63, 0xe8, 0x7d, 0xea, 0x7f, 0x6b, 0x8d, + 0xbb, 0x9a, 0xd4, 0x46, 0xa6, 0xc0, 0xd6, 0xdc, 0x91, 0xba, 0xd3, 0x1a, 0xbf, 0xf4, 0x52, 0xa0, + 0xc7, 0x15, 0x87, 0xe9, 0x1e, 0x60, 0x49, 0x9c, 0xee, 0x5a, 0x9c, 0x6c, 0xbd, 0x7a, 0x3e, 0xc3, + 0x48, 0xb3, 0xee, 0xca, 0x68, 0x40, 0x9b, 0xa1, 0x4c, 0x6e, 0x20, 0xd6, 0xca, 0x6c, 0x72, 0xaf, + 0x2b, 0x6b, 0x62, 0x7c, 0x78, 0x06, 0x94, 0x4c, 0x02, 0xf3, 0x8d, 0x49, 0xe0, 0x11, 0xc4, 0x9b, + 0x62, 0x5b, 0xc2, 0xfd, 0x68, 0xf4, 0x07, 0x15, 0x71, 0x11, 0x4c, 0x35, 0x97, 0x5d, 0xc0, 0xe6, + 0x22, 0xc9, 0x8a, 0x7b, 0x96, 0xc9, 0xc3, 0xe4, 0x2b, 0x1e, 0x88, 0x17, 0x4f, 0x98, 0x9b, 0xf3, + 0x42, 0x23, 0x0c, 0xa0, 0xfa, 0x19, 0x03, 0x2a, 0xf7, 0x13, 0x2d, 0x27, 0xac, 0x9f, 0xaf, 0x2d, + 0xa3, 0xce, 0xf7, 0x63, 0xbb, 0x39, 0x9f, 0x72, 0x80, 0xdd, 0x6c, 0x73, 0x00, 0x85, 0x70, 0xf2, + 0xed, 0x50, 0xed, 0xa0, 0x74, 0x42, 0xd7, 0x22, 0x46, 0x24, 0xee, 0x67, 0xdf, 0xb5, 0x45, 0xe8, + 0x49, 0xf4, 0x9c, 0xe4, 0x00, 0x83, 0xf2, 0x27, 0x8e, 0xa2, 0xb1, 0xc3, 0xc2, 0x01, 0xd7, 0x59, + 0x2e, 0x4d, 0xac, 0x49, 0xa2, 0xc1, 0x8d, 0x88, 0x4b, 0xfe, 0x28, 0xe5, 0xac, 0xa6, 0x85, 0xc4, + 0x1f, 0xf8, 0xc5, 0xc5, 0x14, 0x4e, 0xa3, 0xcb, 0x17, 0xb7, 0x64, 0xb3, 0xc2, 0x12, 0xf8, 0xf8, + 0x36, 0x99, 0x1c, 0x91, 0x9b, 0xbd, 0xed, 0x55, 0x0f, 0xfd, 0x49, 0x85, 0xbb, 0x32, 0xad, 0x78, + 0xc1, 0x74, 0xe6, 0x7c, 0x18, 0x0f, 0x2b, 0x3b, 0xaa, 0xd1, 0x9d, 0x40, 0x71, 0x1d, 0x19, 0x53 +}; + +static void test_RSA(void) +{ + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg = NULL; + BCRYPT_KEY_HANDLE key = NULL; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("Failed to open RSA provider: %08x, skipping test\n", ret); + return; + } + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "pBCryptImportKeyPair failed: %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(!ret, "pBCryptVerifySignature failed: %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + ret = pBCryptVerifySignature(key, NULL, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), 0); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", ret); + + pad.pszAlgId = BCRYPT_AES_ALGORITHM; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_NOT_SUPPORTED, "Expected STATUS_NOT_SUPPORTED, got %08x\n", ret); + + pad.pszAlgId = NULL; + ret = pBCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -1538,6 +1632,7 @@ START_TEST(bcrypt) test_BCryptDecrypt(); test_key_import_export(); test_ECDSA(); + test_RSA(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); -- 1.9.1

1 0

[PATCH 4/6] bcrypt: Initial implementation for RSA key import and signature verification.
by Alistair Leslie-Hughes 26 Mar '18

26 Mar '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 128 ++++++++++++++++++++++++++++++++++++++++++---- include/bcrypt.h | 17 ++++++ 2 files changed, 135 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ee6c211..2dd588a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -77,6 +77,9 @@ static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t key, gnutls_sign_algor unsigned int flags, const gnutls_datum_t *hash, const gnutls_datum_t *signature); +/* Not present in gnutls version < 2.11.0 */ +static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -120,6 +123,11 @@ static int compat_gnutls_pubkey_verify_hash2(gnutls_pubkey_t key, gnutls_sign_al return GNUTLS_E_UNKNOWN_CIPHER_TYPE; } +static int compat_gnutls_pubkey_import_rsa_raw(gnutls_pubkey_t key, const gnutls_datum_t *m, const gnutls_datum_t *e) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -186,6 +194,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_pubkey_verify_hash2 not found\n"); pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; } + if (!(pgnutls_pubkey_import_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw", NULL, 0 ))) + { + WARN("gnutls_pubkey_import_rsa_raw not found\n"); + pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; + } if (TRACE_ON( bcrypt )) { @@ -271,6 +284,7 @@ enum alg_id ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, + ALG_ID_RSA, ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, @@ -301,6 +315,7 @@ static const struct { /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM, FALSE }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM, FALSE }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM, FALSE }, + /* ALG_ID_RSA */ { 0, 0, 0, BCRYPT_RSA_ALGORITHM, FALSE }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM, FALSE }, /* ALG_ID_SHA256 */ { 286, 32, 512, BCRYPT_SHA256_ALGORITHM, FALSE }, /* ALG_ID_SHA384 */ { 382, 48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE }, @@ -378,6 +393,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; + else if (!strcmpW( id, BCRYPT_RSA_ALGORITHM )) alg_id = ALG_ID_RSA; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; @@ -1080,6 +1096,7 @@ static NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, con { case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: + case ALG_ID_RSA: break; default: @@ -1419,6 +1436,34 @@ static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnut return STATUS_SUCCESS; } +static NTSTATUS import_gnutls_pubkey_rsa( struct key *key, gnutls_pubkey_t *gnutls_key ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob; + gnutls_datum_t m, e; + int ret; + + if ((ret = pgnutls_pubkey_init( gnutls_key ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + rsa_blob = (BCRYPT_RSAKEY_BLOB *)key->u.a.pubkey; + e.data = key->u.a.pubkey + sizeof(*rsa_blob); + e.size = rsa_blob->cbPublicExp; + m.data = key->u.a.pubkey + sizeof(*rsa_blob) + rsa_blob->cbPublicExp; + m.size = rsa_blob->cbModulus; + + if ((ret = pgnutls_pubkey_import_rsa_raw( *gnutls_key, &m, &e ))) + { + pgnutls_perror( ret ); + pgnutls_pubkey_deinit( *gnutls_key ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_key) { switch (key->alg_id) @@ -1426,6 +1471,8 @@ static NTSTATUS import_gnutls_pubkey( struct key *key, gnutls_pubkey_t *gnutls_ case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: return import_gnutls_pubkey_ecc( key, gnutls_key ); + case ALG_ID_RSA: + return import_gnutls_pubkey_rsa( key, gnutls_key ); default: FIXME("Algorithm %d not yet supported\n", key->alg_id); @@ -1455,6 +1502,14 @@ static NTSTATUS prepare_gnutls_signature_ecc( struct key *key, UCHAR *signature, return STATUS_SUCCESS; } +static NTSTATUS prepare_gnutls_signature_rsa( struct key *key, UCHAR *signature, ULONG signature_len, + gnutls_datum_t *gnutls_signature ) +{ + gnutls_signature->data = signature; + gnutls_signature->size = signature_len; + return STATUS_SUCCESS; +} + static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULONG signature_len, gnutls_datum_t *gnutls_signature ) { @@ -1463,6 +1518,8 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO case ALG_ID_ECDSA_P256: case ALG_ID_ECDSA_P384: return prepare_gnutls_signature_ecc( key, signature, signature_len, gnutls_signature ); + case ALG_ID_RSA: + return prepare_gnutls_signature_rsa( key, signature, signature_len, gnutls_signature ); default: FIXME( "Algorithm %d not yet supported\n", key->alg_id ); @@ -1481,18 +1538,38 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha NTSTATUS status; int ret; - if (flags) - FIXME( "Flags %08x not supported\n", flags ); + if (key->alg_id == ALG_ID_RSA) + { + BCRYPT_PKCS1_PADDING_INFO *pinfo = (BCRYPT_PKCS1_PADDING_INFO *)padding; - /* only the hash size must match, not the actual hash function */ - switch (hash_len) + if (!(flags & BCRYPT_PAD_PKCS1) || !pinfo) return STATUS_INVALID_PARAMETER; + if (!pinfo->pszAlgId) return STATUS_INVALID_SIGNATURE; + + if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA1_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA1; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA256_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA256; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA384_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA384; + else if (!strcmpW( pinfo->pszAlgId, BCRYPT_SHA512_ALGORITHM )) hash_algo = GNUTLS_DIG_SHA512; + else + { + FIXME( "Hash algorithm %s not supported\n", debugstr_w(pinfo->pszAlgId) ); + return STATUS_NOT_SUPPORTED; + } + } + else { - case 32: hash_algo = GNUTLS_DIG_SHA256; break; - case 48: hash_algo = GNUTLS_DIG_SHA384; break; + if (flags) + FIXME( "Flags %08x not supported\n", flags ); - default: - FIXME( "Hash size %u not yet supported\n", hash_len ); - return STATUS_INVALID_SIGNATURE; + /* only the hash size must match, not the actual hash function */ + switch (hash_len) + { + case 32: hash_algo = GNUTLS_DIG_SHA256; break; + case 48: hash_algo = GNUTLS_DIG_SHA384; break; + + default: + FIXME( "Hash size %u not yet supported\n", hash_len ); + return STATUS_INVALID_SIGNATURE; + } } switch (key->alg_id) @@ -1501,6 +1578,9 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha case ALG_ID_ECDSA_P384: pk_algo = GNUTLS_PK_ECC; break; + case ALG_ID_RSA: + pk_algo = GNUTLS_PK_RSA; + break; default: FIXME( "Algorithm %d not yet supported\n", key->alg_id ); @@ -1526,7 +1606,8 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha gnutls_hash.size = hash_len; ret = pgnutls_pubkey_verify_hash2( gnutls_key, sign_algo, 0, &gnutls_hash, &gnutls_signature ); - heap_free( gnutls_signature.data ); + if (gnutls_signature.data != signature) + heap_free( gnutls_signature.data ); pgnutls_pubkey_deinit( gnutls_key ); return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } @@ -1986,6 +2067,33 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN *ret_key = key; return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + { + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + + if (input_len < sizeof(*rsa_blob)) + return STATUS_INVALID_PARAMETER; + + if (alg->id != ALG_ID_RSA) + return STATUS_NOT_SUPPORTED; + + if (rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; + + if (!(key = heap_alloc( sizeof(*key) ))) + return STATUS_NO_MEMORY; + + key->hdr.magic = MAGIC_KEY; + if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, + sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus ))) + { + heap_free( key ); + return status; + } + + *ret_key = key; + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_SUPPORTED; diff --git a/include/bcrypt.h b/include/bcrypt.h index f28b0d3..df54f62 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -63,6 +63,8 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} #define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} #define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} +#define BCRYPT_RSAPUBLIC_BLOB (const WCHAR []){'R','S','A','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_RSAPRIVATE_BLOB (const WCHAR []){'R','S','A','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -74,6 +76,7 @@ typedef LONG NTSTATUS; #define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} +#define BCRYPT_RSA_ALGORITHM (const WCHAR []){'R','S','A',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} @@ -133,6 +136,20 @@ typedef struct _BCRYPT_ECCKEY_BLOB ULONG cbKey; } BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; +#define BCRYPT_RSAPUBLIC_MAGIC 0x31415352 +#define BCRYPT_RSAPRIVATE_MAGIC 0x32415352 +#define BCRYPT_RSAFULLPRIVATE_MAGIC 0x33415352 + +typedef struct _BCRYPT_RSAKEY_BLOB +{ + ULONG Magic; + ULONG BitLength; + ULONG cbPublicExp; + ULONG cbModulus; + ULONG cbPrime1; + ULONG cbPrime2; +} BCRYPT_RSAKEY_BLOB; + typedef struct _BCRYPT_PKCS1_PADDING_INFO { LPCWSTR pszAlgId; -- 1.9.1

1 0