[prev in list] [next in list] [prev in thread] [next in thread]
List: openvpn-devel
Subject: Re: [Openvpn-devel] [PATCH] BUILD: enable CFG and Spectre mitigation for MSVC
From: Илья Шипицин <chipitsine () gmail ! com>
Date: 2021-09-21 12:04:07
Message-ID: CAFHpkQEzhxeJgbzXuDbZMvuR9fXCpjijaTs8esRODmM1vtxejA () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
thanks,
I'll recheck and will send v2 soon
вт, 21 сент. 2021 г. в 16:49, Lev Stipakov <lstipakov@gmail.com>:
> Hi,
>
> Sorry for the delay.
>
> I got "command line error D8016: '/ZI' and '/guard:cf' command-line
> options are incompatible" errors for Debug configuration,
> Release works fine. Looks like "Debug Information Format: Program
> Database for Edit and Continue" is not compatible with Control Flow
> Guard:
>
>
> https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-control-flow-guard?view=msvc-160
>
> Let's apply those changes to Release configurations only.
>
> ke 15. syysk. 2021 klo 15.27 Ilya Shipitsin (chipitsine@gmail.com)
> kirjoitti:
> >
> > found by BinSkim
> >
> > Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
> > ---
> > src/compat/Debug.props | 1 +
> > src/compat/Release.props | 1 +
> > src/compat/compat.vcxproj | 6 ++++++
> > src/openvpn/openvpn.vcxproj | 12 ++++++++++++
> > src/openvpnmsica/openvpnmsica.props | 1 +
> > src/openvpnmsica/openvpnmsica.vcxproj | 6 ++++++
> > src/openvpnserv/openvpnserv.vcxproj | 6 ++++++
> > src/tapctl/tapctl.vcxproj | 6 ++++++
> > 8 files changed, 39 insertions(+)
> >
> > diff --git a/src/compat/Debug.props b/src/compat/Debug.props
> > index 31bb9d91..810609bf 100644
> > --- a/src/compat/Debug.props
> > +++ b/src/compat/Debug.props
> > @@ -15,6 +15,7 @@
> >
> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>
> > <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
> > <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > </ItemDefinitionGroup>
> > <ItemGroup />
> > diff --git a/src/compat/Release.props b/src/compat/Release.props
> > index 63828b79..50eaa8de 100644
> > --- a/src/compat/Release.props
> > +++ b/src/compat/Release.props
> > @@ -15,6 +15,7 @@
> > <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
> > <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
> >
> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <Link>
> > <EnableCOMDATFolding>true</EnableCOMDATFolding>
> > diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj
> > index 49824783..fe03a51a 100644
> > --- a/src/compat/compat.vcxproj
> > +++ b/src/compat/compat.vcxproj
> > @@ -38,33 +38,39 @@
> > <CharacterSet>MultiByte</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
> Label="Configuration">
> > <ConfigurationType>StaticLibrary</ConfigurationType>
> > <CharacterSet>MultiByte</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"
> Label="Configuration">
> > <ConfigurationType>StaticLibrary</ConfigurationType>
> > <CharacterSet>MultiByte</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> Label="Configuration">
> > <ConfigurationType>StaticLibrary</ConfigurationType>
> > <CharacterSet>MultiByte</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
> Label="Configuration">
> > <ConfigurationType>StaticLibrary</ConfigurationType>
> > <CharacterSet>MultiByte</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"
> Label="Configuration">
> > <ConfigurationType>StaticLibrary</ConfigurationType>
> > <CharacterSet>MultiByte</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
> > <ImportGroup Label="ExtensionSettings">
> > diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj
> > index 5b3e0c6c..8d27f9c6 100644
> > --- a/src/openvpn/openvpn.vcxproj
> > +++ b/src/openvpn/openvpn.vcxproj
> > @@ -38,33 +38,39 @@
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>NotSet</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
> > <ImportGroup Label="ExtensionSettings">
> > @@ -146,6 +152,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > @@ -161,6 +168,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > @@ -176,6 +184,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > @@ -191,6 +200,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > @@ -206,6 +216,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > @@ -221,6 +232,7 @@
> > <WarningLevel>Level2</WarningLevel>
> > <TreatWarningAsError>true</TreatWarningAsError>
> >
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <ResourceCompile />
> > <Link>
> > diff --git a/src/openvpnmsica/openvpnmsica.props
> b/src/openvpnmsica/openvpnmsica.props
> > index 074635d0..9e934a73 100644
> > --- a/src/openvpnmsica/openvpnmsica.props
> > +++ b/src/openvpnmsica/openvpnmsica.props
> > @@ -9,6 +9,7 @@
> > <ClCompile>
> >
> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>
> >
> <PreprocessorDefinitions>_WIN32_WINNT=_WIN32_WINNT_VISTA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>
> > + <ControlFlowGuard>Guard</ControlFlowGuard>
> > </ClCompile>
> > <Link>
> > <SubSystem>Windows</SubSystem>
> > diff --git a/src/openvpnmsica/openvpnmsica.vcxproj
> b/src/openvpnmsica/openvpnmsica.vcxproj
> > index c39b1240..11aa78bb 100644
> > --- a/src/openvpnmsica/openvpnmsica.vcxproj
> > +++ b/src/openvpnmsica/openvpnmsica.vcxproj
> > @@ -40,18 +40,21 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> Label="Configuration">
> > <ConfigurationType>DynamicLibrary</ConfigurationType>
> > <UseDebugLibraries>true</UseDebugLibraries>
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
> Label="Configuration">
> > <ConfigurationType>DynamicLibrary</ConfigurationType>
> > <UseDebugLibraries>true</UseDebugLibraries>
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"
> Label="Configuration">
> > <ConfigurationType>DynamicLibrary</ConfigurationType>
> > @@ -60,6 +63,7 @@
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
> Label="Configuration">
> > <ConfigurationType>DynamicLibrary</ConfigurationType>
> > @@ -67,6 +71,7 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
> Label="Configuration">
> > <ConfigurationType>DynamicLibrary</ConfigurationType>
> > @@ -74,6 +79,7 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
> > <ImportGroup Label="ExtensionSettings">
> > diff --git a/src/openvpnserv/openvpnserv.vcxproj
> b/src/openvpnserv/openvpnserv.vcxproj
> > index 8009ab3d..5fd7d60b 100644
> > --- a/src/openvpnserv/openvpnserv.vcxproj
> > +++ b/src/openvpnserv/openvpnserv.vcxproj
> > @@ -38,33 +38,39 @@
> > <CharacterSet>Unicode</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>Unicode</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>Unicode</CharacterSet>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>Unicode</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>Unicode</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <CharacterSet>Unicode</CharacterSet>
> > <PlatformToolset>v142</PlatformToolset>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
> > <ImportGroup Label="ExtensionSettings">
> > diff --git a/src/tapctl/tapctl.vcxproj b/src/tapctl/tapctl.vcxproj
> > index ad96f02c..79da9d33 100644
> > --- a/src/tapctl/tapctl.vcxproj
> > +++ b/src/tapctl/tapctl.vcxproj
> > @@ -40,18 +40,21 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <UseDebugLibraries>true</UseDebugLibraries>
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > <UseDebugLibraries>true</UseDebugLibraries>
> > <PlatformToolset>v142</PlatformToolset>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > @@ -60,6 +63,7 @@
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > @@ -67,6 +71,7 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
> Label="Configuration">
> > <ConfigurationType>Application</ConfigurationType>
> > @@ -74,6 +79,7 @@
> > <PlatformToolset>v142</PlatformToolset>
> > <WholeProgramOptimization>true</WholeProgramOptimization>
> > <CharacterSet>Unicode</CharacterSet>
> > + <SpectreMitigation>Spectre</SpectreMitigation>
> > </PropertyGroup>
> > <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
> > <ImportGroup Label="ExtensionSettings">
> > --
> > 2.29.2.windows.2
> >
> >
> >
> > _______________________________________________
> > Openvpn-devel mailing list
> > Openvpn-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
>
>
> --
> -Lev
>
[Attachment #5 (text/html)]
<div dir="ltr"><div>thanks,</div><div><br></div><div>I'll recheck and will send \
v2 soon<br></div></div><br><div class="gmail_quote"><div dir="ltr" \
class="gmail_attr">вт, 21 сент. 2021 г. в 16:49, Lev Stipakov <<a \
href="mailto:lstipakov@gmail.com">lstipakov@gmail.com</a>>:<br></div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex">Hi,<br> <br>
Sorry for the delay.<br>
<br>
I got "command line error D8016: '/ZI' and '/guard:cf' \
command-line<br> options are incompatible" errors for Debug configuration,<br>
Release works fine. Looks like "Debug Information Format: Program<br>
Database for Edit and Continue" is not compatible with Control Flow<br>
Guard:<br>
<br>
<a href="https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-control-flow-guard?view=msvc-160" \
rel="noreferrer" target="_blank">https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-control-flow-guard?view=msvc-160</a><br>
<br>
Let's apply those changes to Release configurations only.<br>
<br>
ke 15. syysk. 2021 klo 15.27 Ilya Shipitsin (<a href="mailto:chipitsine@gmail.com" \
target="_blank">chipitsine@gmail.com</a>) kirjoitti:<br> ><br>
> found by BinSkim<br>
><br>
> Signed-off-by: Ilya Shipitsin <<a href="mailto:chipitsine@gmail.com" \
target="_blank">chipitsine@gmail.com</a>><br> > ---<br>
> src/compat/Debug.props | 1 +<br>
> src/compat/Release.props | 1 +<br>
> src/compat/compat.vcxproj | 6 ++++++<br>
> src/openvpn/openvpn.vcxproj | 12 ++++++++++++<br>
> src/openvpnmsica/openvpnmsica.props | 1 +<br>
> src/openvpnmsica/openvpnmsica.vcxproj | 6 ++++++<br>
> src/openvpnserv/openvpnserv.vcxproj | 6 ++++++<br>
> src/tapctl/tapctl.vcxproj | 6 ++++++<br>
> 8 files changed, 39 insertions(+)<br>
><br>
> diff --git a/src/compat/Debug.props b/src/compat/Debug.props<br>
> index 31bb9d91..810609bf 100644<br>
> --- a/src/compat/Debug.props<br>
> +++ b/src/compat/Debug.props<br>
> @@ -15,6 +15,7 @@<br>
> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary><br>
> <DebugInformationFormat>EditAndContinue</DebugInformationFormat><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> </ItemDefinitionGroup><br>
> <ItemGroup /><br>
> diff --git a/src/compat/Release.props b/src/compat/Release.props<br>
> index 63828b79..50eaa8de 100644<br>
> --- a/src/compat/Release.props<br>
> +++ b/src/compat/Release.props<br>
> @@ -15,6 +15,7 @@<br>
> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary><br>
> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat><br>
> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <Link><br>
> <EnableCOMDATFolding>true</EnableCOMDATFolding><br>
> diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj<br>
> index 49824783..fe03a51a 100644<br>
> --- a/src/compat/compat.vcxproj<br>
> +++ b/src/compat/compat.vcxproj<br>
> @@ -38,33 +38,39 @@<br>
> <CharacterSet>MultiByte</CharacterSet><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <PlatformToolset>v142</PlatformToolset><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>StaticLibrary</ConfigurationType><br> > \
<CharacterSet>MultiByte</CharacterSet><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>StaticLibrary</ConfigurationType><br> > \
<CharacterSet>MultiByte</CharacterSet><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>StaticLibrary</ConfigurationType><br> > \
<CharacterSet>MultiByte</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>StaticLibrary</ConfigurationType><br> > \
<CharacterSet>MultiByte</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>StaticLibrary</ConfigurationType><br> > \
<CharacterSet>MultiByte</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <Import \
Project="$(VCTargetsPath)\Microsoft.Cpp.props" /><br> > \
<ImportGroup Label="ExtensionSettings"><br> > diff --git \
a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj<br> > index \
5b3e0c6c..8d27f9c6 100644<br> > --- a/src/openvpn/openvpn.vcxproj<br>
> +++ b/src/openvpn/openvpn.vcxproj<br>
> @@ -38,33 +38,39 @@<br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <CharacterSet>NotSet</CharacterSet><br>
> <PlatformToolset>v142</PlatformToolset><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<CharacterSet>NotSet</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<CharacterSet>NotSet</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>NotSet</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>NotSet</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>NotSet</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <Import \
Project="$(VCTargetsPath)\Microsoft.Cpp.props" /><br> > \
<ImportGroup Label="ExtensionSettings"><br> > @@ -146,6 +152,7 \
@@<br> > <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <ResourceCompile /><br>
> <Link><br>
> @@ -161,6 +168,7 @@<br>
> <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir)include;$( \
SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br> \
> + <ControlFlowGuard>Guard</ControlFlowGuard><br> > \
</ClCompile><br> > <ResourceCompile /><br>
> <Link><br>
> @@ -176,6 +184,7 @@<br>
> <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <ResourceCompile /><br>
> <Link><br>
> @@ -191,6 +200,7 @@<br>
> <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <ResourceCompile /><br>
> <Link><br>
> @@ -206,6 +216,7 @@<br>
> <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <ResourceCompile /><br>
> <Link><br>
> @@ -221,6 +232,7 @@<br>
> <WarningLevel>Level2</WarningLevel><br>
> <TreatWarningAsError>true</TreatWarningAsError><br>
> <AdditionalIncludeDirectories>..\compat;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <ResourceCompile /><br>
> <Link><br>
> diff --git a/src/openvpnmsica/openvpnmsica.props \
b/src/openvpnmsica/openvpnmsica.props<br> > index 074635d0..9e934a73 100644<br>
> --- a/src/openvpnmsica/openvpnmsica.props<br>
> +++ b/src/openvpnmsica/openvpnmsica.props<br>
> @@ -9,6 +9,7 @@<br>
> <ClCompile><br>
> <AdditionalIncludeDirectories>..\compat;$(TAP_WINDOWS_HOME)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories><br>
> <PreprocessorDefinitions>_WIN32_WINNT=_WIN32_WINNT_VISTA;%(PreprocessorDefinitions)</PreprocessorDefinitions><br>
> + <ControlFlowGuard>Guard</ControlFlowGuard><br>
> </ClCompile><br>
> <Link><br>
> <SubSystem>Windows</SubSystem><br>
> diff --git a/src/openvpnmsica/openvpnmsica.vcxproj \
b/src/openvpnmsica/openvpnmsica.vcxproj<br> > index c39b1240..11aa78bb 100644<br>
> --- a/src/openvpnmsica/openvpnmsica.vcxproj<br>
> +++ b/src/openvpnmsica/openvpnmsica.vcxproj<br>
> @@ -40,18 +40,21 @@<br>
> <PlatformToolset>v142</PlatformToolset><br>
> <CharacterSet>Unicode</CharacterSet><br>
> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>DynamicLibrary</ConfigurationType><br> > \
<UseDebugLibraries>true</UseDebugLibraries><br> > \
<PlatformToolset>v142</PlatformToolset><br> > \
<CharacterSet>Unicode</CharacterSet><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>DynamicLibrary</ConfigurationType><br> > \
<UseDebugLibraries>true</UseDebugLibraries><br> > \
<PlatformToolset>v142</PlatformToolset><br> > \
<CharacterSet>Unicode</CharacterSet><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>DynamicLibrary</ConfigurationType><br> > @@ -60,6 \
+63,7 @@<br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support><br> \
> + <SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>DynamicLibrary</ConfigurationType><br> > @@ -67,6 \
+71,7 @@<br> > <PlatformToolset>v142</PlatformToolset><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <CharacterSet>Unicode</CharacterSet><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>DynamicLibrary</ConfigurationType><br> > @@ -74,6 \
+79,7 @@<br> > <PlatformToolset>v142</PlatformToolset><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <CharacterSet>Unicode</CharacterSet><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" \
/><br> > <ImportGroup Label="ExtensionSettings"><br>
> diff --git a/src/openvpnserv/openvpnserv.vcxproj \
b/src/openvpnserv/openvpnserv.vcxproj<br> > index 8009ab3d..5fd7d60b 100644<br>
> --- a/src/openvpnserv/openvpnserv.vcxproj<br>
> +++ b/src/openvpnserv/openvpnserv.vcxproj<br>
> @@ -38,33 +38,39 @@<br>
> <CharacterSet>Unicode</CharacterSet><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <PlatformToolset>v142</PlatformToolset><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<PlatformToolset>v142</PlatformToolset><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <Import \
Project="$(VCTargetsPath)\Microsoft.Cpp.props" /><br> > \
<ImportGroup Label="ExtensionSettings"><br> > diff --git \
a/src/tapctl/tapctl.vcxproj b/src/tapctl/tapctl.vcxproj<br> > index \
ad96f02c..79da9d33 100644<br> > --- a/src/tapctl/tapctl.vcxproj<br>
> +++ b/src/tapctl/tapctl.vcxproj<br>
> @@ -40,18 +40,21 @@<br>
> <PlatformToolset>v142</PlatformToolset><br>
> <CharacterSet>Unicode</CharacterSet><br>
> <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<UseDebugLibraries>true</UseDebugLibraries><br> > \
<PlatformToolset>v142</PlatformToolset><br> > \
<CharacterSet>Unicode</CharacterSet><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > \
<UseDebugLibraries>true</UseDebugLibraries><br> > \
<PlatformToolset>v142</PlatformToolset><br> > \
<CharacterSet>Unicode</CharacterSet><br> > + \
<SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > @@ -60,6 \
+63,7 @@<br> > \
<WholeProgramOptimization>true</WholeProgramOptimization><br> > \
<CharacterSet>Unicode</CharacterSet><br> > \
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support><br> \
> + <SpectreMitigation>Spectre</SpectreMitigation><br> > \
</PropertyGroup><br> > <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > @@ -67,6 \
+71,7 @@<br> > <PlatformToolset>v142</PlatformToolset><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <CharacterSet>Unicode</CharacterSet><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <PropertyGroup \
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" \
Label="Configuration"><br> > \
<ConfigurationType>Application</ConfigurationType><br> > @@ -74,6 \
+79,7 @@<br> > <PlatformToolset>v142</PlatformToolset><br>
> <WholeProgramOptimization>true</WholeProgramOptimization><br>
> <CharacterSet>Unicode</CharacterSet><br>
> + <SpectreMitigation>Spectre</SpectreMitigation><br>
> </PropertyGroup><br>
> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" \
/><br> > <ImportGroup Label="ExtensionSettings"><br>
> --<br>
> 2.29.2.windows.2<br>
><br>
><br>
><br>
> _______________________________________________<br>
> Openvpn-devel mailing list<br>
> <a href="mailto:Openvpn-devel@lists.sourceforge.net" \
target="_blank">Openvpn-devel@lists.sourceforge.net</a><br> > <a \
href="https://lists.sourceforge.net/lists/listinfo/openvpn-devel" rel="noreferrer" \
target="_blank">https://lists.sourceforge.net/lists/listinfo/openvpn-devel</a><br> \
<br> <br>
<br>
-- <br>
-Lev<br>
</blockquote></div>
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic