From 22700560730865f685b1ef8bd004bb9daa4bbda6 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 5 Jul 2021 15:48:48 +0200
Subject: [PATCH] Revert "Wirehark Windows: Harden build with Shadow Stack and
 EHCONT metadata"

This reverts commit ebb8703a501f68394268d33988d76723df0178f0.
---
 CMakeLists.txt | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9375dd5c7..ec75d09f81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,19 +489,6 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	# /Qspectre is not available for VS2015 or older VS2017. Test for its availability.
 	set(WIRESHARK_COMMON_FLAGS /Qspectre)
 
-	if (MSVC_VERSION GREATER_EQUAL "1920")
-		# Compile with Control-flow Enforcement Technology (CET) Shadow Stack compatability
-		# See https://docs.microsoft.com/en-us/cpp/build/reference/cetcompat
-		set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /CETCOMPAT")
-	endif()
-
-	if (MSVC_VERSION GREATER_EQUAL "1920" AND WIRESHARK_TARGET_PLATFORM MATCHES "win64")
-		# Enable generation of EH Continuation (EHCONT) metadata by the compiler.
-		# See https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-eh-continuation-metadata
-		list(APPEND LOCAL_CFLAGS /guard:ehcont)
-		set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /guard:ehcont")
-	endif()
-
 	if(ENABLE_CODE_ANALYSIS)
 		# We should probably add a code_analysis.props file and use it to set
 		# CAExcludePath, otherwise we trigger on Qt's headers: