Skip to contentSkip to conversation

BUILD: MSVC: enable the Control-flow Enforcement Technology (CET) Shadow Stack mitigation

PATCH In review Ilya Shipitsin 2 participants 7 messages Oct 16, 2021 – Jan 7, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 BUILD: MSVC: enable the Control-flow Enforcement Technology (CET) Shadow Stack mitigation

found by BinSkim, more details:
https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-160

---
 src/compat/Debug.props                      | 10 ++++++++++
 src/compat/Release.props                    | 10 ++++++++++
 src/openvpn/openvpn.vcxproj                 |  4 ++++
 src/openvpnmsica/openvpnmsica-Debug.props   | 10 ++++++++++
 src/openvpnmsica/openvpnmsica-Release.props | 10 ++++++++++
 src/openvpnserv/openvpnserv.vcxproj         |  4 ++++
 6 files changed, 48 insertions(+)
src/compat/Debug.props +10 -0
index 31bb9d91..14d7a1f7 100644
@@ -17,5 +17,15 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/compat/Release.props +10 -0
index 50eaa8de..df04ddf2 100644
@@ -22,5 +22,15 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpn/openvpn.vcxproj +4 -0
index 65ee6839..38dd22de 100644
@@ -158,6 +158,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,6 +174,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -204,6 +206,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -220,6 +223,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
src/openvpnmsica/openvpnmsica-Debug.props +10 -0
index 43532cfe..c99346af 100644
@@ -10,5 +10,15 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnmsica/openvpnmsica-Release.props +10 -0
index 47727b35..70f82713 100644
@@ -11,5 +11,15 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnserv/openvpnserv.vcxproj +4 -0
index 5fd7d60b..65d03e3b 100644
@@ -130,6 +130,7 @@
     <Link>
       <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -141,6 +142,7 @@
     <Link>
       <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -163,6 +165,7 @@
     <Link>
       <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -174,6 +177,7 @@
     <Link>
       <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
Signature · 1 line
2.29.2.windows.2
#1 lore raw

gentle ping

сб, 16 окт. 2021 г. в 19:15, Ilya Shipitsin <[email protected]...>:

Quoted 205 lines

found by BinSkim, more details:

https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-160

---
 src/compat/Debug.props                      | 10 ++++++++++
 src/compat/Release.props                    | 10 ++++++++++
 src/openvpn/openvpn.vcxproj                 |  4 ++++
 src/openvpnmsica/openvpnmsica-Debug.props   | 10 ++++++++++
 src/openvpnmsica/openvpnmsica-Release.props | 10 ++++++++++
 src/openvpnserv/openvpnserv.vcxproj         |  4 ++++
 6 files changed, 48 insertions(+)
src/compat/Debug.props +1 -0
index 31bb9d91..14d7a1f7 100644
@@ -17,5 +17,15 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

src/compat/Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

src/compat/Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/compat/Release.props +1 -0
index 50eaa8de..df04ddf2 100644
@@ -22,5 +22,15 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

src/compat/Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

src/compat/Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpn/openvpn.vcxproj +1 -0
index 65ee6839..38dd22de 100644
@@ -158,6 +158,7 @@
 
 <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
 
 <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

src/openvpn/openvpn.vcxproj +1 -0
@@ -173,6 +174,7 @@
 
 <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
 
 <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

src/openvpn/openvpn.vcxproj +1 -0
@@ -204,6 +206,7 @@
 
 <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
 
 <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

src/openvpn/openvpn.vcxproj +1 -0
@@ -220,6 +223,7 @@
 
 <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
 
 <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">

src/openvpnmsica/openvpnmsica-Debug.props +1 -0
index 43532cfe..c99346af 100644
@@ -10,5 +10,15 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

src/openvpnmsica/openvpnmsica-Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

src/openvpnmsica/openvpnmsica-Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnmsica/openvpnmsica-Release.props +1 -0
index 47727b35..70f82713 100644
@@ -11,5 +11,15 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

