Merge pull request #192 from kernelwernel/dev

Dev

Author: kernelwernel

CMakeLists.txt

@@ -20,6 +20,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 if (MSVC)
     set(CMAKE_CXX_FLAGS "/Wall /W4 /EHsc")
 else()
+    # linux and apple
     set(CMAKE_CXX_FLAGS "-Wextra -Wall -Wextra -Wconversion -Wdouble-promotion -Wno-unused-parameter -Wno-unused-function -Wno-sign-conversion")
 endif()
 
@@ -61,6 +62,15 @@ if (MSVC)
         MESSAGE(STATUS "Build set to release mode")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2")
     endif()
+elseif(APPLE)
+    if(CMAKE_BUILD_TYPE MATCHES "Debug")
+        MESSAGE(STATUS "Build set to debug mode")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fsanitize=address")
+    elseif(CMAKE_BUILD_TYPE MATCHES "Release")
+        MESSAGE(STATUS "Build set to release mode")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g0 -O2")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native")
+    endif()
 elseif(LINUX)
     if(CMAKE_BUILD_TYPE MATCHES "Debug")
         MESSAGE(STATUS "Build set to debug mode")
@@ -105,10 +115,15 @@ if (NOT MSVC)
     if(CMAKE_BUILD_TYPE MATCHES "Release")
         install(TARGETS ${TARGET} DESTINATION /usr/local/bin)
         install(FILES "src/vmaware.hpp" DESTINATION /usr/include)
+        install(FILES "src/vmaware_MIT.hpp" DESTINATION /usr/include)
     else()
         install(TARGETS ${TARGET} DESTINATION ${CMAKE_SOURCE_DIR})
     endif()
 elseif(MSVC)
-    set(CMAKE_INSTALL_PREFIX "C:\\Program Files\\YourApplication")
-    install(TARGETS ${TARGET} DESTINATION .)
+        set(CMAKE_INSTALL_PREFIX "C:\\Program Files\\YourApplication")
+        install(TARGETS ${TARGET} RUNTIME DESTINATION "bin")
+    
+        set(HEADER_INSTALL_PATH "C:\\Program Files (x86)\\YourLibrary\\include")
+        install(FILES "src/vmaware.hpp" DESTINATION "${HEADER_INSTALL_PATH}")
+        install(FILES "src/vmaware_MIT.hpp" DESTINATION "${HEADER_INSTALL_PATH}")
 endif()

README.md

@@ -94,11 +94,20 @@ cmake ..
 sudo make install
 ```
 
+### FOR MACOS:
+```bash
+mkdir build
+cd build
+cmake ..
+sudo make install
+```
+
 ### FOR WINDOWS:
 ```bash
 cmake -S . -B build/ -G "Visual Studio 16 2019"
 ```
 
+
 ### CMake installation
 ```cmake
 # edit this

assets/demo.jpg

@@ -28,10 +28,10 @@
  * - struct for internal cpu operations        => line 611
  * - struct for internal memoization           => line 1071
  * - struct for internal utility functions     => line 1454
- * - struct for internal core components       => line 9673
+ * - struct for internal core components       => line 9684
  * - start of internal VM detection techniques => line 2931
- * - start of public VM detection functions    => line 10071
- * - start of externally defined variables     => line 10952
+ * - start of public VM detection functions    => line 10082
+ * - start of externally defined variables     => line 10963
  *
  *
  * ================================ EXAMPLE ==================================

src/vmaware.hpp

@@ -50,10 +50,10 @@
  * - struct for internal cpu operations        => line 621
  * - struct for internal memoization           => line 1081
  * - struct for internal utility functions     => line 1464
- * - struct for internal core components       => line 9189
+ * - struct for internal core components       => line 9200
  * - start of internal VM detection techniques => line 2941
- * - start of public VM detection functions    => line 9587
- * - start of externally defined variables     => line 10458
+ * - start of public VM detection functions    => line 9598
+ * - start of externally defined variables     => line 10469
  *
  *
  * ================================ EXAMPLE ==================================
@@ -9141,12 +9141,16 @@ static bool rdtsc() {
 #if (!LINUX)
 	    return false;
 #else
-	    if (!(util::exists("/usr/bin/lshw") || util::exists("/bin/lshw"))) {
+	    if (!(
+            (util::exists("/usr/bin/lshw")) || 
+            (util::exists("/bin/lshw")) ||
+            (util::exists("/usr/sbin/lshw"))
+        )) {
 	        debug("LSHW_QEMU: ", "binary doesn't exist");
 	        return false;
 	    }
-	
-	    const std::unique_ptr<std::string> result = util::sys_result("lshw");
+
+	    const std::unique_ptr<std::string> result = util::sys_result("lshw 2>&1");
 
 	    if (result == nullptr) {
 	        debug("LSHW_QEMU: ", "invalid stdout output from lshw");
@@ -9156,11 +9160,18 @@ static bool rdtsc() {
 	    const std::string full_command = *result;
 
 	    u8 score = 0;
+
+        auto qemu_finder = [&](const char* str) -> void {
+            if (util::find(full_command, str)) { 
+                debug("LSHW_QEMU: found ", str);
+                score++; 
+            }
+        };
 
-	    if (util::find(full_command, "QEMU PCIe Root port")) { score++; }
-	    if (util::find(full_command, "QEMU XHCI Host Controller")) { score++; }
-	    if (util::find(full_command, "QEMU DVD-ROM")) { score++; }
-	    if (util::find(full_command, "QEMU QEMU USB Tablet")) { score++; }
+	    qemu_finder("QEMU PCIe Root port");
+	    qemu_finder("QEMU XHCI Host Controller");
+	    qemu_finder("QEMU DVD-ROM");
+	    qemu_finder("QEMU QEMU USB Tablet");
 
 	    return (score >= 3);
 #endif
@@ -10747,7 +10758,7 @@ std::pair<VM::enum_flags, VM::core::technique> VM::core::technique_list[] = {
     { VM::WMI_TEMPERATURE, { 25, VM::wmi_temperature, false } },
     { VM::PROCESSOR_ID, { 25, VM::processor_id, false } },
     { VM::CPU_FANS, { 35, VM::cpu_fans, false } },
-    { VM::VMWARE_HARDENER, { 50, VM::vmware_hardener, false } },
+    { VM::VMWARE_HARDENER, { 60, VM::vmware_hardener, false } },
     { VM::SYS_QEMU, { 70, VM::sys_qemu_dir, false } },
     { VM::LSHW_QEMU, { 80, VM::lshw_qemu, false } },
     // ADD NEW TECHNIQUE STRUCTURE HERE