Skip to contentSkip to conversation

msvc: adjust build options to harden binaries

PATCH In review Lev Stipakov 3 participants 23 messages Jan 7, 2022 – Feb 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 msvc: adjust build options to harden binaries

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

---

Note that one needs to cherry-pick commit

     "e5e9a07" (tapctl: Resolve MSVC C4996 warnings)

before applying this patch.

 src/openvpn/openvpn.vcxproj           | 35 +++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 43 +++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 4 files changed, 134 insertions(+), 24 deletions(-)
src/openvpn/openvpn.vcxproj +23 -12
index 33b8f19a..a540ec22 100644
@@ -147,11 +147,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -162,11 +163,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -177,11 +179,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -192,44 +195,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnmsica/openvpnmsica.vcxproj +43 -0

49 lines not on this page · raw message

src/openvpnserv/openvpnserv.vcxproj +20 -6
index 520242f4..c70db229 100644
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +48 -6

60 lines not on this page · raw message

Signature · 1 line
2.23.0.windows.1
#1 lore raw

Hi Ilja,

Is there any chance you could have a look at this patch?

pe 7. tammik. 2022 klo 16.54 Lev Stipakov ([email protected]...) kirjoitti:

Quoted 341 lines

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

---

Note that one needs to cherry-pick commit

     "e5e9a07" (tapctl: Resolve MSVC C4996 warnings)

before applying this patch.

 src/openvpn/openvpn.vcxproj           | 35 +++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 43 +++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 4 files changed, 134 insertions(+), 24 deletions(-)
src/openvpn/openvpn.vcxproj +23 -12
index 33b8f19a..a540ec22 100644
@@ -147,11 +147,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -162,11 +163,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -177,11 +179,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -192,44 +195,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnmsica/openvpnmsica.vcxproj +43 -0
index 11aa78bb..5e774430 100644
@@ -135,6 +135,49 @@
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tapctl\error.c" />
     <ClCompile Include="..\tapctl\tap.c" />
src/openvpnserv/openvpnserv.vcxproj +20 -6
index 520242f4..c70db229 100644
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +48 -7
index 79da9d33..f439dc4f 100644
@@ -135,12 +135,54 @@
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <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)'=='Debug|ARM64'">
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="error.c" />
     <ClCompile Include="tap.c" />
--
Quoted 2 lines

2.23.0.windows.1

--
-Lev

#2 lore raw

Sorry, I did not catch that you have been waiting for me. I'll have a look in couple of days

ср, 9 февр. 2022 г. в 15:07, Lev Stipakov <[email protected]...>:

Quoted 472 lines

Hi Ilja,

Is there any chance you could have a look at this patch?

pe 7. tammik. 2022 klo 16.54 Lev Stipakov ([email protected]...) kirjoitti:

Quoted 40 lines

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

---

Note that one needs to cherry-pick commit

     "e5e9a07" (tapctl: Resolve MSVC C4996 warnings)

before applying this patch.

 src/openvpn/openvpn.vcxproj           | 35 +++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 43 +++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 4 files changed, 134 insertions(+), 24 deletions(-)
src/openvpn/openvpn.vcxproj +0 -0
index 33b8f19a..a540ec22 100644

src/openvpn/openvpn.vcxproj line 148

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -147,11 +147,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 150

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 150

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 164

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -162,11 +163,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 165

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 166

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 180

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -177,11 +179,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 180

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 182

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 196

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -192,44 +195,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 195

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 198

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 3 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Quoted 5 lines

+ <SDLCheck>true</SDLCheck>

     </ClCompile>
     <ResourceCompile />
     <Link>

<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

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

Quoted 5 lines

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

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

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

Quoted 2 lines

<ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 4 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +3 -0
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Quoted 4 lines
     </ClCompile>
     <ResourceCompile />
     <Link>

<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

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

Quoted 5 lines

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

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

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

Quoted 2 lines

<ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 3 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Review

Quoted 5 lines
src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica.vcxproj

src/openvpnmsica/openvpnmsica.vcxproj line 135

Quoted 5 lines

index 11aa78bb..5e774430 100644

src/openvpnmsica/openvpnmsica.vcxproj +0 -0
@@ -135,6 +135,49 @@
   <PropertyGroup Label="Vcpkg"

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 5 lines
src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 144

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 5 lines
src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 154

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 159

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 160

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 165

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 166

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 171

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 172

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 177

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 178

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

Review

Quoted 6 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tapctl\error.c" />
     <ClCompile Include="..\tapctl\tap.c" />
(quoted diff) +0 -0

b/src/openvpnserv/openvpnserv.vcxproj

src/openvpnserv/openvpnserv.vcxproj line 124

Quoted 5 lines

index 520242f4..c70db229 100644

src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 126

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 127

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 127

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 129

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 137

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 139

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 138

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 140

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 142

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 150

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 152

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 149

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 153

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 155

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 163

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 165

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 160

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 166

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 168

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 172

Quoted 4 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
 

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

src/openvpnserv/openvpnserv.vcxproj line 177

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

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

src/openvpnserv/openvpnserv.vcxproj line 179

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 171

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 180

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 182

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 186

Quoted 4 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
 

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

src/openvpnserv/openvpnserv.vcxproj line 191

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

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

src/openvpnserv/openvpnserv.vcxproj line 193

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 182

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 194

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 196

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 135

Quoted 9 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +0 -0
index 79da9d33..f439dc4f 100644
@@ -135,12 +135,54 @@
   <PropertyGroup Label="Vcpkg"

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

src/tapctl/tapctl.vcxproj line 138

Quoted 3 lines
src/tapctl/tapctl.vcxproj +0 -1
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 139

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 140

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 141

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 142

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 143

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 138

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 141

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 142

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 145

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 148

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 149

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 152

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 155

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 156

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 159

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 162

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 163

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 169

Quoted 6 lines
src/tapctl/tapctl.vcxproj +6 -0
+    </ClCompile>
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 172

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 173

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 176

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 182

Quoted 6 lines
src/tapctl/tapctl.vcxproj +6 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 183

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 8 lines
src/tapctl/tapctl.vcxproj +2 -1
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="error.c" />
     <ClCompile Include="tap.c" />
--

2.23.0.windows.1

--
-Lev

#3 lore raw

original patch does not apply

C:\i\openvpn-chipitsine-2.5>"C:\Program Files\Git\usr\bin\patch.exe" -p1 < c:\users\ilia\Downloads\Openvpn-devel-2.5-msvc-adjust-build-options-to-harden-binaries.diff patching file src/openvpn/openvpn.vcxproj
Hunk #1 FAILED at 147.
Hunk #2 FAILED at 162.
Hunk #3 FAILED at 177.
Hunk #4 FAILED at 192.
4 out of 4 hunks FAILED -- saving rejects to file src/openvpn/openvpn.vcxproj.rej
patching file src/openvpnmsica/openvpnmsica.vcxproj
patching file src/openvpnserv/openvpnserv.vcxproj
patching file src/tapctl/tapctl.vcxproj

I tried to apply manually: test · chipitsine/[email protected]... (github.com)
<https://github.com/chipitsine/openvpn/commit/eeff76551238b0194e72953b916c4481aab5f303>

minor build issues still there: test · chipitsine/[email protected]... (github.com)
<https://github.com/chipitsine/openvpn/runs/5226889392?check_suite_focus=true>

also, I have a question on <SDLCheck>true</SDLCheck>, in your patch it is not applied to all configurations, but to few of them. is it on purpose ?

ср, 9 февр. 2022 г. в 15:16, Илья Шипицин <[email protected]...>:

Quoted 479 lines

Sorry, I did not catch that you have been waiting for me. I'll have a look in couple of days

ср, 9 февр. 2022 г. в 15:07, Lev Stipakov <[email protected]...>:

Quoted 473 lines

Hi Ilja,

Is there any chance you could have a look at this patch?

pe 7. tammik. 2022 klo 16.54 Lev Stipakov ([email protected]...) kirjoitti:

Quoted 40 lines

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

