Merge branch 'main' of https://github.com/NotRequiem/VMAware

Author: Requiem

.gitignore

@@ -68,4 +68,5 @@ list.txt
 /.vs/VSWorkspaceState.json
 TODO.md
 auxiliary/path*
-packages/
+packages/
+auxiliary/test.cpp

CMakeLists.txt

@@ -91,7 +91,7 @@ elseif(APPLE)
 elseif(LINUX)
     if(CMAKE_BUILD_TYPE MATCHES "Debug")
         message(STATUS "Build set to debug mode")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fmax-errors=5 -DDEBUG -O0 -fsanitize=address,leak")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DDEBUG -O0 -fsanitize=address,leak")
     elseif(CMAKE_BUILD_TYPE MATCHES "Release")
         message(STATUS "Build set to release mode")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g0 -O2")

docs/documentation.md

@@ -421,6 +421,7 @@ struct vmaware {
     std::string type;
     std::string conclusion;
     bool is_vm;
+    bool is_hardened;
     std::uint8_t percentage;
     std::uint8_t detected_count;
     std::uint8_t technique_count;
@@ -680,8 +681,8 @@ This is the table of all the brands the lib supports.
 |------|-------------|-------------|
 | `VM::ALL` | This will enable all the technique flags, including checks that are disabled by default. |  |
 | `VM::DEFAULT` | This represents a range of flags which are enabled if no default argument is provided. |
-| `VM::MULTIPLE` | This will basically return a `std::string` message of what brands could be involved. For example, it could return "`VMware or VirtualBox`" instead of having a single brand string output. | VM::brand() |   
-| `VM::HIGH_THRESHOLD` | This will set the threshold bar to confidently detect a VM by 3x higher. | VM::detect() and VM::percentage() |
+| `VM::MULTIPLE` | This will basically return a `std::string` message of which brands could be involved. For example, it could return "`VMware or VirtualBox`" instead of having a single brand string output. | VM::brand() |   
+| `VM::HIGH_THRESHOLD` | This will set the threshold bar to confidently detect a VM by 2x higher. | VM::detect() and VM::percentage() |
 | `VM::DYNAMIC` | This will add 8 options to the conclusion message rather than 2, each with their own varying likelihoods. | VM::conclusion() |
 | `VM::NULL_ARG` | Does nothing, meant as a placeholder flag mainly for CLI purposes. It's best to ignore this.|  |
 

src/cli.cpp

@@ -1284,13 +1284,13 @@ int main(int argc, char* argv[]) {
     const std::vector<std::string> args(argv + 1, argv + argc); // easier to handle args this way
     const u32 arg_count = static_cast<u32>(argc - 1);
 
-    // this was removed from the lib due to ethical 
-    // concerns, so it's added in the CLI instead
+    // these were removed from the lib due to ethical 
+    // concerns, so it's only present in the CLI instead
     VM::add_custom(65, anyrun_driver);
     VM::add_custom(35, anyrun_directory);
 
     if (arg_count == 0) {
-        general(VM::NULL_ARG, VM::NULL_ARG, VM::DYNAMIC);
+        general(VM::NULL_ARG, VM::NULL_ARG, VM::NULL_ARG);
         return 0;
     }
 
@@ -1398,6 +1398,8 @@ int main(int argc, char* argv[]) {
     const VM::enum_flags all = (arg_bitset.test(ALL) ? VM::ALL : VM::NULL_ARG);
     const VM::enum_flags dynamic = (arg_bitset.test(DYNAMIC) ? VM::DYNAMIC : VM::NULL_ARG);
 
+    std::cout << "\n\n\n\nDYNAMIC: " << static_cast<u32>(dynamic) << "\n\n\n";
+
     if (returners > 0) { // at least one of the options are set
         if (returners > 1) { // more than 2 options are set
             std::cerr << "--stdout, --percent, --detect, --brand, --type, and --conclusion must NOT be a combination, choose only a single one\n";