From e91d30d5ce2407fa57d7e809c1b7c5e6f63f7aa6 Mon Sep 17 00:00:00 2001 From: Elaine Houha Date: Fri, 28 May 2021 17:56:39 -0700 Subject: updated driver signing to SHA256 --- network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj | 12 ++++++++++++ network/trans/WFPSampler/syslib/WFPSampler.vcxproj | 12 ++++++++++++ network/trans/ddproxy/sys/ddproxy.vcxproj | 12 ++++++++++++ network/trans/inspect/sys/inspect.vcxproj | 12 ++++++++++++ network/trans/stmedit/sys/stmedit.vcxproj | 12 ++++++++++++ 5 files changed, 60 insertions(+) diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj index ef8b57f3..8e69a8a0 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj @@ -201,24 +201,36 @@ + + sha256 + + + sha256 + + + sha256 + + + sha256 + diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj index e0a0f007..dd6c1a42 100644 --- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj @@ -121,6 +121,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + sha256 + @@ -142,6 +145,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + sha256 + @@ -163,6 +169,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + sha256 + @@ -184,6 +193,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + sha256 + diff --git a/network/trans/ddproxy/sys/ddproxy.vcxproj b/network/trans/ddproxy/sys/ddproxy.vcxproj index 4e2da962..db813981 100644 --- a/network/trans/ddproxy/sys/ddproxy.vcxproj +++ b/network/trans/ddproxy/sys/ddproxy.vcxproj @@ -106,6 +106,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -125,6 +128,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -144,6 +150,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -163,6 +172,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + diff --git a/network/trans/inspect/sys/inspect.vcxproj b/network/trans/inspect/sys/inspect.vcxproj index 2115972e..25d857e3 100644 --- a/network/trans/inspect/sys/inspect.vcxproj +++ b/network/trans/inspect/sys/inspect.vcxproj @@ -106,6 +106,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -125,6 +128,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -144,6 +150,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -163,6 +172,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + diff --git a/network/trans/stmedit/sys/stmedit.vcxproj b/network/trans/stmedit/sys/stmedit.vcxproj index 7617ad5d..d3edd451 100644 --- a/network/trans/stmedit/sys/stmedit.vcxproj +++ b/network/trans/stmedit/sys/stmedit.vcxproj @@ -113,6 +113,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -136,6 +139,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -159,6 +165,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -182,6 +191,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\ndis.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + -- cgit v1.3.1 From 0effef0b7b0483fe37a52a2979c121faf45bc937 Mon Sep 17 00:00:00 2001 From: Elaine Houha Date: Fri, 28 May 2021 18:04:44 -0700 Subject: added msnmntr.vcxpoj --- network/trans/msnmntr/sys/msnmntr.vcxproj | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/network/trans/msnmntr/sys/msnmntr.vcxproj b/network/trans/msnmntr/sys/msnmntr.vcxproj index 07458206..3ffcf750 100644 --- a/network/trans/msnmntr/sys/msnmntr.vcxproj +++ b/network/trans/msnmntr/sys/msnmntr.vcxproj @@ -25,6 +25,7 @@ Debug Win32 {E5A95292-DFAE-41E4-A0B2-62D97EC6575F} + 10.0 @@ -32,7 +33,7 @@ False Desktop KMDF - WindowsKernelModeDriver10.0 + v142 Driver @@ -40,7 +41,7 @@ True Desktop KMDF - WindowsKernelModeDriver10.0 + v142 Driver @@ -48,7 +49,7 @@ False Desktop KMDF - WindowsKernelModeDriver10.0 + v142 Driver @@ -56,7 +57,7 @@ True Desktop KMDF - WindowsKernelModeDriver10.0 + v142 Driver @@ -97,7 +98,7 @@ true Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc + C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.18362.0\km;%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO @@ -113,6 +114,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -134,12 +138,15 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + true Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc + C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.18362.0\km;%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO @@ -155,6 +162,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -176,6 +186,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\wdmsec.lib;$(DDK_LIB_PATH)\fwpkclnt.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + -- cgit v1.3.1 From 057b3f8c951ec7790834832e8e736aace0dd2b8c Mon Sep 17 00:00:00 2001 From: Nikhil Bhansali Date: Tue, 1 Jun 2021 15:43:50 -0700 Subject: update wdi samples to use sha256 --- network/wlan/WDI/COMMON/common.vcxproj | 26 +++- network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj | 132 ++++++++++++++++++++- .../wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj | 130 ++++++++++++++++++++ 3 files changed, 283 insertions(+), 5 deletions(-) diff --git a/network/wlan/WDI/COMMON/common.vcxproj b/network/wlan/WDI/COMMON/common.vcxproj index e86697c2..339f1c94 100644 --- a/network/wlan/WDI/COMMON/common.vcxproj +++ b/network/wlan/WDI/COMMON/common.vcxproj @@ -185,6 +185,9 @@ false + + sha256 + @@ -231,6 +234,9 @@ false + + sha256 + @@ -275,6 +281,9 @@ false + + sha256 + @@ -327,6 +336,9 @@ false + + sha256 + @@ -372,6 +384,9 @@ false + + sha256 + @@ -417,6 +432,9 @@ false + + sha256 + @@ -487,10 +505,10 @@ - - - - + + + + diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj index a8432de0..963ab013 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj +++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj @@ -382,6 +382,9 @@ true false + + sha256 + @@ -438,6 +441,9 @@ false + + sha256 + @@ -486,6 +492,9 @@ false + + sha256 + @@ -534,6 +543,21 @@ false + + sha256 + + + sha256 + + + sha256 + + + sha256 + + + sha256 + @@ -584,6 +608,9 @@ false + + sha256 + @@ -634,6 +661,109 @@ false + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + @@ -750,4 +880,4 @@ - + \ No newline at end of file diff --git a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj index 70ae9f7b..112e7ea9 100644 --- a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj +++ b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj @@ -337,6 +337,9 @@ false + + sha256 + @@ -388,6 +391,9 @@ _X86_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) true + + sha256 + @@ -433,6 +439,9 @@ false + + sha256 + @@ -478,6 +487,21 @@ false + + sha256 + + + sha256 + + + sha256 + + + sha256 + + + sha256 + @@ -525,6 +549,9 @@ false + + sha256 + @@ -572,6 +599,109 @@ false + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + -- cgit v1.3.1 From 3a8798c428bfc2319fce3ab669c1953787b46456 Mon Sep 17 00:00:00 2001 From: Vincent Tam Date: Fri, 4 Jun 2021 14:46:58 -0700 Subject: Update WPD samples to use sha256 --- wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.vcxproj | 12 ++++++++++++ wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.vcxproj | 12 ++++++++++++ wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.vcxproj | 12 ++++++++++++ wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj | 12 ++++++++++++ wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.vcxproj | 12 ++++++++++++ 5 files changed, 60 insertions(+) diff --git a/wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.vcxproj b/wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.vcxproj index 2b702c2c..e7c78060 100644 --- a/wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.vcxproj +++ b/wpd/WpdBasicHardwareDriver/WpdBasicHardwareDriver.vcxproj @@ -298,21 +298,33 @@ WpdBasicHardwareDriver.def + + sha256 + WpdBasicHardwareDriver.def + + sha256 + WpdBasicHardwareDriver.def + + sha256 + WpdBasicHardwareDriver.def + + sha256 + diff --git a/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.vcxproj b/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.vcxproj index b4e3abf3..f1b1acf4 100644 --- a/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.vcxproj +++ b/wpd/WpdHelloWorldDriver/WpdHelloWorldDriver.vcxproj @@ -289,6 +289,9 @@ + + sha256 + @@ -298,6 +301,9 @@ + + sha256 + @@ -307,6 +313,9 @@ + + sha256 + @@ -316,6 +325,9 @@ + + sha256 + diff --git a/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.vcxproj b/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.vcxproj index 3f9d569f..4ba4e066 100644 --- a/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.vcxproj +++ b/wpd/WpdMultiTransportDriver/WpdMultiTransportDriver.vcxproj @@ -289,6 +289,9 @@ + + sha256 + @@ -298,6 +301,9 @@ + + sha256 + @@ -307,6 +313,9 @@ + + sha256 + @@ -316,6 +325,9 @@ + + sha256 + diff --git a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj index 32f13756..6b16f927 100644 --- a/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj +++ b/wpd/WpdServiceSampleDriver/WpdServiceSampleDriver.vcxproj @@ -406,21 +406,33 @@ WpdServiceSampleDriver.def + + sha256 + WpdServiceSampleDriver.def + + sha256 + WpdServiceSampleDriver.def + + sha256 + WpdServiceSampleDriver.def + + sha256 + diff --git a/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.vcxproj b/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.vcxproj index 8ba519cd..3e575c04 100644 --- a/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.vcxproj +++ b/wpd/WpdWudfSampleDriver/WpdWudfSampleDriver.vcxproj @@ -364,21 +364,33 @@ WpdWudfSampleDriver.def + + sha256 + WpdWudfSampleDriver.def + + sha256 + WpdWudfSampleDriver.def + + sha256 + WpdWudfSampleDriver.def + + sha256 + -- cgit v1.3.1 From 8ad1f8528df8a3bcd11330ac4e0e7a911911bffd Mon Sep 17 00:00:00 2001 From: Elaine Houha Date: Tue, 8 Jun 2021 12:54:33 -0700 Subject: cleaned up msnmtr.vcxproj to only have sha256 changes --- network/trans/msnmntr/sys/msnmntr.vcxproj | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/network/trans/msnmntr/sys/msnmntr.vcxproj b/network/trans/msnmntr/sys/msnmntr.vcxproj index 3ffcf750..c463275e 100644 --- a/network/trans/msnmntr/sys/msnmntr.vcxproj +++ b/network/trans/msnmntr/sys/msnmntr.vcxproj @@ -25,7 +25,6 @@ Debug Win32 {E5A95292-DFAE-41E4-A0B2-62D97EC6575F} - 10.0 @@ -33,7 +32,7 @@ False Desktop KMDF - v142 + WindowsKernelModeDriver10.0 Driver @@ -41,7 +40,7 @@ True Desktop KMDF - v142 + WindowsKernelModeDriver10.0 Driver @@ -49,7 +48,7 @@ False Desktop KMDF - v142 + WindowsKernelModeDriver10.0 Driver @@ -57,7 +56,7 @@ True Desktop KMDF - v142 + WindowsKernelModeDriver10.0 Driver @@ -98,7 +97,7 @@ true Level4 - C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.18362.0\km;%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO @@ -122,10 +121,11 @@ true Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO + C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\km + MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc @@ -146,10 +146,11 @@ true Level4 - C:\Program Files %28x86%29\Windows Kits\10\Include\10.0.18362.0\km;%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc + MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc @@ -170,10 +171,11 @@ true Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO + C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\km + MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc -- cgit v1.3.1 From aa7f6d717eb6bd5a24ac070e69fca892c337c019 Mon Sep 17 00:00:00 2001 From: Elaine Houha Date: Tue, 8 Jun 2021 13:00:41 -0700 Subject: clean pt2 --- network/trans/msnmntr/sys/msnmntr.vcxproj | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/network/trans/msnmntr/sys/msnmntr.vcxproj b/network/trans/msnmntr/sys/msnmntr.vcxproj index c463275e..19091c05 100644 --- a/network/trans/msnmntr/sys/msnmntr.vcxproj +++ b/network/trans/msnmntr/sys/msnmntr.vcxproj @@ -121,11 +121,10 @@ true Level4 + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO - C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\km - MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc @@ -146,11 +145,10 @@ true Level4 + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc - MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc @@ -171,11 +169,10 @@ true Level4 + %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc %(PreprocessorDefinitions);BINARY_COMPATIBLE=0;NT;UNICODE;_UNICODE;NDIS60;NDIS_SUPPORT_NDIS6;POOL_NX_OPTIN_AUTO - C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\km - MultiThreaded %(AdditionalIncludeDirectories);$(DDK_INC_PATH);..\inc -- cgit v1.3.1 From 3827effc41b508a489946dddff199555f0aafb8c Mon Sep 17 00:00:00 2001 From: Vincent Tam Date: Thu, 10 Jun 2021 18:32:07 -0700 Subject: sha256 signing --- .../SampleMagneticStripeReaderDrv.vcxproj | 12 ++++++++++++ pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj index 455019ce..12bd50c0 100644 --- a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj +++ b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.vcxproj @@ -261,24 +261,36 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + diff --git a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj index 715a7b17..bc5f2bec 100644 --- a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj +++ b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.vcxproj @@ -261,24 +261,36 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + %(AdditionalDependencies);$(SDK_LIB_PATH)\pos\1.1\poscxstub.lib exports.def + + sha256 + -- cgit v1.3.1 From c5e8e568787b1351d1811021c7bfab3b3df53cfa Mon Sep 17 00:00:00 2001 From: msofipm Date: Wed, 16 Jun 2021 11:12:34 -0700 Subject: Changing driver signing to sha256. --- biometrics/Package/package.VcxProj | 20 +++++++++++++++- biometrics/driver/WudfBioUsbSample.vcxproj | 12 ++++++++++ biometrics/driver/WudfBioUsbSample.vcxproj.Filters | 28 +++++++++++++++++++--- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/biometrics/Package/package.VcxProj b/biometrics/Package/package.VcxProj index 84e00f57..fb98576d 100644 --- a/biometrics/Package/package.VcxProj +++ b/biometrics/Package/package.VcxProj @@ -85,7 +85,25 @@ 133563 - + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + diff --git a/biometrics/driver/WudfBioUsbSample.vcxproj b/biometrics/driver/WudfBioUsbSample.vcxproj index b1a9a989..c54af93e 100644 --- a/biometrics/driver/WudfBioUsbSample.vcxproj +++ b/biometrics/driver/WudfBioUsbSample.vcxproj @@ -238,6 +238,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\uuid.lib exports.def + + sha256 + @@ -255,6 +258,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\uuid.lib exports.def + + sha256 + @@ -272,6 +278,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\uuid.lib exports.def + + sha256 + @@ -289,6 +298,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\uuid.lib exports.def + + sha256 + diff --git a/biometrics/driver/WudfBioUsbSample.vcxproj.Filters b/biometrics/driver/WudfBioUsbSample.vcxproj.Filters index c663a7e0..f4bbd976 100644 --- a/biometrics/driver/WudfBioUsbSample.vcxproj.Filters +++ b/biometrics/driver/WudfBioUsbSample.vcxproj.Filters @@ -34,9 +34,6 @@ Source Files - - Source Files - @@ -48,4 +45,29 @@ Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file -- cgit v1.3.1 From 3e68a1cabaaf12d7bbff7ef868ecd6203868d778 Mon Sep 17 00:00:00 2001 From: Andrew Dancy Date: Mon, 21 Jun 2021 23:09:10 +0100 Subject: Correct signing digest Fix bug where signing digest had incorrectly been stated as sha265 instead of sha256 --- avstream/avscamera/sys/AvsCamera.vcxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/avstream/avscamera/sys/AvsCamera.vcxproj b/avstream/avscamera/sys/AvsCamera.vcxproj index 3c78ef44..5456ee7a 100644 --- a/avstream/avscamera/sys/AvsCamera.vcxproj +++ b/avstream/avscamera/sys/AvsCamera.vcxproj @@ -168,7 +168,7 @@ %(AdditionalOptions) -merge:PAGECONST=PAGE - sha265 + sha256 @@ -182,7 +182,7 @@ %(AdditionalOptions) -merge:PAGECONST=PAGE - sha265 + sha256 @@ -196,7 +196,7 @@ %(AdditionalOptions) -merge:PAGECONST=PAGE - sha265 + sha256 @@ -210,7 +210,7 @@ %(AdditionalOptions) -merge:PAGECONST=PAGE - sha265 + sha256 @@ -256,4 +256,4 @@ - \ No newline at end of file + -- cgit v1.3.1 From dd3f3f0dba2c495ca3b146afe9dc08dddf03c881 Mon Sep 17 00:00:00 2001 From: Tom Molenhouse Date: Mon, 28 Jun 2021 18:22:14 -0700 Subject: Update switch extension samples to use SHA256 driver signing --- network/ndis/extension/base/sxbase.vcxproj | 6 ++++++ network/ndis/extension/samples/forward/msforwardext.vcxproj | 12 ++++++++++++ .../extension/samples/passthrough/mspassthroughext.vcxproj | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/network/ndis/extension/base/sxbase.vcxproj b/network/ndis/extension/base/sxbase.vcxproj index 47c5be68..40b69bc3 100644 --- a/network/ndis/extension/base/sxbase.vcxproj +++ b/network/ndis/extension/base/sxbase.vcxproj @@ -71,6 +71,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + sha256 + @@ -92,6 +95,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + sha256 + diff --git a/network/ndis/extension/samples/forward/msforwardext.vcxproj b/network/ndis/extension/samples/forward/msforwardext.vcxproj index 589a0857..959386bc 100644 --- a/network/ndis/extension/samples/forward/msforwardext.vcxproj +++ b/network/ndis/extension/samples/forward/msforwardext.vcxproj @@ -61,6 +61,9 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + sha256 + @@ -72,6 +75,9 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 + + sha256 + @@ -83,6 +89,9 @@ + + sha256 + @@ -94,6 +103,9 @@ + + sha256 + diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj index e590510a..aaa7da8e 100644 --- a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj +++ b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj @@ -61,6 +61,9 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 + + sha256 + @@ -72,6 +75,9 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 + + sha256 + @@ -83,6 +89,9 @@ + + sha256 + @@ -94,6 +103,9 @@ + + sha256 + -- cgit v1.3.1 From 10e58e51f0cdc36509398a9873c638a719631999 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 14:37:56 -0700 Subject: Updated \TrEE\Miniport\TrEEMiniportSample.vcxproj to use SHA256 for signtool /FD --- TrEE/Miniport/TrEEMiniportSample.vcxproj | 12 ++++++++++++ TrEE/Miniport/TrEEMiniportSample.vcxproj.Filters | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/TrEE/Miniport/TrEEMiniportSample.vcxproj b/TrEE/Miniport/TrEEMiniportSample.vcxproj index 0876f610..f2ec5ea2 100644 --- a/TrEE/Miniport/TrEEMiniportSample.vcxproj +++ b/TrEE/Miniport/TrEEMiniportSample.vcxproj @@ -171,6 +171,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + sha256 + @@ -187,6 +190,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + sha256 + @@ -203,6 +209,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + sha256 + @@ -219,6 +228,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + sha256 + diff --git a/TrEE/Miniport/TrEEMiniportSample.vcxproj.Filters b/TrEE/Miniport/TrEEMiniportSample.vcxproj.Filters index 7a7caa08..20d76081 100644 --- a/TrEE/Miniport/TrEEMiniportSample.vcxproj.Filters +++ b/TrEE/Miniport/TrEEMiniportSample.vcxproj.Filters @@ -31,4 +31,14 @@ Resource Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file -- cgit v1.3.1 From d6b9a6eb86363db53c5851a6b4ac9454b9fe0b42 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 14:44:53 -0700 Subject: Updated \network\ndis Windows-driver-samples to use SHA256 --- network/ndis/extension/base/sxbase.vcxproj | 6 ++++++ network/ndis/extension/base/sxbase.vcxproj.Filters | 14 ++++++++++++++ .../extension/samples/forward/msforwardext.vcxproj | 6 ++++++ .../samples/forward/msforwardext.vcxproj.Filters | 13 +++++++++++++ .../samples/passthrough/mspassthroughext.vcxproj | 6 ++++++ .../passthrough/mspassthroughext.vcxproj.Filters | 10 ++++++++++ network/ndis/ndisprot_kmdf/Package/package.VcxProj | 20 +++++++++++++++++++- 7 files changed, 74 insertions(+), 1 deletion(-) diff --git a/network/ndis/extension/base/sxbase.vcxproj b/network/ndis/extension/base/sxbase.vcxproj index 47c5be68..40b69bc3 100644 --- a/network/ndis/extension/base/sxbase.vcxproj +++ b/network/ndis/extension/base/sxbase.vcxproj @@ -71,6 +71,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + sha256 + @@ -92,6 +95,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + sha256 + diff --git a/network/ndis/extension/base/sxbase.vcxproj.Filters b/network/ndis/extension/base/sxbase.vcxproj.Filters index 65b2b72a..4f30bc7e 100644 --- a/network/ndis/extension/base/sxbase.vcxproj.Filters +++ b/network/ndis/extension/base/sxbase.vcxproj.Filters @@ -29,4 +29,18 @@ Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/network/ndis/extension/samples/forward/msforwardext.vcxproj b/network/ndis/extension/samples/forward/msforwardext.vcxproj index 589a0857..e9fd2104 100644 --- a/network/ndis/extension/samples/forward/msforwardext.vcxproj +++ b/network/ndis/extension/samples/forward/msforwardext.vcxproj @@ -83,6 +83,9 @@ + + sha256 + @@ -94,6 +97,9 @@ + + sha256 + diff --git a/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters b/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters index 152d91cc..6d30bbd5 100644 --- a/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters +++ b/network/ndis/extension/samples/forward/msforwardext.vcxproj.Filters @@ -31,4 +31,17 @@ Resource Files + + + Header Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj index e590510a..63923333 100644 --- a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj +++ b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj @@ -83,6 +83,9 @@ + + sha256 + @@ -94,6 +97,9 @@ + + sha256 + diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters index 23d5b54c..12339f4b 100644 --- a/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters +++ b/network/ndis/extension/samples/passthrough/mspassthroughext.vcxproj.Filters @@ -31,4 +31,14 @@ Resource Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/network/ndis/ndisprot_kmdf/Package/package.VcxProj b/network/ndis/ndisprot_kmdf/Package/package.VcxProj index 44cbc9bb..a4c9990a 100644 --- a/network/ndis/ndisprot_kmdf/Package/package.VcxProj +++ b/network/ndis/ndisprot_kmdf/Package/package.VcxProj @@ -79,7 +79,25 @@ 133563 - + + + sha256 + + + + + sha256 + + + + + sha256 + + + + + sha256 + -- cgit v1.3.1 From 4b497194c3e8eb3a40876f51c34f3858d1a1e2a7 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 14:46:21 -0700 Subject: Updated \network\wsk\echosrv\ Windows-driver-samples to use SHA256 for signing --- network/wsk/echosrv/echosrv.vcxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/network/wsk/echosrv/echosrv.vcxproj b/network/wsk/echosrv/echosrv.vcxproj index 4a7ffe18..c97a2bae 100644 --- a/network/wsk/echosrv/echosrv.vcxproj +++ b/network/wsk/echosrv/echosrv.vcxproj @@ -113,6 +113,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\netio.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -131,6 +134,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\netio.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -149,6 +155,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\netio.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + @@ -167,6 +176,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\netio.lib;$(SDK_LIB_PATH)\uuid.lib + + sha256 + -- cgit v1.3.1 From cd6f93fb8866cbdfc63d0ea7932c5b483c17e899 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 14:47:26 -0700 Subject: Updated \security\ Windows-driver-samples to use SHA256 for signing --- security/elam/elamsample.vcxproj | 12 ++++++++++++ security/elam/elamsample.vcxproj.Filters | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/security/elam/elamsample.vcxproj b/security/elam/elamsample.vcxproj index 816d2f58..b0dcb931 100644 --- a/security/elam/elamsample.vcxproj +++ b/security/elam/elamsample.vcxproj @@ -95,6 +95,9 @@ + + sha256 + @@ -103,6 +106,9 @@ + + sha256 + @@ -111,6 +117,9 @@ + + sha256 + @@ -119,6 +128,9 @@ + + sha256 + diff --git a/security/elam/elamsample.vcxproj.Filters b/security/elam/elamsample.vcxproj.Filters index 40e0c9b1..7e95eac1 100644 --- a/security/elam/elamsample.vcxproj.Filters +++ b/security/elam/elamsample.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Header Files + + \ No newline at end of file -- cgit v1.3.1 From fdf1ed3b664e9966233ab9ebb001b69812919be7 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 14:53:56 -0700 Subject: Updated \general\ Windows-driver-samples to use SHA256 for signing --- general/SystemDma/wdm/sys/SDma.vcxproj | 12 ++++++++++++ general/SystemDma/wdm/sys/SDma.vcxproj.Filters | 5 +++++ general/cancel/startio/cancel.vcxproj | 12 ++++++++++++ general/cancel/startio/cancel.vcxproj.Filters | 5 +++++ general/cancel/sys/cancel.vcxproj | 12 ++++++++++++ general/cancel/sys/cancel.vcxproj.Filters | 5 +++++ general/event/wdm/event.vcxproj | 12 ++++++++++++ general/event/wdm/event.vcxproj.Filters | 8 ++++++++ general/ioctl/wdm/sys/sioctl.vcxproj | 12 ++++++++++++ general/ioctl/wdm/sys/sioctl.vcxproj.Filters | 5 +++++ general/obcallback/driver/ObCallbackTest.vcxproj | 12 ++++++++++++ general/obcallback/driver/ObCallbackTest.vcxproj.Filters | 11 +++++++++++ general/registry/regfltr/sys/regfltr.vcxproj | 12 ++++++++++++ general/registry/regfltr/sys/regfltr.vcxproj.Filters | 5 +++++ general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj | 12 ++++++++++++ general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters | 5 +++++ 16 files changed, 145 insertions(+) diff --git a/general/SystemDma/wdm/sys/SDma.vcxproj b/general/SystemDma/wdm/sys/SDma.vcxproj index 584a802f..76c512c3 100644 --- a/general/SystemDma/wdm/sys/SDma.vcxproj +++ b/general/SystemDma/wdm/sys/SDma.vcxproj @@ -94,6 +94,9 @@ + + sha256 + @@ -102,6 +105,9 @@ + + sha256 + @@ -110,6 +116,9 @@ + + sha256 + @@ -118,6 +127,9 @@ + + sha256 + diff --git a/general/SystemDma/wdm/sys/SDma.vcxproj.Filters b/general/SystemDma/wdm/sys/SDma.vcxproj.Filters index eaba14c6..e068c448 100644 --- a/general/SystemDma/wdm/sys/SDma.vcxproj.Filters +++ b/general/SystemDma/wdm/sys/SDma.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Header Files + + \ No newline at end of file diff --git a/general/cancel/startio/cancel.vcxproj b/general/cancel/startio/cancel.vcxproj index 6b0ea2b6..f94cee84 100644 --- a/general/cancel/startio/cancel.vcxproj +++ b/general/cancel/startio/cancel.vcxproj @@ -97,6 +97,9 @@ + + sha256 + @@ -108,6 +111,9 @@ + + sha256 + @@ -119,6 +125,9 @@ + + sha256 + @@ -130,6 +139,9 @@ + + sha256 + diff --git a/general/cancel/startio/cancel.vcxproj.Filters b/general/cancel/startio/cancel.vcxproj.Filters index 3b28a824..f2174f1d 100644 --- a/general/cancel/startio/cancel.vcxproj.Filters +++ b/general/cancel/startio/cancel.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Header Files + + \ No newline at end of file diff --git a/general/cancel/sys/cancel.vcxproj b/general/cancel/sys/cancel.vcxproj index 618fffad..d006ab5e 100644 --- a/general/cancel/sys/cancel.vcxproj +++ b/general/cancel/sys/cancel.vcxproj @@ -97,6 +97,9 @@ + + sha256 + @@ -108,6 +111,9 @@ + + sha256 + @@ -119,6 +125,9 @@ + + sha256 + @@ -130,6 +139,9 @@ + + sha256 + diff --git a/general/cancel/sys/cancel.vcxproj.Filters b/general/cancel/sys/cancel.vcxproj.Filters index b06bd1bb..d6e7bc5b 100644 --- a/general/cancel/sys/cancel.vcxproj.Filters +++ b/general/cancel/sys/cancel.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Header Files + + \ No newline at end of file diff --git a/general/event/wdm/event.vcxproj b/general/event/wdm/event.vcxproj index 507a3b57..d0903697 100644 --- a/general/event/wdm/event.vcxproj +++ b/general/event/wdm/event.vcxproj @@ -125,6 +125,9 @@ + + sha256 + @@ -132,6 +135,9 @@ + + sha256 + @@ -139,6 +145,9 @@ + + sha256 + @@ -146,6 +155,9 @@ + + sha256 + diff --git a/general/event/wdm/event.vcxproj.Filters b/general/event/wdm/event.vcxproj.Filters index 0b3ee89a..5addd5a6 100644 --- a/general/event/wdm/event.vcxproj.Filters +++ b/general/event/wdm/event.vcxproj.Filters @@ -28,4 +28,12 @@ Resource Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj b/general/ioctl/wdm/sys/sioctl.vcxproj index a5ac0ef3..66c2fe71 100644 --- a/general/ioctl/wdm/sys/sioctl.vcxproj +++ b/general/ioctl/wdm/sys/sioctl.vcxproj @@ -94,6 +94,9 @@ + + sha256 + @@ -102,6 +105,9 @@ + + sha256 + @@ -110,6 +116,9 @@ + + sha256 + @@ -118,6 +127,9 @@ + + sha256 + diff --git a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters b/general/ioctl/wdm/sys/sioctl.vcxproj.Filters index 2a2486b1..2b3faa48 100644 --- a/general/ioctl/wdm/sys/sioctl.vcxproj.Filters +++ b/general/ioctl/wdm/sys/sioctl.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Header Files + + \ No newline at end of file diff --git a/general/obcallback/driver/ObCallbackTest.vcxproj b/general/obcallback/driver/ObCallbackTest.vcxproj index 8f0bced2..4f5c92d6 100644 --- a/general/obcallback/driver/ObCallbackTest.vcxproj +++ b/general/obcallback/driver/ObCallbackTest.vcxproj @@ -106,6 +106,9 @@ %(AdditionalDependencies) %(AdditionalOptions) /INTEGRITYCHECK + + sha256 + @@ -126,6 +129,9 @@ %(AdditionalDependencies) %(AdditionalOptions) /INTEGRITYCHECK + + sha256 + @@ -146,6 +152,9 @@ %(AdditionalDependencies) %(AdditionalOptions) /INTEGRITYCHECK + + sha256 + @@ -166,6 +175,9 @@ %(AdditionalDependencies) %(AdditionalOptions) /INTEGRITYCHECK + + sha256 + diff --git a/general/obcallback/driver/ObCallbackTest.vcxproj.Filters b/general/obcallback/driver/ObCallbackTest.vcxproj.Filters index be41767d..b3f62ca9 100644 --- a/general/obcallback/driver/ObCallbackTest.vcxproj.Filters +++ b/general/obcallback/driver/ObCallbackTest.vcxproj.Filters @@ -32,4 +32,15 @@ Source Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/general/registry/regfltr/sys/regfltr.vcxproj b/general/registry/regfltr/sys/regfltr.vcxproj index 957be3ba..f3c350b5 100644 --- a/general/registry/regfltr/sys/regfltr.vcxproj +++ b/general/registry/regfltr/sys/regfltr.vcxproj @@ -178,24 +178,36 @@ + + sha256 + + + sha256 + + + sha256 + + + sha256 + diff --git a/general/registry/regfltr/sys/regfltr.vcxproj.Filters b/general/registry/regfltr/sys/regfltr.vcxproj.Filters index e03c3574..71ccc12d 100644 --- a/general/registry/regfltr/sys/regfltr.vcxproj.Filters +++ b/general/registry/regfltr/sys/regfltr.vcxproj.Filters @@ -58,4 +58,9 @@ Resource Files + + + Header Files + + \ No newline at end of file diff --git a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj index 7f6177a2..f919e046 100644 --- a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj +++ b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj @@ -159,24 +159,36 @@ + + sha256 + + + sha256 + + + sha256 + + + sha256 + diff --git a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters index e6756f28..7b4ff69d 100644 --- a/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters +++ b/general/tracing/evntdrv/Eventdrv/Eventdrv.vcxproj.Filters @@ -31,4 +31,9 @@ Source Files + + + Header Files + + \ No newline at end of file -- cgit v1.3.1 From 33dbc7e15111aaf7db652598d777da1b2fd48957 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 15:00:50 -0700 Subject: Updated \network\radio\HidSwitchDriverSample\ to use SHA256 for signing --- .../HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj | 12 ++++++++++++ .../RadioSwitchHidUsbFx2.vcxproj.Filters | 14 +++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj b/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj index 754c11c8..3b9df8db 100644 --- a/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj +++ b/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj @@ -143,24 +143,36 @@ + + sha256 + + + sha256 + + + sha256 + + + sha256 + diff --git a/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj.Filters b/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj.Filters index 9c0e4102..b8f7cb14 100644 --- a/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj.Filters +++ b/network/radio/HidSwitchDriverSample/RadioSwitchHidUsbFx2.vcxproj.Filters @@ -19,13 +19,13 @@ - + Source Files - + Source Files - + Source Files @@ -39,4 +39,12 @@ Resource Files + + + Header Files + + + Header Files + + \ No newline at end of file -- cgit v1.3.1 From 6f36eb69562712123918b1d9d6e3db6d8247b8e4 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 15:44:26 -0700 Subject: updated \storage\ Windows-driver-samples to use SHA256 for signing --- storage/class/classpnp/src/classpnp.vcxproj | 12 ++++++ .../class/classpnp/src/classpnp.vcxproj.Filters | 50 +++++++++++++--------- storage/class/disk/src/disk.vcxproj | 12 ++++++ storage/class/disk/src/disk.vcxproj.Filters | 20 ++++++--- storage/miniports/lsi_u3/src/lsi_u3.vcxproj | 12 ++++++ .../miniports/lsi_u3/src/lsi_u3.vcxproj.Filters | 28 ++++++++++++ .../miniports/storahci/src/inbox/storahci.vcxproj | 12 ++++++ storage/msdsm/src/SampleDSM.vcxproj | 12 ++++++ storage/msdsm/src/SampleDSM.vcxproj.Filters | 19 ++++++++ storage/sfloppy/src/sfloppy.vcxproj | 12 ++++++ storage/sfloppy/src/sfloppy.vcxproj.Filters | 5 +++ 11 files changed, 169 insertions(+), 25 deletions(-) diff --git a/storage/class/classpnp/src/classpnp.vcxproj b/storage/class/classpnp/src/classpnp.vcxproj index c2802197..2727ab87 100644 --- a/storage/class/classpnp/src/classpnp.vcxproj +++ b/storage/class/classpnp/src/classpnp.vcxproj @@ -243,6 +243,9 @@ class.def + + sha256 + @@ -259,6 +262,9 @@ class.def + + sha256 + @@ -275,6 +281,9 @@ class.def + + sha256 + @@ -291,6 +300,9 @@ class.def + + sha256 + diff --git a/storage/class/classpnp/src/classpnp.vcxproj.Filters b/storage/class/classpnp/src/classpnp.vcxproj.Filters index 93c2a79b..905f5e8d 100644 --- a/storage/class/classpnp/src/classpnp.vcxproj.Filters +++ b/storage/class/classpnp/src/classpnp.vcxproj.Filters @@ -19,60 +19,57 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files - @@ -84,4 +81,17 @@ Resource Files + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file diff --git a/storage/class/disk/src/disk.vcxproj b/storage/class/disk/src/disk.vcxproj index bc5efddb..a1e3cf5d 100644 --- a/storage/class/disk/src/disk.vcxproj +++ b/storage/class/disk/src/disk.vcxproj @@ -117,6 +117,9 @@ %(AdditionalIncludeDirectories);..\inc;..\..\inc;..\..\..\inc %(PreprocessorDefinitions);DEBUG_USE_KDPRINT + + sha256 + @@ -136,6 +139,9 @@ %(AdditionalIncludeDirectories);..\inc;..\..\inc;..\..\..\inc %(PreprocessorDefinitions);DEBUG_USE_KDPRINT + + sha256 + @@ -155,6 +161,9 @@ %(AdditionalIncludeDirectories);..\inc;..\..\inc;..\..\..\inc %(PreprocessorDefinitions);DEBUG_USE_KDPRINT + + sha256 + @@ -174,6 +183,9 @@ %(AdditionalIncludeDirectories);..\inc;..\..\inc;..\..\..\inc %(PreprocessorDefinitions);DEBUG_USE_KDPRINT + + sha256 + diff --git a/storage/class/disk/src/disk.vcxproj.Filters b/storage/class/disk/src/disk.vcxproj.Filters index 5c982e78..e43e6361 100644 --- a/storage/class/disk/src/disk.vcxproj.Filters +++ b/storage/class/disk/src/disk.vcxproj.Filters @@ -19,19 +19,19 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files @@ -40,4 +40,14 @@ Resource Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/storage/miniports/lsi_u3/src/lsi_u3.vcxproj b/storage/miniports/lsi_u3/src/lsi_u3.vcxproj index f9a2aff6..4c380734 100644 --- a/storage/miniports/lsi_u3/src/lsi_u3.vcxproj +++ b/storage/miniports/lsi_u3/src/lsi_u3.vcxproj @@ -105,6 +105,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -124,6 +127,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -143,6 +149,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -162,6 +171,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + diff --git a/storage/miniports/lsi_u3/src/lsi_u3.vcxproj.Filters b/storage/miniports/lsi_u3/src/lsi_u3.vcxproj.Filters index 066d765f..abb3ccfa 100644 --- a/storage/miniports/lsi_u3/src/lsi_u3.vcxproj.Filters +++ b/storage/miniports/lsi_u3/src/lsi_u3.vcxproj.Filters @@ -28,4 +28,32 @@ Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/storage/miniports/storahci/src/inbox/storahci.vcxproj b/storage/miniports/storahci/src/inbox/storahci.vcxproj index eb2e4f82..cd55b82a 100644 --- a/storage/miniports/storahci/src/inbox/storahci.vcxproj +++ b/storage/miniports/storahci/src/inbox/storahci.vcxproj @@ -111,6 +111,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -129,6 +132,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -147,6 +153,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + @@ -165,6 +174,9 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\storport.lib + + sha256 + diff --git a/storage/msdsm/src/SampleDSM.vcxproj b/storage/msdsm/src/SampleDSM.vcxproj index 9b5563f5..308353ca 100644 --- a/storage/msdsm/src/SampleDSM.vcxproj +++ b/storage/msdsm/src/SampleDSM.vcxproj @@ -207,6 +207,9 @@ %(AdditionalIncludeDirectories);..\inc %(PreprocessorDefinitions);_WIN2K_COMPAT_SLIST_USAGE + + sha256 + @@ -223,6 +226,9 @@ %(AdditionalIncludeDirectories);..\inc %(PreprocessorDefinitions);_WIN2K_COMPAT_SLIST_USAGE + + sha256 + @@ -239,6 +245,9 @@ %(AdditionalIncludeDirectories);..\inc %(PreprocessorDefinitions);_WIN2K_COMPAT_SLIST_USAGE + + sha256 + @@ -255,6 +264,9 @@ %(AdditionalIncludeDirectories);..\inc %(PreprocessorDefinitions);_WIN2K_COMPAT_SLIST_USAGE + + sha256 + diff --git a/storage/msdsm/src/SampleDSM.vcxproj.Filters b/storage/msdsm/src/SampleDSM.vcxproj.Filters index 5d097976..6ac143fd 100644 --- a/storage/msdsm/src/SampleDSM.vcxproj.Filters +++ b/storage/msdsm/src/SampleDSM.vcxproj.Filters @@ -48,4 +48,23 @@ Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Driver Files + + \ No newline at end of file diff --git a/storage/sfloppy/src/sfloppy.vcxproj b/storage/sfloppy/src/sfloppy.vcxproj index ee6e08f9..abcc78d0 100644 --- a/storage/sfloppy/src/sfloppy.vcxproj +++ b/storage/sfloppy/src/sfloppy.vcxproj @@ -105,6 +105,9 @@ %(AdditionalIncludeDirectories);..\inc + + sha256 + @@ -123,6 +126,9 @@ %(AdditionalIncludeDirectories);..\inc + + sha256 + @@ -141,6 +147,9 @@ %(AdditionalIncludeDirectories);..\inc + + sha256 + @@ -159,6 +168,9 @@ %(AdditionalIncludeDirectories);..\inc + + sha256 + diff --git a/storage/sfloppy/src/sfloppy.vcxproj.Filters b/storage/sfloppy/src/sfloppy.vcxproj.Filters index 3c28ea16..c1d47f3d 100644 --- a/storage/sfloppy/src/sfloppy.vcxproj.Filters +++ b/storage/sfloppy/src/sfloppy.vcxproj.Filters @@ -28,4 +28,9 @@ Resource Files + + + Driver Files + + \ No newline at end of file -- cgit v1.3.1 From 1ce6f90f082e6099dd8eefe2d2f035f663c88761 Mon Sep 17 00:00:00 2001 From: Jordan Geurten Date: Thu, 29 Jul 2021 15:51:37 -0700 Subject: Updated Github \nfc\ Windows-driver-samples to use SHA256 for signing --- nfp/net/driver/NetNfpProvider.vcxproj | 12 +++++++ nfp/net/driver/NetNfpProvider.vcxproj.Filters | 51 +++++++++++++++++++++------ 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/nfp/net/driver/NetNfpProvider.vcxproj b/nfp/net/driver/NetNfpProvider.vcxproj index 949f767c..f1a034aa 100644 --- a/nfp/net/driver/NetNfpProvider.vcxproj +++ b/nfp/net/driver/NetNfpProvider.vcxproj @@ -187,6 +187,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\Ws2_32.lib;$(SDK_LIB_PATH)\mswsock.lib exports.def + + sha256 + @@ -206,6 +209,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\Ws2_32.lib;$(SDK_LIB_PATH)\mswsock.lib exports.def + + sha256 + @@ -225,6 +231,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\Ws2_32.lib;$(SDK_LIB_PATH)\mswsock.lib exports.def + + sha256 + @@ -244,6 +253,9 @@ %(AdditionalDependencies);$(SDK_LIB_PATH)\user32.lib;$(SDK_LIB_PATH)\ole32.lib;$(SDK_LIB_PATH)\oleaut32.lib;$(SDK_LIB_PATH)\strsafe.lib;$(SDK_LIB_PATH)\kernel32.lib;$(SDK_LIB_PATH)\advapi32.lib;$(SDK_LIB_PATH)\Ws2_32.lib;$(SDK_LIB_PATH)\mswsock.lib exports.def + + sha256 + diff --git a/nfp/net/driver/NetNfpProvider.vcxproj.Filters b/nfp/net/driver/NetNfpProvider.vcxproj.Filters index ca52e089..d19c9067 100644 --- a/nfp/net/driver/NetNfpProvider.vcxproj.Filters +++ b/nfp/net/driver/NetNfpProvider.vcxproj.Filters @@ -19,30 +19,27 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - Source Files - @@ -54,4 +51,38 @@ Resource Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + \ No newline at end of file -- cgit v1.3.1 From f0adcda012820b1cd44a8b3a1953baf478029738 Mon Sep 17 00:00:00 2001 From: matwilli <39633852+matwilli@users.noreply.github.com> Date: Mon, 29 Nov 2021 12:59:10 -0800 Subject: Cumulative updates. (#674) Changing ExAllocatePoolWithTag to ExAllocatePool2 Disable the data role correction policy in UcmUcsiCx conditionally Copying ACPI shared memory locally on UCSI notification --- usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/Acpi.cpp | 84 +++++++++++++++++++--- .../UcmUcsiAcpiSample/MemoryKm.cpp | 5 +- 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/Acpi.cpp b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/Acpi.cpp index bca0e2f2..c65070d0 100644 --- a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/Acpi.cpp +++ b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/Acpi.cpp @@ -36,6 +36,7 @@ const ULONG UCSI_DSM_FUNCTION_SUPPORTED_FUNCTIONS_INDEX = 0x0; const ULONG UCSI_DSM_FUNCTION_SEND_DATA_INDEX = 0x1; const ULONG UCSI_DSM_FUNCTION_RECEIVE_DATA_INDEX = 0x2; const ULONG UCSI_DSM_FUNCTION_USB_DEVICE_CONTROLLER_STATUS_INDEX = 0x3; +const ULONG UCSI_DSM_FUNCTION_DISABLE_DATA_ROLE_CORRECTION_POLICY = 0x4; // // There is no formal requirement of timeout for _DMS method. 3 second timeout @@ -110,7 +111,8 @@ Acpi::PrepareHardware( m_UcsiDataBlock = (PUCSI_DATA_BLOCK) mappedMemory; m_MappedMemoryLength = Config->DataBlockLength; - version = m_UcsiDataBlock->UcsiVersion; + version.AsUInt16 = READ_REGISTER_USHORT(reinterpret_cast (&m_UcsiDataBlock->UcsiVersion)); + TRACE_INFO(TRACE_FLAG_PPM, "[Device: 0x%p] UCSI version Major: %hx Minor: %hx SubMinor: %hx", m_OwningDevice, version.MajorVersion, version.MinorVersion, version.SubMinorVersion); @@ -462,6 +464,7 @@ Acpi::CheckIfUsbDeviceControllerIsEnabled( { NTSTATUS status; PACPI_EVAL_OUTPUT_BUFFER output; + UCHAR supportFunctions; PAGED_CODE(); @@ -492,7 +495,64 @@ Acpi::CheckIfUsbDeviceControllerIsEnabled( goto Exit; } - if (!TEST_BIT(output->Argument[0].Data[0], UCSI_DSM_FUNCTION_USB_DEVICE_CONTROLLER_STATUS_INDEX)) + supportFunctions = output->Argument[0].Data[0]; + + // + // Free the buffer since we will reuse "output" to evaluate other UCSI DSM functions. + // + + delete[] output; + output = nullptr; + + + // + // First, check if the platform disables the OS policy of data role correction. + // If it's disabled, report UsbDeviceControllerEnabled==true to UcmUcsiCx, so that + // it will not initiate DR_SWAP when being UFP. + // + + if (TEST_BIT(supportFunctions, UCSI_DSM_FUNCTION_DISABLE_DATA_ROLE_CORRECTION_POLICY)) + { + status = EvaluateUcsiDsm(UCSI_DSM_FUNCTION_DISABLE_DATA_ROLE_CORRECTION_POLICY, &output); + if (!NT_SUCCESS(status)) + { + TRACE_ERROR(TRACE_FLAG_ACPI, "[Device: 0x%p] _DSM query for UCSI_DSM_FUNCTION_DISABLE_DATA_ROLE_CORRECTION_POLICY failed - %!STATUS!", m_OwningDevice, status); + goto Exit; + } + + if (output->Count != 1) + { + status = STATUS_ACPI_INVALID_DATA; + TRACE_ERROR(TRACE_FLAG_ACPI, "[Device: 0x%p] _DSM query for UCSI_DSM_FUNCTION_DISABLE_DATA_ROLE_CORRECTION_POLICY returned unexpected number of arguments %lu", m_OwningDevice, output->Count); + goto Exit; + } + + NT_ASSERT_ASSUME(output->Length == sizeof(ACPI_EVAL_OUTPUT_BUFFER)); + + if (output->Argument[0].Argument) + { + status = STATUS_SUCCESS; + IsUsbDeviceControllerEnabled = true; + TRACE_INFO(TRACE_FLAG_ACPI, "[Device: 0x%p] Data role correction policy disabled.", m_OwningDevice); + goto Exit; + } + + // + // Free the buffer since we may reuse "output" to evaluate another UCSI DSM function. + // + + delete[] output; + output = nullptr; + } + + // + // The platform hasn't disabled the OS policy for data role correction. Now, check + // if the platform has a USB device controller, and return the corresponding + // UsbDeviceControllerEnabled value for UcmUcsiCx to switch on/off the OS policy + // for data role correction. + // + + if (!TEST_BIT(supportFunctions, UCSI_DSM_FUNCTION_USB_DEVICE_CONTROLLER_STATUS_INDEX)) { // // The function to query whether the device controller is enabled is not supported. Assume @@ -507,9 +567,6 @@ Acpi::CheckIfUsbDeviceControllerIsEnabled( goto Exit; } - delete[] output; - output = nullptr; - status = EvaluateUcsiDsm(UCSI_DSM_FUNCTION_USB_DEVICE_CONTROLLER_STATUS_INDEX, &output); if (!NT_SUCCESS(status)) { @@ -637,8 +694,6 @@ Acpi::EvaluateUcsiDsm( goto Exit; } - RtlZeroMemory(outputBuffer, outputBufferSize); - WDF_MEMORY_DESCRIPTOR_INIT_HANDLE(&inputMemDesc, inputMemory, NULL); WDF_MEMORY_DESCRIPTOR_INIT_BUFFER(&outputMemDesc, outputBuffer, (ULONG) outputBufferSize); @@ -704,7 +759,18 @@ Acpi::SendData( TRACE_FUNC_ENTRY(TRACE_FLAG_ACPI); - m_UcsiDataBlock->Control = DataBlock->Control; +#if defined (_WIN64) + + WRITE_REGISTER_ULONG64(reinterpret_cast (&m_UcsiDataBlock->Control), + DataBlock->Control.AsUInt64); + +#else + + WRITE_REGISTER_BUFFER_ULONG(reinterpret_cast (&m_UcsiDataBlock->Control), + reinterpret_cast (&DataBlock->Control), + sizeof(m_UcsiDataBlock->Control) / sizeof(ULONG)); + +#endif status = EvaluateUcsiDsm(UCSI_DSM_FUNCTION_SEND_DATA_INDEX, nullptr); @@ -741,7 +807,7 @@ Acpi::ReceiveData ( // Right now there is no use case of copying the whole block. Just copying // CCI as of now since all the caller would want to know is whether the last // command has been completed. - DataBlockOut->CCI = m_UcsiDataBlock->CCI; + DataBlockOut->CCI.AsUInt32 = READ_REGISTER_ULONG(reinterpret_cast (&m_UcsiDataBlock->CCI)); Exit: diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/MemoryKm.cpp b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/MemoryKm.cpp index bec3f00e..8c895c27 100644 --- a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/MemoryKm.cpp +++ b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/MemoryKm.cpp @@ -44,7 +44,7 @@ operator new ( size_t size ) { - return ExAllocatePoolWithTag(NonPagedPoolNx, size, TAG_UCSI); + return ExAllocatePool2(POOL_FLAG_NON_PAGED, size, TAG_UCSI); } void* @@ -53,8 +53,7 @@ operator new[] ( size_t size ) { - return ExAllocatePoolWithTag(NonPagedPoolNx, size, TAG_UCSI); - + return ExAllocatePool2(POOL_FLAG_NON_PAGED, size, TAG_UCSI); } #endif -- cgit v1.3.1 From 4fb81dbfe57f347dd84c41becb4069c45171373a Mon Sep 17 00:00:00 2001 From: Phan Trinh Ha Date: Wed, 9 Mar 2022 16:14:32 -0800 Subject: Updating ExAllocatePoolWithTag security and additional PnpLockdown warning on build --- general/PLX9x5x/sys/Private.h | 4 +--- general/PLX9x5x/sys/pci9x5x.inx | Bin 5044 -> 5078 bytes serial/serenum/pnp.c | 20 ++++++++++---------- serial/serenum/serenum.c | 2 ++ serial/serenum/serenum.h | 2 ++ serial/serenum/string.c | 4 ++-- wmi/wmisamp/wmisamp.c | 6 ++++-- wmi/wmisamp/wmisamp.h | 1 + wmi/wmisamp/wmisamp.inx | Bin 6012 -> 6046 bytes 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/general/PLX9x5x/sys/Private.h b/general/PLX9x5x/sys/Private.h index 439551bb..3cce2edd 100644 --- a/general/PLX9x5x/sys/Private.h +++ b/general/PLX9x5x/sys/Private.h @@ -220,9 +220,7 @@ PLxInitializeDMA( ); #ifdef SIMULATE_MEMORY_FRAGMENTATION -// -// Passed to ExAllocatePoolWithTag to track memory allocations -// + #define POOL_TAG 'x5x9' // diff --git a/general/PLX9x5x/sys/pci9x5x.inx b/general/PLX9x5x/sys/pci9x5x.inx index 85e5df54..675a2a2c 100644 Binary files a/general/PLX9x5x/sys/pci9x5x.inx and b/general/PLX9x5x/sys/pci9x5x.inx differ diff --git a/serial/serenum/pnp.c b/serial/serenum/pnp.c index 597b693d..93004c5c 100644 --- a/serial/serenum/pnp.c +++ b/serial/serenum/pnp.c @@ -183,7 +183,7 @@ Arguments: NULL, &nameLength); if ((nameLength != 0) && (status == STATUS_BUFFER_TOO_SMALL)) { - deviceName = ExAllocatePoolWithTag(NonPagedPoolNx, nameLength,SERENUM_POOL_TAG); + deviceName = ExAllocatePoolZero(NonPagedPoolNx, nameLength,SERENUM_POOL_TAG); if (NULL == deviceName) { goto someDebugStuffExit; @@ -726,7 +726,7 @@ Routine Description: length = sizeof(DEVICE_RELATIONS) + ((DeviceData->NumPDOs + i) * sizeof (PDEVICE_OBJECT)); - relations = (PDEVICE_RELATIONS) ExAllocatePoolWithTag (NonPagedPoolNx, length,SERENUM_POOL_TAG); + relations = (PDEVICE_RELATIONS) ExAllocatePoolZero(NonPagedPoolNx, length,SERENUM_POOL_TAG); if (NULL == relations) { Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; @@ -970,7 +970,7 @@ Routine Description: break; } - returnBuffer = ExAllocatePoolWithTag(PagedPool, DeviceData->DevDesc.Length,SERENUM_POOL_TAG); + returnBuffer = ExAllocatePoolZero(PagedPool, DeviceData->DevDesc.Length,SERENUM_POOL_TAG); if (returnBuffer == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1016,7 +1016,7 @@ Routine Description: status = STATUS_SUCCESS; length = SERENUM_INSTANCE_IDS_LENGTH * sizeof(WCHAR); - returnBuffer = ExAllocatePoolWithTag(PagedPool, length,SERENUM_POOL_TAG); + returnBuffer = ExAllocatePoolZero(PagedPool, length,SERENUM_POOL_TAG); if (returnBuffer != NULL) { RtlCopyMemory(returnBuffer, SERENUM_INSTANCE_IDS, length); @@ -1060,7 +1060,7 @@ Routine Description: if (buffer != NULL) { length = pId->Length; - returnBuffer = ExAllocatePoolWithTag(PagedPool, length + sizeof(WCHAR),SERENUM_POOL_TAG); + returnBuffer = ExAllocatePoolZero(PagedPool, length + sizeof(WCHAR),SERENUM_POOL_TAG); if (returnBuffer != NULL) { RtlZeroMemory(returnBuffer, length + sizeof(WCHAR) ); RtlCopyMemory(returnBuffer, buffer, length); @@ -1087,7 +1087,7 @@ Routine Description: ASSERTMSG("Serenum appears not to be the sole bus?!?", Irp->IoStatus.Information == (ULONG_PTR)NULL); - pBusInfo = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION),SERENUM_POOL_TAG); + pBusInfo = ExAllocatePoolZero(PagedPool, sizeof(PNP_BUS_INFORMATION),SERENUM_POOL_TAG); if (pBusInfo == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1125,7 +1125,7 @@ Routine Description: } - pDevRel = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS),SERENUM_POOL_TAG); + pDevRel = ExAllocatePoolZero(PagedPool, sizeof(DEVICE_RELATIONS),SERENUM_POOL_TAG); if (pDevRel == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1175,7 +1175,7 @@ Routine Description: if(DeviceData->PnPRev.Length) { RtlInitUnicodeString(&keyname, NULL); keyname.MaximumLength = sizeof(L"PnPRev"); - keyname.Buffer = ExAllocatePoolWithTag(PagedPool, keyname.MaximumLength,SERENUM_POOL_TAG); + keyname.Buffer = ExAllocatePoolZero(PagedPool, keyname.MaximumLength,SERENUM_POOL_TAG); if (keyname.Buffer != NULL) { @@ -1194,7 +1194,7 @@ Routine Description: if(DeviceData->SerialNo.Length) { RtlInitUnicodeString(&keyname, NULL); keyname.MaximumLength = sizeof(L"Serial Number"); - keyname.Buffer = ExAllocatePoolWithTag(PagedPool, keyname.MaximumLength,SERENUM_POOL_TAG); + keyname.Buffer = ExAllocatePoolZero(PagedPool, keyname.MaximumLength,SERENUM_POOL_TAG); if (keyname.Buffer != NULL) { @@ -1442,7 +1442,7 @@ VOID SerenumStartDeviceWorker( _Analysis_assume_(Irp != NULL); // Not NULL when passed to IoQueueWorkItem() - if (NULL == (QueryTable = ExAllocatePoolWithTag( + if (NULL == (QueryTable = ExAllocatePoolZero( PagedPool, sizeof(RTL_QUERY_REGISTRY_TABLE)*2, SERENUM_POOL_TAG diff --git a/serial/serenum/serenum.c b/serial/serenum/serenum.c index 0e369528..ec78544b 100644 --- a/serial/serenum/serenum.c +++ b/serial/serenum/serenum.c @@ -57,6 +57,8 @@ Routine Description: { ULONG i; + ExInitializeDriverRuntime(DrvRtPoolNxOptIn); + UNREFERENCED_PARAMETER (UniRegistryPath); Serenum_KdPrint_Def (SER_DBG_SS_TRACE, ("Driver Entry\n")); diff --git a/serial/serenum/serenum.h b/serial/serenum/serenum.h index 11bc6671..500d5f31 100644 --- a/serial/serenum/serenum.h +++ b/serial/serenum/serenum.h @@ -136,6 +136,8 @@ Revision History: #define MIN(_A_,_B_) (((_A_) < (_B_)) ? (_A_) : (_B_)) #endif +#define POOL_ZERO_DOWN_LEVEL_SUPPORT + // // A common header for the device extensions of the PDOs and FDO // diff --git a/serial/serenum/string.c b/serial/serenum/string.c index bf54ca8e..481dc8fa 100644 --- a/serial/serenum/string.c +++ b/serial/serenum/string.c @@ -94,7 +94,7 @@ Return value: // Allocate the string buffers // - pStrBuffer = ExAllocatePoolWithTag(PagedPool, MAX_DEVNODE_NAME * 7 + 1,SERENUM_POOL_TAG); + pStrBuffer = ExAllocatePoolZero(PagedPool, MAX_DEVNODE_NAME * 7 + 1,SERENUM_POOL_TAG); if (pStrBuffer == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -384,7 +384,7 @@ Return Value: multiLength += sizeof(WCHAR); MultiString->MaximumLength = (USHORT)multiLength; - MultiString->Buffer = ExAllocatePoolWithTag(PagedPool, multiLength,SERENUM_POOL_TAG); + MultiString->Buffer = ExAllocatePool2(POOL_FLAG_PAGED, multiLength,SERENUM_POOL_TAG); MultiString->Length = 0; if (MultiString->Buffer == NULL) { diff --git a/wmi/wmisamp/wmisamp.c b/wmi/wmisamp/wmisamp.c index 5bf8bd61..d6e1562c 100644 --- a/wmi/wmisamp/wmisamp.c +++ b/wmi/wmisamp/wmisamp.c @@ -59,6 +59,8 @@ DriverEntry( { NTSTATUS status = STATUS_SUCCESS; WDF_DRIVER_CONFIG config; + + ExInitializeDriverRuntime(DrvRtPoolNxOptIn); // // Initialize the Driver Config structure. @@ -314,7 +316,7 @@ WmiSampSetEc1( return; } - ec1 = ExAllocatePoolWithTag(NonPagedPoolNx, ec1Length, WMI_SAMPLE_TAG); + ec1 = ExAllocatePoolZero(NonPagedPoolNx, ec1Length, WMI_SAMPLE_TAG); if (ec1 != NULL) { RtlCopyMemory(ec1, Buffer, Length); @@ -394,7 +396,7 @@ WmiSampSetEc2( return; } - ec2 = ExAllocatePoolWithTag(NonPagedPoolNx, ec2Length, WMI_SAMPLE_TAG); + ec2 = ExAllocatePoolZero(NonPagedPoolNx, ec2Length, WMI_SAMPLE_TAG); if (ec2 != NULL) { RtlCopyMemory(ec2, Buffer, Length); diff --git a/wmi/wmisamp/wmisamp.h b/wmi/wmisamp/wmisamp.h index 3cffbc99..ed066bcd 100644 --- a/wmi/wmisamp/wmisamp.h +++ b/wmi/wmisamp/wmisamp.h @@ -45,6 +45,7 @@ Environment: #define DebugPrint #endif +#define POOL_ZERO_DOWN_LEVEL_SUPPORT typedef struct _WMI_SAMPLE_INSTANCE_CONFIG { diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx index 72916d73..800fda27 100644 Binary files a/wmi/wmisamp/wmisamp.inx and b/wmi/wmisamp/wmisamp.inx differ -- cgit v1.3.1 From 94de67aabfbc2a4e338d4d4eca838c918749fa7f Mon Sep 17 00:00:00 2001 From: Phan Trinh Ha Date: Wed, 9 Mar 2022 23:28:52 -0800 Subject: PR Feedback --- serial/serenum/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serial/serenum/string.c b/serial/serenum/string.c index 481dc8fa..4e4fc7a6 100644 --- a/serial/serenum/string.c +++ b/serial/serenum/string.c @@ -384,7 +384,7 @@ Return Value: multiLength += sizeof(WCHAR); MultiString->MaximumLength = (USHORT)multiLength; - MultiString->Buffer = ExAllocatePool2(POOL_FLAG_PAGED, multiLength,SERENUM_POOL_TAG); + MultiString->Buffer = ExAllocatePoolZero(PagedPool, multiLength,SERENUM_POOL_TAG); MultiString->Length = 0; if (MultiString->Buffer == NULL) { -- cgit v1.3.1 From 983fd454fa1ca4ca063595a5260ca3078ec29f23 Mon Sep 17 00:00:00 2001 From: Phan Trinh Ha Date: Mon, 14 Mar 2022 15:47:47 -0700 Subject: Update UcmCxUcsi.inf --- usb/UcmCxUcsi/UcmCxUcsi.inf | Bin 4888 -> 2700 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf index c1204c40..9e876946 100644 Binary files a/usb/UcmCxUcsi/UcmCxUcsi.inf and b/usb/UcmCxUcsi/UcmCxUcsi.inf differ -- cgit v1.3.1 From 9bb77ebe0a5be25d21fff67200e75427e33a3d12 Mon Sep 17 00:00:00 2001 From: Phan Trinh Ha <23308647+thpthp1@users.noreply.github.com> Date: Fri, 18 Mar 2022 14:00:47 -0700 Subject: Fix Acpi.cpp error msg string (#703) --- usb/UcmCxUcsi/Acpi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usb/UcmCxUcsi/Acpi.cpp b/usb/UcmCxUcsi/Acpi.cpp index 33dec487..0261d6e8 100644 --- a/usb/UcmCxUcsi/Acpi.cpp +++ b/usb/UcmCxUcsi/Acpi.cpp @@ -561,7 +561,7 @@ Acpi_EvaluateUcsiDsm ( if (outputBuffer == nullptr) { status = STATUS_INSUFFICIENT_RESOURCES; - TRACE_ERROR(TRACE_FLAG_ACPI, "[Device: 0x%p] ExAllocatePoolWithTag failed for %Iu bytes", device, outputBufferSize); + TRACE_ERROR(TRACE_FLAG_ACPI, "[Device: 0x%p] ExAllocatePool2 failed for %Iu bytes", device, outputBufferSize); goto Exit; } -- cgit v1.3.1