---

Note that one needs to cherry-pick commit

     "e5e9a07" (tapctl: Resolve MSVC C4996 warnings)

before applying this patch.

 src/openvpn/openvpn.vcxproj           | 35 +++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 43 +++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 4 files changed, 134 insertions(+), 24 deletions(-)
src/openvpn/openvpn.vcxproj +0 -0
index 33b8f19a..a540ec22 100644

src/openvpn/openvpn.vcxproj line 148

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -0
@@ -147,11 +147,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 150

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 150

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 164

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -162,11 +163,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 165

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 166

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 180

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -177,11 +179,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 180

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 182

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 2 lines
src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj line 196

Quoted 6 lines
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpn/openvpn.vcxproj +0 -0
@@ -192,44 +195,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

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

src/openvpn/openvpn.vcxproj line 195

Quoted 2 lines
src/openvpn/openvpn.vcxproj +0 -1
     <ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpn/openvpn.vcxproj line 198

Quoted 1 line
src/openvpn/openvpn.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 3 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Quoted 5 lines

+ <SDLCheck>true</SDLCheck>

     </ClCompile>
     <ResourceCompile />
     <Link>

<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

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

Quoted 5 lines

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

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

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

Quoted 2 lines

<ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 4 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +3 -0
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Quoted 4 lines
     </ClCompile>
     <ResourceCompile />
     <Link>

<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

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

Quoted 5 lines

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

     </Link>

</ItemDefinitionGroup>
<ItemDefinitionGroup

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

Quoted 2 lines

<ClCompile>
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

+

<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 1 line

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

Quoted 3 lines

- <WarningLevel>Level2</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>

<AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpn/openvpn.vcxproj

Quoted 3 lines

<ControlFlowGuard>Guard</ControlFlowGuard>

src/openvpn/openvpn.vcxproj +2 -0
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

Review

Quoted 5 lines
src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
(quoted diff) +0 -0

b/src/openvpnmsica/openvpnmsica.vcxproj

src/openvpnmsica/openvpnmsica.vcxproj line 135

Quoted 5 lines

index 11aa78bb..5e774430 100644

src/openvpnmsica/openvpnmsica.vcxproj +0 -0
@@ -135,6 +135,49 @@
   <PropertyGroup Label="Vcpkg"

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 5 lines
src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 144

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 5 lines
src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 154

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 159

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 160

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 165

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 166

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 171

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 172

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj

Quoted 3 lines
src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj line 177

Quoted 2 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj line 178

Quoted 1 line
src/openvpnmsica/openvpnmsica.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

Review

Quoted 6 lines
src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tapctl\error.c" />
     <ClCompile Include="..\tapctl\tap.c" />
(quoted diff) +0 -0

b/src/openvpnserv/openvpnserv.vcxproj

src/openvpnserv/openvpnserv.vcxproj line 124

Quoted 5 lines

index 520242f4..c70db229 100644

src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 126

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 127

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 127

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 129

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 137

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 139

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 138

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 140

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 142

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 150

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 152

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 149

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 153

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 155

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 163

Quoted 5 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup

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

src/openvpnserv/openvpnserv.vcxproj line 165

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 160

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 166

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 168

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 172

Quoted 4 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
 

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

src/openvpnserv/openvpnserv.vcxproj line 177

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

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

src/openvpnserv/openvpnserv.vcxproj line 179

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 171

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 180

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 182

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnserv/openvpnserv.vcxproj line 186

Quoted 4 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
 

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

src/openvpnserv/openvpnserv.vcxproj line 191

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

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

src/openvpnserv/openvpnserv.vcxproj line 193

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     <ClCompile>
 

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

src/openvpnserv/openvpnserv.vcxproj line 182

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +0 -1
-

<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 194

Quoted 1 line
src/openvpnserv/openvpnserv.vcxproj +1 -0
+

<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj line 196

Quoted 2 lines
src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 135

Quoted 9 lines
src/openvpnserv/openvpnserv.vcxproj +0 -0
     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +0 -0
