Merge pull request #56 from kernelwernel/dev

Dev

.gitignore

@@ -53,4 +53,5 @@ release_notes.txt
 *.bk
 cmake-build-*/
 .idea/*
-*.bkp
+*.bkp
+*copy.hpp

README.md

@@ -143,6 +143,9 @@ And if you found this project useful, a star would be appreciated :)
 - [Requiem](https://github.com/NotRequiem)
 - [Alex](https://github.com/greenozon)
 - [Marek Knápek](https://github.com/MarekKnapek)
+- [Vladyslav Miachkov](https://github.com/fameowner99)
+- [(Offensive Security) Danny Quist](chamuco@gmail.com)
+- [(Offensive Security) Val Smith](mvalsmith@metasploit.com)
 
 <br>
 

docs/documentation.md

@@ -292,9 +292,13 @@ VMAware provides a convenient way to not only check for VMs, but also have the f
 | `VM::QEMU_DIR` | Check for QEMU-specific blacklisted directories | Windows | 45% |  | GPL |
 | `VM::VPC_PROC` | Check for VPC processes | Windows | 30% |  |  |
 | `VM::VPC_INVALID` | Check for official VPC method | Windows | 75% |  |  |
-| `VM::SIDT` | Check for sidt instruction method | Linux, Windows | 60% |  |  |
-| `VM::SLDT` | Check for sldt instruction method | Windows | 25% |  |  |
-| `VM::SGDT` | Check for sgdt instruction method | Windows | 50% |  |  |
+| `VM::SIDT` | Check for sidt instruction method | Linux, Windows | 30% |  |  |
+| `VM::SGDT` | Check for sgdt instruction method | Windows | 30% |  |  |
+| `VM::SLDT` | Check for sldt instruction method | Linux, Windows | 15% |  |  |
+| `VM::OFFSEC_SIDT` | Check for Offensive Security SIDT method | Windows | 60% |  |  |
+| `VM::OFFSEC_SGDT` | Check for Offensive Security SGDT method | Windows | 60% |  |  |
+| `VM::OFFSEC_SLDT` | Check for Offensive Security SLDT method | Windows | 20% |  |  |
+| `VM::HYPERV_BOARD` | Check for Hyper-V string in motherboard | Windows | 45% |  |  |
 
 <br>
 

src/README.md

@@ -1,5 +1,5 @@
-| filename | purpose |
-|----------|---------|
+| file | purpose |
+|------|---------|
 | `cli.cpp`  | Entire CLI tool code |
 | `vmaware.hpp` | Official and original library header in GPL-3.0 (most likely what you're looking for) |
-| `vmaware_mit.hpp` | Same as above but in MIT (might be less accurate than the original GPL-3.0 one) |
+| `vmaware_mit.hpp` | Same as above but in MIT (might be less accurate than the original GPL-3.0 header) |

src/cli.cpp

@@ -174,8 +174,12 @@ int main(int argc, char* argv[]) {
         checker(VM::VPC_PROC, "VPC processes");
         checker(VM::VPC_INVALID, "VPC invalid instructions");
         checker(VM::SIDT, "SIDT");
-        checker(VM::SLDT, "SLDT");
         checker(VM::SGDT, "SGDT");
+        checker(VM::SLDT, "SLDT");
+        checker(VM::OFFSEC_SIDT, "Offensive Security SIDT");
+        checker(VM::OFFSEC_SGDT, "Offensive Security SGDT");
+        checker(VM::OFFSEC_SLDT, "Offensive Security SLDT");
+        checker(VM::HYPERV_BOARD, "Hyper-V motherboard");
         std::printf("\n");
 
         const std::string brand = VM::brand();