Another try.

rnpgp · Nov 16, 2023 · 979de1e · 979de1e
1 parent 6583954
commit 979de1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml
@@ -139,6 +139,7 @@ jobs:
           cmake -B build   -G "Visual Studio 16 2019"  \
                            -A ${{ matrix.arch.name }}  \
                            -T ${{ matrix.toolset }}    \
+                           -DENABLE_SANITIZERS=yes     \
                            -DBUILD_SHARED_LIBS=${{ matrix.shared_libs}} \
                            -DCRYPTO_BACKEND=${{ matrix.backend }}      \
                            -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DIR }}/scripts/buildsystems/vcpkg.cmake .
@@ -152,6 +153,7 @@ jobs:
           cmake -B build   -G "Visual Studio 16 2019"  \
                            -A ${{ matrix.arch.name }}  \
                            -T ${{ matrix.toolset }}    \
+                           -DENABLE_SANITIZERS=yes     \
                            -DBUILD_SHARED_LIBS=${{ matrix.shared_libs}} \
                            -DCRYPTO_BACKEND=${{ matrix.backend }}      \
                            -DCMAKE_PREFIX_PATH=${{ env.VCPKG_DIR }}/installed/${{ matrix.arch.triplet }} .

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -172,11 +172,14 @@ endif()
 
 # sanitizers
 if (ENABLE_SANITIZERS)
-  if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    message(FATAL_ERROR "Sanitizers have only been tested with the clang compiler.")
-  endif()
-  add_compile_options(-fsanitize=leak,address,undefined -fno-omit-frame-pointer -fno-common -O1)
-  link_libraries(-fsanitize=leak,address,undefined)
+  #if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  #  message(FATAL_ERROR "Sanitizers have only been tested with the clang compiler.")
+  #endif()
+  #add_compile_options(-fsanitize=leak,address,undefined -fno-omit-frame-pointer -fno-common -O1)
+  #link_libraries(-fsanitize=leak,address,undefined)
+  add_compile_options(-fsanitize=address /Zi /MT)
+  add_link_options(/DEBUG)
+  #link_libraries(-fsanitize=address)
 endif()
 
 # adoc for man generation

diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py
@@ -4163,8 +4163,8 @@ def test_sym_encryption__rnp_aead(self):
         dst, = reg_workfiles('cleartext', '.txt')
         rnp_decrypt_file(data_path('test_messages/message.aead-windows-issue'), dst)
         remove_files(dst)
-        rnp_decrypt_file(data_path('test_messages/message.aead-windows-issue2'), dst)
-        remove_files(dst)
+        #rnp_decrypt_file(data_path('test_messages/message.aead-windows-issue2'), dst)
+        #remove_files(dst)
         # Encrypt and decrypt cleartext using the AEAD
         #for _ in range(4):
         #    rnp_sym_encryption_rnp_aead(250000, 'AES', None, [None, None], GPG_AEAD)