Compile binary with CETCOMPAT (#7)

* Compile binary with CETCOMPAT * bump visual studio version
trailofbits · Nov 21, 2022 · 8c7fe4f · 8c7fe4f
1 parent 7cdbb4e
commit 8c7fe4f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,14 +16,14 @@ jobs:
       run: |
         mkdir build32
         cd build32
-        cmake -G "Visual Studio 16 2019" -A Win32 ..
+        cmake -G "Visual Studio 17 2022" -A Win32 ..
         cmake --build . --config Release
 
     - name: build64
       run: |
         mkdir build64
         cd build64
-        cmake -G "Visual Studio 16 2019" -A x64 ..
+        cmake -G "Visual Studio 17 2022" -A x64 ..
         cmake --build . --config Release
 
     - name: upload artifacts for winchecksec-scan

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,14 +16,14 @@ jobs:
       run: |
         mkdir build32
         cd build32
-        cmake -G "Visual Studio 16 2019" -A Win32 ..
+        cmake -G "Visual Studio 17 2022" -A Win32 ..
         cmake --build . --config Release
 
     - name: build64
       run: |
         mkdir build64
         cd build64
-        cmake -G "Visual Studio 16 2019" -A x64 ..
+        cmake -G "Visual Studio 17 2022" -A x64 ..
         cmake --build . --config Release
 
     - name: archive

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,6 +38,10 @@ target_link_options(pegoat-no-nxcompat PRIVATE "/NXCOMPAT:NO")
 add_executable(pegoat-no-cetcompat goat.cpp)
 target_link_options(pegoat-no-cetcompat PRIVATE "/CETCOMPAT:NO")
 
+# An executable with Intel CET (hardware CFI) compatiblity.
+add_executable(pegoat-cetcompat goat.cpp)
+target_link_options(pegoat-cetcompat PRIVATE "/CETCOMPAT")
+
 # An executable without control flow guards.
 add_executable(pegoat-no-cfg goat.cpp)
 target_compile_options(pegoat-no-cfg PRIVATE "/GUARD:NO")