index 79da9d33..f439dc4f 100644
@@ -135,12 +135,54 @@
   <PropertyGroup Label="Vcpkg"

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

src/tapctl/tapctl.vcxproj line 138

Quoted 3 lines
src/tapctl/tapctl.vcxproj +0 -1
     <VcpkgEnabled>true</VcpkgEnabled>
   </PropertyGroup>
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 139

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 140

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 141

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 142

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 143

Quoted 1 line
src/tapctl/tapctl.vcxproj +0 -1
-  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 138

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 141

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 142

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 145

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 148

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 149

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 152

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 155

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 156

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 159

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 162

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 163

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 169

Quoted 6 lines
src/tapctl/tapctl.vcxproj +6 -0
+    </ClCompile>
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 172

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 173

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj line 176

Quoted 3 lines
src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj line 182

Quoted 6 lines
src/tapctl/tapctl.vcxproj +6 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/tapctl/tapctl.vcxproj line 183

Quoted 1 line
src/tapctl/tapctl.vcxproj +1 -0
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

Quoted 8 lines
src/tapctl/tapctl.vcxproj +2 -1
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="error.c" />
     <ClCompile Include="tap.c" />
--

2.23.0.windows.1

--
-Lev

#4 lore raw

Hi,

Thanks for testing.

Quoted 1 line

original patch does not apply

Indeed it doesn't apply anymore since recent changes to vcxproj files. I have rebased it.

Quoted 1 line

minor build issues still there: test · chipitsine/[email protected]... (github.com)

Those are likely because this was not applied
https://www.mail-archive.com/[email protected]/msg21774.html
to your 2.5 branch.
I have mentioned it in the patch email, but not in a commit message.

Quoted 1 line

also, I have a question on <SDLCheck>true</SDLCheck>, in your patch it is not applied to all configurations, but to few of them. is it on purpose ?

For some reasons I missed debug configurations in some projects, I'll add those.

Here are my GHa builds:

master: https://github.com/lstipakov/openvpn/actions/runs/1857589993
release/2.5: https://github.com/lstipakov/openvpn/actions/runs/1857547158

Signature · 1 line
-Lev
#5 lore raw

чт, 17 февр. 2022 г. в 13:53, Lev Stipakov <[email protected]...>:

Quoted 24 lines

Hi,

Thanks for testing.

Quoted 1 line

original patch does not apply

Indeed it doesn't apply anymore since recent changes to vcxproj files. I have rebased it.

Quoted 1 line

minor build issues still there: test · chipitsine/[email protected]..... (

github.com)

Those are likely because this was not applied

https://www.mail-archive.com/[email protected]/msg21774.html
to your 2.5 branch.
I have mentioned it in the patch email, but not in a commit message.

Quoted 1 line

also, I have a question on <SDLCheck>true</SDLCheck>, in your patch it

is not applied to all configurations, but to few of them. is it on purpose ?

For some reasons I missed debug configurations in some projects, I'll add those.

Quoted 6 lines

Here are my GHa builds:

master: https://github.com/lstipakov/openvpn/actions/runs/1857589993
release/2.5
<https://github.com/lstipakov/openvpn/actions/runs/1857589993release/2.5>:
https://github.com/lstipakov/openvpn/actions/runs/1857547158

can you please apply "pdb" patch to your branch ?
CI: github actions: keep "pdb" in artifacts · OpenVPN/[email protected].....
<https://github.com/OpenVPN/openvpn/commit/9da733751ce80b2226ef19923365bd3102cfbd47>

BinSkim uses pdb for analysis.

probably, it makes sense to apply this patch to release/2.5 branch as well

Quoted 5 lines

--
-Lev

#7 lore raw

Ack from me.

чт, 17 февр. 2022 г. в 16:55, Lev Stipakov <[email protected]...>:

Quoted 17 lines

Hi,

Quoted 2 lines

can you please apply "pdb" patch to your branch ?
CI: github actions: keep "pdb" in artifacts · OpenVPN/[email protected]...

Done! https://github.com/lstipakov/openvpn/actions/runs/1858390624

Quoted 3 lines

BinSkim uses pdb for analysis.

probably, it makes sense to apply this patch to release/2.5 branch as

well

I agree. /me looks at Gert.

--
-Lev

#8 lore raw
In reply to Lev Stipakov

Hi,

Quoted 10 lines · Lev Stipakov
Quoted 2 lines

can you please apply "pdb" patch to your branch ?
CI: github actions: keep "pdb" in artifacts · OpenVPN/[email protected]......

Done! https://github.com/lstipakov/openvpn/actions/runs/1858390624

Quoted 3 lines

BinSkim uses pdb for analysis.

probably, it makes sense to apply this patch to release/2.5 branch as well

I agree. /me looks at Gert.

I'm a bit confused on what exactly you want applied where now.

What is "this patch"? This one, or "the pdb patch", or yet something else mentioned in this thread?

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
#9 lore raw

pdb patch

Quoted 32 lines · Gert Doering

Hi,

Quoted 8 lines · Lev Stipakov
Quoted 2 lines

can you please apply "pdb" patch to your branch ?
CI: github actions: keep "pdb" in artifacts · OpenVPN/[email protected]...

Done! https://github.com/lstipakov/openvpn/actions/runs/1858390624

Quoted 3 lines

BinSkim uses pdb for analysis.

probably, it makes sense to apply this patch to release/2.5 branch as

well

Quoted 2 lines

I agree. /me looks at Gert.

I'm a bit confused on what exactly you want applied where now.

What is "this patch"? This one, or "the pdb patch", or yet something else mentioned in this thread?

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
Mistress

Gert Doering - Munich, Germany
[email protected]...

#10 lore raw

Hi,

Quoted 1 line · ???????? ??????????????

pdb patch

Whatever that is... a commit ID in master would be much easier for me to cherrypick.

(In any case, *this* patch can't go into 2.5 before the *master* patch has an ACK - for patches for "master + 2.5", master always comes first, then release branch)

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
#11 lore raw

It is applied to master.

git id:
https://github.com/OpenVPN/openvpn/commit/9da733751ce80b2226ef19923365bd3102cfbd47

Quoted 24 lines · Gert Doering

Hi,

Quoted 1 line · ???????? ??????????????

pdb patch

Whatever that is... a commit ID in master would be much easier for me to cherrypick.

(In any case, *this* patch can't go into 2.5 before the *master* patch has an ACK - for patches for "master + 2.5", master always comes first, then release branch)

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
Mistress

Gert Doering - Munich, Germany
[email protected]...

#12 lore raw

Hi,

Quoted 1 line · ???????? ??????????????

It is applied to master.

The "adjust build options to harden binaries" has no ACK for master.

This is needed so the 2.5 patch can go into 2.5

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
#13 lore raw

Lev, I'm lost here. Can you please follow up?

Quoted 21 lines · Gert Doering

Hi,

Quoted 1 line · ???????? ??????????????

It is applied to master.

The "adjust build options to harden binaries" has no ACK for master.

This is needed so the 2.5 patch can go into 2.5

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
Mistress

Gert Doering - Munich, Germany
[email protected]...

#14 lore raw

Hi,

Quoted 1 line · ???????? ??????????????

Lev, I'm lost here. Can you please follow up?

Please test and ACK *this* patch:

https://patchwork.openvpn.net/patch/2296/

this is the "v2 for master" patch.

When that is done, we can talk about release/2.5 application.

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
#15 lore raw

There is ack from me earlier in this thread.

Lev, I did all things you asked me to do. Please follow up. I do not catch what else left

Quoted 25 lines · Gert Doering

Hi,

Quoted 1 line · ???????? ??????????????

Lev, I'm lost here. Can you please follow up?

Please test and ACK *this* patch:

https://patchwork.openvpn.net/patch/2296/

this is the "v2 for master" patch.

When that is done, we can talk about release/2.5 application.

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never
doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh
Mistress

Gert Doering - Munich, Germany
[email protected]...

#16 lore raw

Hi,

Quoted 1 line · ???????? ??????????????

There is ack from me earlier in this thread.

"ACK in this thread" is not really helpful, as it is not clear for which patch exactly this is.

(You basically ACKed in response to v1 of the 2.5 patch, while we have v2 for the master + 2.5 patch out)

For me, to make clear which version of which patches an ACK refers to, it is important that the reply is to the correct e-mail - you can see in patchwork if your ACK has been recorded or not.

https://patchwork.openvpn.net/project/openvpn2/list/

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
author Acked-by Firstname Lastname
#17 lore raw

Let's start from the beginning.

I'll start two new threads (master and 2.5) and Ilya could ack them.

Ilya, to ack please reply on those threads with following line:

su 20. helmik. 2022 klo 19.31 Gert Doering ([email protected]...) kirjoitti:

Quoted 26 lines

Hi,

Quoted 1 line · ???????? ??????????????

There is ack from me earlier in this thread.

"ACK in this thread" is not really helpful, as it is not clear for which patch exactly this is.

(You basically ACKed in response to v1 of the 2.5 patch, while we have v2 for the master + 2.5 patch out)

For me, to make clear which version of which patches an ACK refers to, it is important that the reply is to the correct e-mail - you can see in patchwork if your ACK has been recorded or not.

https://patchwork.openvpn.net/project/openvpn2/list/

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany [email protected]...

Signature · 1 line
-Lev
#18 lore raw

Lev, I see two new messages in this thread. Please clarify what do you want me to do?

пн, 21 февр. 2022 г. в 13:59, Lev Stipakov <[email protected]...>:

Quoted 45 lines

Let's start from the beginning.

I'll start two new threads (master and 2.5) and Ilya could ack them.

Ilya, to ack please reply on those threads with following line:

su 20. helmik. 2022 klo 19.31 Gert Doering ([email protected]...) kirjoitti:

Quoted 16 lines

Hi,

Quoted 1 line · ???????? ??????????????

There is ack from me earlier in this thread.

"ACK in this thread" is not really helpful, as it is not clear for which patch exactly this is.

(You basically ACKed in response to v1 of the 2.5 patch, while we have v2 for the master + 2.5 patch out)

For me, to make clear which version of which patches an ACK refers to, it is important that the reply is to the correct e-mail - you can see in patchwork if your ACK has been recorded or not.

Quoted 6 lines

https://patchwork.openvpn.net/project/openvpn2/list/

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never

doubted

Quoted 2 lines

it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh

Mistress

Quoted 2 lines

Gert Doering - Munich, Germany

[email protected]...

--
-Lev

#19 lore raw

Reply to both of them with the line (remove ">"):

Quoted 1 line

if you think that you could ack both of those patches.

ma 21. helmik. 2022 klo 13.17 Илья Шипицин ([email protected]...) kirjoitti:

Quoted 45 lines

Lev, I see two new messages in this thread. Please clarify what do you want me to do?

пн, 21 февр. 2022 г. в 13:59, Lev Stipakov <[email protected]...>:

Quoted 41 lines

Let's start from the beginning.

I'll start two new threads (master and 2.5) and Ilya could ack them.

Ilya, to ack please reply on those threads with following line:

su 20. helmik. 2022 klo 19.31 Gert Doering ([email protected]...) kirjoitti:

Quoted 18 lines

Hi,

Quoted 1 line · ???????? ??????????????

There is ack from me earlier in this thread.

"ACK in this thread" is not really helpful, as it is not clear for which patch exactly this is.

(You basically ACKed in response to v1 of the 2.5 patch, while we have v2 for the master + 2.5 patch out)

For me, to make clear which version of which patches an ACK refers to, it is important that the reply is to the correct e-mail - you can see in patchwork if your ACK has been recorded or not.

https://patchwork.openvpn.net/project/openvpn2/list/

Quoted 8 lines

gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany [email protected]...

--
-Lev

Signature · 1 line
-Lev
#20 lore raw

sorry, it does not look like "2 new threads".
also, I'm not sure patchwork will be able to pick 2 ack from 1 thread.

I'm not motivated to run in circles from you to Gert and back. if you can find someone more motivated, I'll appreciate that.

пн, 21 февр. 2022 г. в 17:02, Lev Stipakov <[email protected]...>:

Quoted 66 lines

Reply to both of them with the line (remove ">"):

Quoted 1 line

if you think that you could ack both of those patches.

ma 21. helmik. 2022 klo 13.17 Илья Шипицин ([email protected]...) kirjoitti:

Quoted 2 lines

Lev, I see two new messages in this thread. Please clarify what do you

want me to do?

Quoted 12 lines

пн, 21 февр. 2022 г. в 13:59, Lev Stipakov <[email protected]...>:

Quoted 10 lines

Let's start from the beginning.

I'll start two new threads (master and 2.5) and Ilya could ack them.

Ilya, to ack please reply on those threads with following line:

su 20. helmik. 2022 klo 19.31 Gert Doering ([email protected]...)

kirjoitti:

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

Hi,

On Sun, Feb 20, 2022 at 07:53:56PM +0500, ???????? ??????????????

Quoted 12 lines · wrote:
Quoted 12 lines
Quoted 12 lines
Quoted 1 line

There is ack from me earlier in this thread.

"ACK in this thread" is not really helpful, as it is not clear for which patch exactly this is.

(You basically ACKed in response to v1 of the 2.5 patch, while we have v2 for the master + 2.5 patch out)

For me, to make clear which version of which patches an ACK refers to, it is important that the reply is to the correct e-mail - you can see in patchwork if your ACK has been recorded or not.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

https://patchwork.openvpn.net/project/openvpn2/list/

gert
--
"If was one thing all people took for granted, was conviction that if

you

Quoted 1 line
Quoted 1 line
Quoted 1 line

feed honest figures into a computer, honest figures come out. Never

doubted

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh

Mistress

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Gert Doering - Munich, Germany

[email protected]...

Quoted 5 lines
Quoted 5 lines

--
-Lev

--
-Lev

#21 lore raw

PATCH v2 1/1 msvc: adjust build options to harden binaries

In reply to Lev Stipakov

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

Before applying this patch, this one must be applied from master:

https://www.mail-archive.com/[email protected]/msg21774.html

---
v2:
- rebase on top of latest release/2.5
- add SDL checks to all configurations

 src/openvpn/auth_token.c              |  1 +
 src/openvpn/openvpn.vcxproj           | 38 +++++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 48 ++++++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 5 files changed, 143 insertions(+), 24 deletions(-)
src/openvpn/auth_token.c +1 -0
index ca7e5a4d..37af6605 100644
@@ -87,6 +87,7 @@ add_session_token_env(struct tls_session *session, struct tls_multi *multi,
 
             default:
                 /* Silence compiler warning, all four possible combinations are covered */
+                state = NULL;
                 ASSERT(0);
         }
     }
src/openvpn/openvpn.vcxproj +26 -12
index 91d5ebbe..05c63b03 100644
@@ -147,11 +147,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -162,11 +164,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -177,11 +181,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -192,44 +198,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
       <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'">
     <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnmsica/openvpnmsica.vcxproj +48 -0

54 lines not on this page · raw message

src/openvpnserv/openvpnserv.vcxproj +20 -6
index 520242f4..c70db229 100644
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <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'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +48 -6

60 lines not on this page · raw message

Signature · 1 line
2.23.0.windows.1
#22 lore raw

I've missed that patch [Openvpn-devel] [PATCH v2 4/5] tapctl: Resolve MSVC C4996 warnings (mail-archive.com)
<https://www.mail-archive.com/[email protected]/msg21774.html>

I'll test updated patch soon.

чт, 17 февр. 2022 г. в 14:03, Lev Stipakov <[email protected]...>:

Quoted 493 lines

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

- enable hardware-enforced stack protection on
compatible hardware/software (/CETCOMPAT linker option)

- hash object files with SHA256 (/ZH:SHA_256 compiler option)

- enable SDL. The required to add

_CRT_NONSTDC_NO_DEPRECATE
_CRT_SECURE_NO_WARNINGS
_WINSOCK_DEPRECATED_NO_WARNINGS

preprocessor definitions. I don't feel like replacing strdup (which is correct POSIX function) and inet_ntoa (we always pass IPv4 address to it, inet_ntop will make code more complex)

Above issues were discovered by bitskim.

Before applying this patch, this one must be applied from master:

https://www.mail-archive.com/[email protected]/msg21774.html

---
v2:
- rebase on top of latest release/2.5
- add SDL checks to all configurations

 src/openvpn/auth_token.c              |  1 +
 src/openvpn/openvpn.vcxproj           | 38 +++++++++++++------
 src/openvpnmsica/openvpnmsica.vcxproj | 48 ++++++++++++++++++++++++
 src/openvpnserv/openvpnserv.vcxproj   | 26 ++++++++++---
 src/tapctl/tapctl.vcxproj             | 54 ++++++++++++++++++++++++---
 5 files changed, 143 insertions(+), 24 deletions(-)
src/openvpn/auth_token.c +0 -0
index ca7e5a4d..37af6605 100644
@@ -87,6 +87,7 @@ add_session_token_env(struct tls_session *session,
 struct tls_multi *multi,
 
             default:
                 /* Silence compiler warning, all four possible

combinations are covered */

src/openvpn/auth_token.c +1 -0
+                state = NULL;
                 ASSERT(0);
         }
     }