src/openvpnmsica/openvpnmsica-Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

src/openvpnmsica/openvpnmsica-Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnserv/openvpnserv.vcxproj +1 -0
index 5fd7d60b..65d03e3b 100644
@@ -130,6 +130,7 @@
     <Link>
 
 <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>

<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

src/openvpnserv/openvpnserv.vcxproj +1 -0
@@ -141,6 +142,7 @@
     <Link>
 
 <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>

<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

src/openvpnserv/openvpnserv.vcxproj +1 -0
@@ -163,6 +165,7 @@
     <Link>
 
 <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>

<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

src/openvpnserv/openvpnserv.vcxproj +1 -0
@@ -174,6 +177,7 @@
     <Link>
 
 <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>

<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> --
2.29.2.windows.2

#2 lore raw

Hi,

Sorry for the delay.

1) Was it really necessary to modify .props? I enabled this via
Linker->Advanced->CET Shadow Stack Compatible and only .vcxproj files got modified.

2) I think we could enable it for all binaries
(openvpn/openvpnmsica/openvpnserv/tapctl) for ARM64/WIn32/x64 Release configurations.

-Lev

ma 27. jouluk. 2021 klo 11.09 Илья Шипицин ([email protected]...) kirjoitti:

Quoted 182 lines

gentle ping

сб, 16 окт. 2021 г. в 19:15, Ilya Shipitsin <[email protected]...>:

Quoted 171 lines

found by BinSkim, more details:
https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-160

---
 src/compat/Debug.props                      | 10 ++++++++++
 src/compat/Release.props                    | 10 ++++++++++
 src/openvpn/openvpn.vcxproj                 |  4 ++++
 src/openvpnmsica/openvpnmsica-Debug.props   | 10 ++++++++++
 src/openvpnmsica/openvpnmsica-Release.props | 10 ++++++++++
 src/openvpnserv/openvpnserv.vcxproj         |  4 ++++
 6 files changed, 48 insertions(+)
src/compat/Debug.props +10 -0
index 31bb9d91..14d7a1f7 100644
@@ -17,5 +17,15 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/compat/Release.props +10 -0
index 50eaa8de..df04ddf2 100644
@@ -22,5 +22,15 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpn/openvpn.vcxproj +4 -0
index 65ee6839..38dd22de 100644
@@ -158,6 +158,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -173,6 +174,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -204,6 +206,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -220,6 +223,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
src/openvpnmsica/openvpnmsica-Debug.props +10 -0
index 43532cfe..c99346af 100644
@@ -10,5 +10,15 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnmsica/openvpnmsica-Release.props +10 -0
index 47727b35..70f82713 100644
@@ -11,5 +11,15 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/openvpnserv/openvpnserv.vcxproj +4 -1
index 5fd7d60b..65d03e3b 100644
@@ -130,6 +130,7 @@
     <Link>
       <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -141,6 +142,7 @@
     <Link>
       <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -163,6 +165,7 @@
     <Link>
       <AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -174,6 +177,7 @@
     <Link>
       <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
--
Quoted 2 lines

2.29.2.windows.2

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Signature · 1 line
-Lev
#3 lore raw

CETCOMPAT is not supported for ARM.
Regarding other arch I do not have particular opinion, I'm fine with either props or vcxproj approach

Quoted 236 lines · Lev Stipakov

Hi,

Sorry for the delay.

1) Was it really necessary to modify .props? I enabled this via
Linker->Advanced->CET Shadow Stack Compatible and only .vcxproj files got modified.

2) I think we could enable it for all binaries
(openvpn/openvpnmsica/openvpnserv/tapctl) for ARM64/WIn32/x64 Release configurations.

-Lev

ma 27. jouluk. 2021 klo 11.09 Илья Шипицин ([email protected]...) kirjoitti:

Quoted 8 lines

gentle ping

сб, 16 окт. 2021 г. в 19:15, Ilya Shipitsin <[email protected]...>:

Quoted 3 lines

found by BinSkim, more details:

https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-160

Quoted 11 lines
Quoted 11 lines
---
 src/compat/Debug.props                      | 10 ++++++++++
 src/compat/Release.props                    | 10 ++++++++++
 src/openvpn/openvpn.vcxproj                 |  4 ++++
 src/openvpnmsica/openvpnmsica-Debug.props   | 10 ++++++++++
 src/openvpnmsica/openvpnmsica-Release.props | 10 ++++++++++
 src/openvpnserv/openvpnserv.vcxproj         |  4 ++++
 6 files changed, 48 insertions(+)
Quoted 9 lines

src/compat/Debug.props line 20

Quoted 9 lines
src/compat/Debug.props +1 -0
index 31bb9d91..14d7a1f7 100644
@@ -17,5 +17,15 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Quoted 5 lines

src/compat/Debug.props

Quoted 5 lines
src/compat/Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 8 lines
Quoted 8 lines
src/compat/Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/compat/Release.props +0 -0
Quoted 8 lines

src/compat/Release.props line 25

Quoted 8 lines

index 50eaa8de..df04ddf2 100644

src/compat/Release.props +1 -0
@@ -22,5 +22,15 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

Quoted 5 lines

src/compat/Release.props line 30

Quoted 5 lines
src/compat/Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 5 lines
Quoted 5 lines
src/compat/Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
Quoted 8 lines

src/openvpn/openvpn.vcxproj line 158

Quoted 8 lines
src/compat/Release.props +0 -0
 </Project>
\ No newline at end of file
src/openvpn/openvpn.vcxproj +0 -0
index 65ee6839..38dd22de 100644
@@ -158,6 +158,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 174

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -173,6 +174,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 206

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -204,6 +206,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 223

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -220,6 +223,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica-Debug.props

Quoted 8 lines

src/openvpnmsica/openvpnmsica-Debug.props line 13

Quoted 8 lines

index 43532cfe..c99346af 100644

src/openvpnmsica/openvpnmsica-Debug.props +1 -0
@@ -10,5 +10,15 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Quoted 5 lines

src/openvpnmsica/openvpnmsica-Debug.props line 18

Quoted 5 lines
src/openvpnmsica/openvpnmsica-Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 8 lines

Review

Quoted 8 lines
src/openvpnmsica/openvpnmsica-Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica-Release.props

Quoted 8 lines

src/openvpnmsica/openvpnmsica-Release.props line 14

Quoted 8 lines

index 47727b35..70f82713 100644

src/openvpnmsica/openvpnmsica-Release.props +1 -0
@@ -11,5 +11,15 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

Quoted 5 lines

src/openvpnmsica/openvpnmsica-Release.props line 19

Quoted 5 lines
src/openvpnmsica/openvpnmsica-Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 8 lines

Review

Quoted 8 lines
src/openvpnmsica/openvpnmsica-Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
(quoted diff) +0 -0

b/src/openvpnserv/openvpnserv.vcxproj

Quoted 6 lines

src/openvpnserv/openvpnserv.vcxproj line 131

Quoted 6 lines

index 5fd7d60b..65d03e3b 100644

src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -130,6 +130,7 @@
     <Link>
 

<AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 136

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 143

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -141,6 +142,7 @@
     <Link>
 

<AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 148

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 166

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -163,6 +165,7 @@
     <Link>
 

<AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 171

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 178

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -174,6 +177,7 @@
     <Link>
 

<AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 183

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">

Quoted 7 lines
Quoted 3 lines

--
2.29.2.windows.2

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

--
-Lev

#4 lore raw

For the record
https://github.com/microsoft/binskim/issues/508

Quoted 243 lines · Илья Шипицин

CETCOMPAT is not supported for ARM.
Regarding other arch I do not have particular opinion, I'm fine with either props or vcxproj approach

