Merged PR 10544147: Remove SymCryptWipeKnownSize from Windows module exports

This change fixes a build break in the CMake pipeline by removing `SymCryptWipeKnownSize` from the exports for both the kernel and user mode modules. Since `SymCryptWipeKnownSize` is marked `FORCEINLINE`, it should be inlined everywhere and thus cannot be exported. (It's not clear why this didn't break the Windows Undocked Pipeline build--probably some difference in flags.)

In the future we'll remove this function from the Linux module exports as well. We have already documented that as an upcoming breaking change in `doc/breaking_changes.md`. Since the Windows modules haven't shipped yet, we don't have to consider this a breaking change for those modules.

Tested: unit tests with user mode + kernel mode dynamic modules

Author: mlindgren

lib/CMakeLists.txt

@@ -245,12 +245,14 @@ if(WIN32 AND SYMCRYPT_USE_ASM)
             amd64/sha256ymm_asm-masm.asm
             amd64/sha512ymm_asm-masm.asm
             amd64/sha512ymm_avx512vl_asm-masm.asm
-            PROPERTY LANGUAGE ASM_MASM)
+            PROPERTIES LANGUAGE ASM_MASM)
 
     elseif(SYMCRYPT_TARGET_ARCH MATCHES "X86")
         process_cppasm(i386/aesasm.cppasm masm x86)
         process_cppasm(i386/fdef_asm.cppasm masm x86)
 
+        set(CMAKE_ASMMASM_FLAGS "${CMAKE_ASMMASM_FLAGS} /safeseh")
+
         list(APPEND SOURCES_COMMON
             i386/aesasm-masm.asm
             i386/fdef_asm-masm.asm
@@ -259,7 +261,9 @@ if(WIN32 AND SYMCRYPT_USE_ASM)
             i386/aesasm-masm.asm
             i386/fdef_asm-masm.asm
             i386/wipe.asm
-            PROPERTY LANGUAGE ASM_MASM)
+            PROPERTIES
+            LANGUAGE ASM_MASM
+            COMPILE_OPTIONS "/safeseh")
         set_source_files_properties(
             i386/fdef_asm-masm.asm PROPERTIES INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/i386)
     endif()
@@ -295,7 +299,7 @@ elseif(SYMCRYPT_USE_ASM) # Linux
             amd64/sha256ymm_asm-gas.asm
             amd64/sha512ymm_asm-gas.asm
             amd64/sha512ymm_avx512vl_asm-gas.asm
-            PROPERTY LANGUAGE ASM)
+            PROPERTIES LANGUAGE ASM)
     elseif(SYMCRYPT_TARGET_ARCH STREQUAL "ARM64")
         process_symcryptasm(arm64/fdef_asm.symcryptasm gas arm64 aapcs64)
         process_symcryptasm(arm64/fdef369_asm.symcryptasm gas arm64 aapcs64)
@@ -309,7 +313,7 @@ elseif(SYMCRYPT_USE_ASM) # Linux
             arm64/fdef_asm-gas.asm
             arm64/fdef369_asm-gas.asm
             arm64/wipe-gas.asm
-            PROPERTY LANGUAGE ASM)
+            PROPERTIES LANGUAGE ASM)
     elseif(SYMCRYPT_TARGET_ARCH STREQUAL "ARM")
         process_symcryptasm(arm/aesasm.symcryptasm gas arm aapcs32)
         process_symcryptasm(arm/fdef_asm.symcryptasm gas arm aapcs32)
@@ -323,7 +327,7 @@ elseif(SYMCRYPT_USE_ASM) # Linux
             arm/aesasm-gas.asm
             arm/fdef_asm-gas.asm
             arm/wipe-gas.asm
-            PROPERTY LANGUAGE ASM)
+            PROPERTIES LANGUAGE ASM)
         set_source_files_properties(
             arm/fdef_asm-gas.asm PROPERTIES INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/arm)
     endif()

modules/windows/kernel/symcryptk.def

@@ -510,7 +510,6 @@ EXPORTS
 ;    SymCryptUint64Bitsize
 ;    SymCryptUint64Bytesize
 ;    SymCryptWipe
-;    SymCryptWipeKnownSize
 ;    SymCryptXorBytes
 ;    SymCryptXtsAesDecrypt
 ;    SymCryptXtsAesDecryptWith128bTweak

modules/windows/user/symcrypt.def

@@ -513,7 +513,6 @@ EXPORTS
     SymCryptUint64Bitsize
     SymCryptUint64Bytesize
     SymCryptWipe
-    SymCryptWipeKnownSize
     SymCryptXorBytes
     SymCryptXtsAesDecrypt
     SymCryptXtsAesDecryptWith128bTweak

unittest/CMakeLists.txt

@@ -74,12 +74,6 @@ if(NOT WIN32)
     create_resource_h("${DATA_FILES}")
 endif()
 
-if(WIN32 AND SYMCRYPT_TARGET_ARCH MATCHES "X86")
-  # Required on x86 to avoid "error LNK2026: module unsafe for SAFESEH image."
-  add_link_options(/SAFESEH:NO)
-endif()
-
-
 if(SYMCRYPT_TEST_WITH_OPENSSL)
     include(${CMAKE_SOURCE_DIR}/cmake-configs/OpenSSL.cmake)
     include_directories(${OPENSSL_INCLUDE_DIR})

unittest/inc/SymCryptKernelTestModule_FuncList.h

@@ -493,7 +493,6 @@ FUNCTION(SymCryptUint32Bytesize)
 FUNCTION(SymCryptUint64Bitsize)
 FUNCTION(SymCryptUint64Bytesize)
 FUNCTION(SymCryptWipe)
-FUNCTION(SymCryptWipeKnownSize)
 FUNCTION(SymCryptXorBytes)
 FUNCTION(SymCryptXtsAesDecrypt)
 FUNCTION(SymCryptXtsAesDecryptWith128bTweak)

unittest/lib/CMakeLists.txt

@@ -71,15 +71,16 @@ endif()
 if(WIN32 AND SYMCRYPT_USE_ASM)
     if(SYMCRYPT_TARGET_ARCH MATCHES "AMD64")
         list(APPEND SOURCES amd64/savevectors.asm)
-        set_source_files_properties(amd64/savevectors.asm PROPERTY LANGUAGE ASM_MASM)
+        set_source_files_properties(amd64/savevectors.asm PROPERTIES LANGUAGE ASM_MASM)
     elseif(SYMCRYPT_TARGET_ARCH MATCHES "X86")
         list(APPEND SOURCES i386/savevectors.asm)
-        set_source_files_properties(i386/savevectors.asm PROPERTY LANGUAGE ASM_MASM)
+        set_source_files_properties(i386/savevectors.asm PROPERTIES LANGUAGE ASM_MASM)
+        set_source_files_properties(i386/savevectors.asm PROPERTIES COMPILE_OPTIONS "/safeseh")
     endif()
 elseif(SYMCRYPT_USE_ASM) # Linux
     if(SYMCRYPT_TARGET_ARCH MATCHES "AMD64")
         list(APPEND SOURCES amd64/saveymm-gas.asm)
-        set_source_files_properties(amd64/saveymm-gas.asm PROPERTY LANGUAGE ASM)
+        set_source_files_properties(amd64/saveymm-gas.asm PROPERTIES LANGUAGE ASM)
     endif()
 endif()