Merge pull request #626 from virtfunc/main

fix grammar for unknown vm, fix logic for hardened vm output string

Author: kernelwernel

CONTRIBUTING.md

@@ -1,10 +1,7 @@
 # Contribution Guidelines
 
 
-Make sure to create your PR merge target to the `dev` branch and not the `main` branch. This is because all our prototype code is developed in `dev`, and we usually merge that branch to `main` at least once a week. it keeps our codebase organised and separated between a prototype that we cautiously don't think it's ready to be used by the public yet (especially if it's a new technique being introduced), and an upstream version that we've deemed to be practically ready.
-
-
-Also, please consider adding your name and github in the vmaware.hpp file and the README's credit sections. Your work is valuable to us, and we want to credit you for the improvements you've made. 
+Please consider adding your name and github in the vmaware.hpp file and the README's credit sections. Your work is valuable to us, and we want to credit you for the improvements you've made. 
 
 
 ## Translations
@@ -89,4 +86,4 @@ Depending on how big the change is, if the change is fairly small then just a si
 
 
 ## Notes 
-If you have any questions or inquiries, our contact details are in the README.
+If you have any questions or inquiries, our contact details are in the README.

src/vmaware.hpp

@@ -24,6 +24,7 @@
  *      - Kyun-J (https://github.com/Kyun-J)
  *      - luukjp (https://github.com/luukjp)
  *      - Lorenzo Rizzotti (https://github.com/Dreaming-Codes) 
+ *      - virtfunc (https://github.com/virtfunc)
  *  - Repository: https://github.com/kernelwernel/VMAware
  *  - Docs: https://github.com/kernelwernel/VMAware/docs/documentation.md
  *  - Full credits: https://github.com/kernelwernel/VMAware#credits-and-contributors-%EF%B8%8F
@@ -12523,8 +12524,8 @@ struct VM {
         const u8 percent_tmp = percentage(flags);
         const bool has_hardener = is_hardened();
 
-        constexpr const char* very_unlikely = "Very unlikely a";
-        constexpr const char* unlikely = "Unlikely a";
+        constexpr const char* very_unlikely = "Very unlikely";
+        constexpr const char* unlikely = "Unlikely";
         constexpr const char* potentially = "Potentially";
         constexpr const char* might = "Might be";
         constexpr const char* likely = "Likely";
@@ -12550,7 +12551,7 @@ struct VM {
             // message was "an VirtualBox" or "a Anubis", so this
             // condition fixes that issue.
             if (
-                !hardener && (
+                !has_hardener && (
                     (brand_tmp == brands::ACRN) ||
                     (brand_tmp == brands::ANUBIS) ||
                     (brand_tmp == brands::BSD_VMM) ||
@@ -12584,7 +12585,7 @@ struct VM {
                 addition + 
                 hardener + 
                 brand_tmp + 
-                (brand_tmp == brands::HYPERV_ARTIFACT ? " VM" : "");
+                (brand_tmp == brands::HYPERV_ARTIFACT ? "" : " VM");
 
             memo::conclusion::store(result.c_str());