Quoted 236 lines · Lev Stipakov

Hi,

Sorry for the delay.

1) Was it really necessary to modify .props? I enabled this via
Linker->Advanced->CET Shadow Stack Compatible and only .vcxproj files got modified.

2) I think we could enable it for all binaries
(openvpn/openvpnmsica/openvpnserv/tapctl) for ARM64/WIn32/x64 Release configurations.

-Lev

ma 27. jouluk. 2021 klo 11.09 Илья Шипицин ([email protected]...) kirjoitti:

Quoted 8 lines

gentle ping

сб, 16 окт. 2021 г. в 19:15, Ilya Shipitsin <[email protected]...>:

Quoted 3 lines

found by BinSkim, more details:

https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat?view=msvc-160

Quoted 11 lines
Quoted 11 lines
---
 src/compat/Debug.props                      | 10 ++++++++++
 src/compat/Release.props                    | 10 ++++++++++
 src/openvpn/openvpn.vcxproj                 |  4 ++++
 src/openvpnmsica/openvpnmsica-Debug.props   | 10 ++++++++++
 src/openvpnmsica/openvpnmsica-Release.props | 10 ++++++++++
 src/openvpnserv/openvpnserv.vcxproj         |  4 ++++
 6 files changed, 48 insertions(+)
Quoted 9 lines

src/compat/Debug.props line 20

Quoted 9 lines
src/compat/Debug.props +1 -0
index 31bb9d91..14d7a1f7 100644
@@ -17,5 +17,15 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Quoted 5 lines

src/compat/Debug.props

Quoted 5 lines
src/compat/Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 8 lines
Quoted 8 lines
src/compat/Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
src/compat/Release.props +0 -0
Quoted 8 lines

src/compat/Release.props line 25

Quoted 8 lines

index 50eaa8de..df04ddf2 100644

src/compat/Release.props +1 -0
@@ -22,5 +22,15 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

Quoted 5 lines

src/compat/Release.props line 30

Quoted 5 lines
src/compat/Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 5 lines
Quoted 5 lines
src/compat/Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
Quoted 8 lines

src/openvpn/openvpn.vcxproj line 158

Quoted 8 lines
src/compat/Release.props +0 -0
 </Project>
\ No newline at end of file
src/openvpn/openvpn.vcxproj +0 -0
index 65ee6839..38dd22de 100644
@@ -158,6 +158,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 174

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -173,6 +174,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 206

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -204,6 +206,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 2 lines

src/openvpn/openvpn.vcxproj line 223

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -220,6 +223,7 @@
 

<AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>

Quoted 1 line
Quoted 1 line

<AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

Quoted 5 lines
Quoted 5 lines

<SubSystem>Console</SubSystem>
+ <CETCompat>true</CETCompat>

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica-Debug.props

Quoted 8 lines

src/openvpnmsica/openvpnmsica-Debug.props line 13

Quoted 8 lines

index 43532cfe..c99346af 100644

src/openvpnmsica/openvpnmsica-Debug.props +1 -0
@@ -10,5 +10,15 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Quoted 5 lines

src/openvpnmsica/openvpnmsica-Debug.props line 18

Quoted 5 lines
src/openvpnmsica/openvpnmsica-Debug.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 8 lines

Review

Quoted 8 lines
src/openvpnmsica/openvpnmsica-Debug.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica-Release.props

Quoted 8 lines

src/openvpnmsica/openvpnmsica-Release.props line 14

Quoted 8 lines

index 47727b35..70f82713 100644

src/openvpnmsica/openvpnmsica-Release.props +1 -0
@@ -11,5 +11,15 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

Quoted 5 lines

src/openvpnmsica/openvpnmsica-Release.props line 19

Quoted 5 lines
src/openvpnmsica/openvpnmsica-Release.props +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 8 lines

Review