src/openvpn/openvpn.vcxproj +0 -0
index 91d5ebbe..05c63b03 100644
@@ -147,11 +147,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +2 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -162,11 +164,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +2 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -177,11 +181,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +2 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
@@ -192,44 +198,52 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup

Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +2 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
 
 <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'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +3 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <SDLCheck>true</SDLCheck>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <Link>

<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'">
<ClCompile>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>

src/openvpn/openvpn.vcxproj +2 -1
-      <WarningLevel>Level2</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
 
 <AdditionalIncludeDirectories>..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <WarningLevel>Level2</WarningLevel>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpn/openvpn.vcxproj +1 -0
+      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnmsica/openvpnmsica.vcxproj +0 -0
index 11aa78bb..3a9f0c97 100644
@@ -135,6 +135,54 @@
   <PropertyGroup Label="Vcpkg"

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

src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +4 -0
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj +5 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+

<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +4 -0
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +4 -0
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +4 -0
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/openvpnmsica/openvpnmsica.vcxproj +2 -0
+    <ClCompile>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnmsica/openvpnmsica.vcxproj +3 -0
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tapctl\error.c" />
     <ClCompile Include="..\tapctl\tap.c" />
src/openvpnserv/openvpnserv.vcxproj +0 -0
index 520242f4..c70db229 100644
@@ -124,7 +124,9 @@
   <ItemDefinitionGroup

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

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -135,7 +137,9 @@
   <ItemDefinitionGroup

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

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -146,7 +150,9 @@
   <ItemDefinitionGroup

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

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <Link>
src/openvpnserv/openvpnserv.vcxproj +0 -0
@@ -157,29 +163,37 @@
   <ItemDefinitionGroup

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

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <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'">
<ClCompile>

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <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'">
<ClCompile>

<AdditionalIncludeDirectories>..\openvpn;..\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/openvpnserv/openvpnserv.vcxproj +2 -0
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>

     </ClCompile>
     <ResourceCompile />
     <Link>
src/tapctl/tapctl.vcxproj +0 -0
index 79da9d33..f439dc4f 100644
@@ -135,12 +135,54 @@
   <PropertyGroup Label="Vcpkg"

Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<VcpkgEnabled>true</VcpkgEnabled>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
- <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)'=='Debug|ARM64'">

src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +6 -0
+    </ClCompile>
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj +3 -0
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +3 -0
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup

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

src/tapctl/tapctl.vcxproj +6 -0
+    <Link>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ClCompile>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/ZH:SHA_256

%(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/tapctl/tapctl.vcxproj +2 -1
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="error.c" />
     <ClCompile Include="tap.c" />
--

2.23.0.windows.1

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