minor changes

hugsy · Jul 18, 2020 · 1b93d87 · 1b93d87
1 parent e6b5932
commit 1b93d87
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/pwn++/asm.cpp b/pwn++/asm.cpp
@@ -1,6 +1,7 @@
 #include "asm.h"
 
 #include <keystone/keystone.h>
+#include <stdexcept>
 
 using namespace pwn::log;
 
@@ -79,6 +80,14 @@ namespace pwn::assm
     }
 
 
+    std::vector<BYTE> PWNAPI x86(_In_ const char* code, _In_ const size_t code_size)
+    {
+        std::vector<BYTE> res;
+        __assemble(KS_ARCH_X86, KS_MODE_32, code, code_size, res);
+        return res;
+    }
+
+
 
     /*++
 Description:
@@ -102,6 +111,14 @@ namespace pwn::assm
     }
 
 
+    std::vector<BYTE> PWNAPI x64(_In_ const char* code, _In_ const size_t code_size)
+    {
+        std::vector<BYTE> res;
+        __assemble(KS_ARCH_X86, KS_MODE_64, code, code_size, res);
+        return res;
+    }
+
+
     /*++
     Description:
 
@@ -135,4 +152,21 @@ namespace pwn::assm
 
         return FALSE;
     }
+
+
+    std::vector<BYTE> assemble(_In_ const char* code, _In_ const size_t code_size)
+    {
+        switch (pwn::context::arch)
+        {
+            case pwn::context::arch_t::x86:
+                return x86(code, code_size);
+
+            case pwn::context::arch_t::x64:
+                return x64(code, code_size);
+
+            default:
+                throw std::runtime_error("unsupported architecture");
+                break;
+        }
+    }
 }
diff --git a/pwn++/asm.h b/pwn++/asm.h
@@ -10,4 +10,8 @@ namespace pwn::assm
     _Success_(return) BOOL PWNAPI assemble(_In_ const char* code, _In_ const size_t code_size, _Out_ std::vector<BYTE>& bytes);
     _Success_(return) BOOL PWNAPI x64(_In_ const char* code, _In_ const size_t code_size, _Out_ std::vector<BYTE>& bytes);
     _Success_(return) BOOL PWNAPI x86(_In_ const char* code, _In_ const size_t code_size, _Out_ std::vector<BYTE>& bytes);
+
+    _Success_(return) PWNAPI std::vector<BYTE> assemble(_In_ const char* code, _In_ const size_t code_size);
+    _Success_(return) PWNAPI std::vector<BYTE> x64(_In_ const char* code, _In_ const size_t code_size);
+    _Success_(return) PWNAPI std::vector<BYTE> x86(_In_ const char* code, _In_ const size_t code_size);
 }
diff --git a/pwn++/pwn.cpp b/pwn++/pwn.cpp
@@ -12,3 +12,5 @@ const std::tuple<WORD, WORD> pwn::version_info()
 	const std::tuple<WORD, WORD> out(__PWNLIB_VERSION_MAJOR__, __PWNLIB_VERSION_MINOR__);
 	return out;
 }
+
+
diff --git a/pwn++/utils.cpp b/pwn++/utils.cpp
@@ -479,4 +479,7 @@ namespace pwn::utils
 
 		return flat;
 	}
+
+
+
 }
diff --git a/pwn++/utils.h b/pwn++/utils.h
@@ -53,4 +53,5 @@ namespace pwn::utils
 
 	PWNAPI void hexdump(_In_ const PBYTE Buffer, _In_ SIZE_T BufferSize);
 	PWNAPI void hexdump(_In_ const std::vector<BYTE>& bytes);
+
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ const std::tuple<WORD, WORD> pwn::version_info()
		const std::tuple<WORD, WORD> out(__PWNLIB_VERSION_MAJOR__, __PWNLIB_VERSION_MINOR__);
		return out;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -479,4 +479,7 @@ namespace pwn::utils

		return flat;
		}



		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,4 +53,5 @@ namespace pwn::utils

		PWNAPI void hexdump(_In_ const PBYTE Buffer, _In_ SIZE_T BufferSize);
		PWNAPI void hexdump(_In_ const std::vector<BYTE>& bytes);

		}