Add RawWinRm module with NTLM hash support

CMakeLists.txt

@@ -133,31 +133,51 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(Donut)
 
-add_custom_target(donut_build ALL
-    COMMAND nmake -f Makefile.msvc
-    WORKING_DIRECTORY ${DONUT_SRC_DIR}
-    COMMENT "Building donut with nmake / Makefile.msvc"
-)
+include_directories(${DONUT_SRC_DIR}/include)
 
-# ---- Import the produced lib / exe ----
-add_library(Donut SHARED IMPORTED)
-set_target_properties(Donut PROPERTIES
-    IMPORTED_IMPLIB "${DONUT_SRC_DIR}/lib/donut.lib"   # linker uses this
-    IMPORTED_LOCATION "${DONUT_SRC_DIR}/lib/donut.dll" # runtime DLL
-)
+if (WIN32)
 
-include_directories(${DONUT_SRC_DIR}/include)
+  add_custom_target(donut_build ALL
+      COMMAND nmake -f Makefile.msvc
+      WORKING_DIRECTORY ${DONUT_SRC_DIR}
+      COMMENT "Building donut with nmake / Makefile.msvc"
+  )
 
-set(DONUT_DLL "${DONUT_SRC_DIR}/lib/donut.dll")
-set(TEST_DIR "${CMAKE_SOURCE_DIR}/Tests")
+  # ---- Import the produced lib / exe ----
+  add_library(Donut SHARED IMPORTED)
+  set_target_properties(Donut PROPERTIES
+      IMPORTED_IMPLIB "${DONUT_SRC_DIR}/lib/donut.lib"   # linker uses this
+      IMPORTED_LOCATION "${DONUT_SRC_DIR}/lib/donut.dll" # runtime DLL
+  )
 
-add_custom_target(copy_donut ALL
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "${DONUT_DLL}"
-            "${TEST_DIR}/donut.dll"
-    COMMENT "Copying donut.dll to ${TEST_DIR}"
-)
-add_dependencies(copy_donut donut_build)
+  set(DONUT_DLL "${DONUT_SRC_DIR}/lib/donut.dll")
+  set(TEST_DIR "${CMAKE_SOURCE_DIR}/Tests")
+
+  add_custom_target(copy_donut ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+              "${DONUT_DLL}"
+              "${TEST_DIR}/donut.dll"
+      COMMENT "Copying donut.dll to ${TEST_DIR}"
+  )
+  add_dependencies(copy_donut donut_build)
+
+endif (WIN32)
+if (UNIX)
+
+  add_custom_target(donut_build ALL
+        COMMAND make -f Makefile
+        WORKING_DIRECTORY ${DONUT_SRC_DIR}
+        COMMENT "Building donut with make / Makefile"
+    )
+
+  set(aplib64 "${DONUT_SRC_DIR}/lib/aplib64.a")
+
+  add_library(Donut STATIC IMPORTED)
+  set_target_properties(Donut PROPERTIES
+    IMPORTED_LOCATION "${DONUT_SRC_DIR}/lib/libdonut.a"
+  )
+
+endif (UNIX)
 
 # Additional third party libraries
 FetchContent_Declare(

modules/CMakeLists.txt

@@ -56,6 +56,8 @@ add_subdirectory(PsExec)
 add_subdirectory(WmiExec)
 add_subdirectory(TaskScheduler)
 add_subdirectory(WinRM)
+add_subdirectory(RawWinRm)
 add_subdirectory(DcomExec)
 add_subdirectory(CimExec)
 add_subdirectory(SshExec)
+# add_subdirectory(ReversePortForward)

modules/PsExec/CMakeLists.txt

@@ -14,15 +14,19 @@ if(C2CORE_BUILD_TESTS)
 
     add_test(NAME testsPsExec COMMAND "${CMAKE_SOURCE_DIR}/Tests/$<TARGET_FILE_NAME:testsPsExec>")
 
+    if (WIN32)
+
+        # TestService 
+        add_executable(TestService tests/TestService.cpp)
+        target_link_libraries(TestService PRIVATE
+            advapi32
+        )
+        add_custom_command(TARGET TestService POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+                $<TARGET_FILE:TestService>
+                "${CMAKE_SOURCE_DIR}/Tests/$<TARGET_FILE_NAME:TestService>"
+        )
+
+    endif (WIN32)
 
-    # TestService 
-    add_executable(TestService tests/TestService.cpp)
-    target_link_libraries(TestService PRIVATE
-        advapi32
-    )
-    add_custom_command(TARGET TestService POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-            $<TARGET_FILE:TestService>
-            "${CMAKE_SOURCE_DIR}/Tests/$<TARGET_FILE_NAME:TestService>"
-    )
 endif()

modules/RawWinRm/CMakeLists.txt

@@ -0,0 +1,28 @@
+add_library(RawWinRm SHARED RawWinRm.cpp ${CMAKE_SOURCE_DIR}/thirdParty/base64/base64.cpp)
+
+if (MSVC)
+    set_property(TARGET RawWinRm PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
+endif()
+
+if (WIN32)
+    target_link_libraries(RawWinRm PRIVATE winhttp ws2_32 crypt32 ole32 advapi32 openssl::openssl)
+else()
+    find_package(CURL REQUIRED)
+    target_link_libraries(RawWinRm PRIVATE CURL::libcurl openssl::openssl)
+endif()
+
+add_custom_command(TARGET RawWinRm POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
+    $<TARGET_FILE:RawWinRm> "${CMAKE_SOURCE_DIR}/Release/Modules/$<TARGET_FILE_NAME:RawWinRm>")
+
+if(C2CORE_BUILD_TESTS)
+    add_executable(testsRawWinRm tests/testsRawWinRm.cpp RawWinRm.cpp ${CMAKE_SOURCE_DIR}/thirdParty/base64/base64.cpp)
+    target_compile_definitions(testsRawWinRm PRIVATE RAWWINRM_TEST_BUILD)
+    if (WIN32)
+        target_link_libraries(testsRawWinRm PRIVATE winhttp ws2_32 crypt32 ole32 advapi32 openssl::openssl)
+    else()
+        target_link_libraries(testsRawWinRm PRIVATE CURL::libcurl openssl::openssl)
+    endif()
+    add_custom_command(TARGET testsRawWinRm POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
+        $<TARGET_FILE:testsRawWinRm> "${CMAKE_SOURCE_DIR}/Tests/$<TARGET_FILE_NAME:testsRawWinRm>")
+    add_test(NAME testsRawWinRm COMMAND "${CMAKE_SOURCE_DIR}/Tests/$<TARGET_FILE_NAME:testsRawWinRm>")
+endif()