Quoted 8 lines
src/openvpnmsica/openvpnmsica-Release.props +4 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
(quoted diff) +0 -0

b/src/openvpnserv/openvpnserv.vcxproj

Quoted 6 lines

src/openvpnserv/openvpnserv.vcxproj line 131

Quoted 6 lines

index 5fd7d60b..65d03e3b 100644

src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -130,6 +130,7 @@
     <Link>
 

<AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 136

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 143

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -141,6 +142,7 @@
     <Link>
 

<AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 148

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 166

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -163,6 +165,7 @@
     <Link>
 

<AdditionalDependencies>Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 171

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

Quoted 3 lines

src/openvpnserv/openvpnserv.vcxproj line 178

Quoted 3 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -174,6 +177,7 @@
     <Link>
 

<AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

Quoted 5 lines

src/openvpnserv/openvpnserv.vcxproj line 183

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +1 -0
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">

Quoted 7 lines
Quoted 3 lines

--
2.29.2.windows.2

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

--
-Lev

#5 lore raw

PATCH 1/1 msvc: mark x64 release binaries as compatible with CET shadow stack

From: Lev Stipakov <[email protected]...>

This provides hardware-enforced stack protection on compatible hardware/software.

This is based on patch from Ilya Shipitsin <[email protected]...>
https://patchwork.openvpn.net/patch/1987/

See https://techcommunity.microsoft.com/t5/windows-kernel-internals-blog/developer-guidance-for-hardware-enforced-stack-protection/ba-p/2163340 for more info.

---
 src/openvpn/openvpn.vcxproj           | 1 +
 src/openvpnmsica/openvpnmsica.vcxproj | 5 +++++
 src/openvpnserv/openvpnserv.vcxproj   | 1 +
 src/tapctl/tapctl.vcxproj             | 6 +++++-
 4 files changed, 12 insertions(+), 1 deletion(-)
src/openvpn/openvpn.vcxproj +1 -0
index d583c281..fb08c1c7 100644
@@ -220,6 +220,7 @@
       <AdditionalDependencies>Ncrypt.lib;gdi32.lib;ws2_32.lib;wininet.lib;crypt32.lib;iphlpapi.lib;winmm.lib;Fwpuclnt.lib;Rpcrt4.lib;setupapi.lib;Advapi32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OPENSSL_HOME)/lib;$(LZO_HOME)/lib;$(PKCS11H_HOME)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
src/openvpnmsica/openvpnmsica.vcxproj +5 -0
index 11aa78bb..e7186e70 100644
@@ -135,6 +135,11 @@
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tapctl\error.c" />
     <ClCompile Include="..\tapctl\tap.c" />
src/openvpnserv/openvpnserv.vcxproj +1 -0
index 5fd7d60b..deed8db1 100644
@@ -174,6 +174,7 @@
     <Link>
       <AdditionalDependencies>legacy_stdio_definitions.lib;Userenv.lib;Iphlpapi.lib;ntdll.lib;Fwpuclnt.lib;Netapi32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
+      <CETCompat>true</CETCompat>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
src/tapctl/tapctl.vcxproj +5 -1
index 79da9d33..da9f2703 100644
@@ -140,7 +140,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="error.c" />
     <ClCompile Include="tap.c" />
Signature · 1 line
2.23.0.windows.1
#6 lore raw

Re: [Openvpn-devel] [PATCH] msvc: mark x64 release binaries as compatible with CET shadow stack

Please disregard this patch,

I've sent two separate ones for 2.5 and master which fix multiple issues found by binskim, including HW-enforced stack protection.

https://patchwork.openvpn.net/patch/2209/
https://patchwork.openvpn.net/patch/2210/

Note that before applying 2.5 patch, one needs to cherry-pick this commit

https://github.com/openvpn/openvpn/commit/e5e9a07e8baee4065b7dfd65736bfa77b8329cfc

from the master.

Signature · 1 line
-Lev