Merged PR 7672902: Create and test against simple SymCrypt Windows test module (dll)

+ Builds in both CMake and Razzle, and test in CI pipeline

Related work items: #38706387

Author: samuel-lee-msft

azure-build-template.yml

@@ -101,15 +101,15 @@ steps:
     - ${{ if ne(parameters.env, 'Generic') }}:
       - script: |
           cd bin\exe\${{parameters.arch}}\${{parameters.env}}\${{parameters.buildType}}
-          .\symcryptunittest.exe
-        displayName: 'Execute unit tests'
+          .\symcryptunittest.exe dynamic:symcrypttestmodule.dll
+        displayName: 'Execute unit tests with SymCrypt test module'
         name: '${{parameters.env}}UnitTest_${{parameters.buildType}}'
     # Execute Generic unit tests in CI and in PRs to publish
     - ${{ if eq(parameters.env, 'Generic') }}:
       - script: |
           cd bin\exe\%PROCESSOR_ARCHITECTURE%\${{parameters.env}}\${{parameters.buildType}}
-          .\symcryptunittest.exe
-        displayName: 'Execute unit tests'
+          .\symcryptunittest.exe dynamic:symcrypttestmodule.dll
+        displayName: 'Execute unit tests with SymCrypt test module'
         name: '${{parameters.env}}UnitTest_${{parameters.buildType}}'
         condition: or(eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/publish'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
   - ${{ if eq(parameters.hostos, 'Linux') }}:

azure-pipelines.yml

@@ -77,6 +77,7 @@ jobs:
       cxx: cl
       buildType: Debug
       additionalCMakeArgs: -DSYMCRYPT_INTERNAL_BUILD=1 -A Win32
+  timeoutInMinutes: 90
 
 - job: Windows_x86_Release
   pool:
@@ -91,6 +92,7 @@ jobs:
       cxx: cl
       buildType: Release
       additionalCMakeArgs: -DSYMCRYPT_INTERNAL_BUILD=1 -A Win32
+  timeoutInMinutes: 90
 
 - job: Linux_AMD64_gcc_Debug
   pool:
@@ -219,6 +221,7 @@ jobs:
       cxx: cl
       buildType: Release
       additionalCMakeArgs:
+  timeoutInMinutes: 120
 
 - job: Generic_Windows_Win32_Release
   pool:
@@ -233,6 +236,7 @@ jobs:
       cxx: cl
       buildType: Release
       additionalCMakeArgs: -A Win32
+  timeoutInMinutes: 120
 
 - job: Generic_Linux_gcc_Release
   pool:
@@ -247,6 +251,7 @@ jobs:
       cxx: g++
       buildType: Release
       additionalCMakeArgs:
+  timeoutInMinutes: 120
 
 - job: Generic_Linux_clang_Release
   pool:
@@ -261,3 +266,4 @@ jobs:
       cxx: clang++
       buildType: Release
       additionalCMakeArgs:
+  timeoutInMinutes: 120

scbuild/scbuild.cs

@@ -609,14 +609,17 @@ public void CopySymCryptToRelaseDir( string arch )
         CopyFile(testFileName2 + ".exe", @"release\lib\" + arch + @"\symcryptunittest_win7nlater.exe");
         CopyFile(testFileName2 + ".pdb", @"release\lib\" + arch + @"\symcryptunittest_win7nlater.pdb");
 
-        string testFileName4 = object_root + @"\symcrypt\unittest\exe_win8_1nlater\" + objDirName(arch) + "symcryptunittest_win8_1nlater";
-        CopyFile(testFileName4 + ".exe", @"release\lib\" + arch + @"\symcryptunittest_win8_1nlater.exe");
-        CopyFile(testFileName4 + ".pdb", @"release\lib\" + arch + @"\symcryptunittest_win8_1nlater.pdb");
+        string testFileName3 = object_root + @"\symcrypt\unittest\exe_win8_1nlater\" + objDirName(arch) + "symcryptunittest_win8_1nlater";
+        CopyFile(testFileName3 + ".exe", @"release\lib\" + arch + @"\symcryptunittest_win8_1nlater.exe");
+        CopyFile(testFileName3 + ".pdb", @"release\lib\" + arch + @"\symcryptunittest_win8_1nlater.pdb");
 
-        string testFileName3 = object_root + @"\symcrypt\unittest\exe_legacy\" + objDirName(arch) + "symcryptunittest_legacy";
-        CopyFile(testFileName3 + ".exe", @"release\lib\" + arch + @"\symcryptunittest_legacy.exe");
-        CopyFile(testFileName3 + ".pdb", @"release\lib\" + arch + @"\symcryptunittest_legacy.pdb");
+        string testFileName4 = object_root + @"\symcrypt\unittest\exe_legacy\" + objDirName(arch) + "symcryptunittest_legacy";
+        CopyFile(testFileName4 + ".exe", @"release\lib\" + arch + @"\symcryptunittest_legacy.exe");
+        CopyFile(testFileName4 + ".pdb", @"release\lib\" + arch + @"\symcryptunittest_legacy.pdb");
 
+        string testFileName5 = object_root + @"\symcrypt\unittest\module_windows\" + objDirName(arch) + "symcrypttestmodule";
+        CopyFile(testFileName5 + ".dll", @"release\lib\" + arch + @"\symcrypttestmodule.dll");
+        CopyFile(testFileName5 + ".pdb", @"release\lib\" + arch + @"\symcrypttestmodule.pdb");
     }
 
     public string objDirName( string arch )

unittest/CMakeLists.txt

@@ -90,6 +90,7 @@ if(WIN32)
   add_subdirectory(exe_legacy)
   add_subdirectory(exe_Win7nlater)
   add_subdirectory(exe_Win8_1nLater)
+  add_subdirectory(module_windows)
 else()
   add_subdirectory(exe_linux)
 endif()

unittest/dirs

@@ -4,11 +4,7 @@ DIRS = \
     exe_Win7nLater \
     exe_Win8_1nLater \
     exe_legacy \
+    module_windows \
     sys_test \
     sys_Win7nLater \
     sys_legacy \
-
-
-
-    
-

unittest/module_windows/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(SOURCES
+    module.cpp
+    exports.def
+    )
+
+add_compile_options(-DINCLUDE_IMPL_MSBIGNUM=0)
+add_compile_options(-DINCLUDE_IMPL_RSA32=0)
+
+add_library(symcrypttestmodule SHARED ${SOURCES})
+
+target_link_libraries(symcrypttestmodule symcrypt_common symcrypt_usermodewin8_1 bcrypt)