From e2379c4956099294994e090b9bede94bbbbdcab1 Mon Sep 17 00:00:00 2001
From: auth12 <blakejohnathan11@gmail.com>
Date: Thu, 16 Jul 2020 13:37:51 +0100
Subject: Added windows support on client.

---
 client/src/assembler/assembler.cpp | 31 -------------------------------
 client/src/assembler/assembler.h   | 31 -------------------------------
 client/src/assembler/opcodes.h     |  9 ---------
 client/src/assembler/shellcode.cpp | 31 +++++++++++++++++++++++++++++++
 client/src/assembler/shellcode.h   | 29 +++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 71 deletions(-)
 delete mode 100644 client/src/assembler/assembler.cpp
 delete mode 100644 client/src/assembler/assembler.h
 delete mode 100644 client/src/assembler/opcodes.h
 create mode 100644 client/src/assembler/shellcode.cpp
 create mode 100644 client/src/assembler/shellcode.h

(limited to 'client/src/assembler')

diff --git a/client/src/assembler/assembler.cpp b/client/src/assembler/assembler.cpp
deleted file mode 100644
index cf41ad1..0000000
--- a/client/src/assembler/assembler.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "../include.h"
-#include "assembler.h"
-
-void assembler::start() {}
-
-void assembler::push(const std::vector<uintptr_t>& args) {
-  if (!m_x64) {
-    for (auto it = args.rbegin(); it != args.rend(); ++it) {
-      m_assembler.push(*it);
-    }
-    return;
-  }
-  
-  // 64bit impl
-}
-
-void assembler::call(const uintptr_t addr) {}
-
-void assembler::end() {
-  if (m_x64) {
-  }
-
-  void* func;
-  m_runtime.add(&func, &m_code);
-
-  const size_t size = m_code.codeSize();
-
-  m_buf.resize(size);
-
-  std::memcpy(&m_buf[0], func, size);
-}
\ No newline at end of file
diff --git a/client/src/assembler/assembler.h b/client/src/assembler/assembler.h
deleted file mode 100644
index 00c7362..0000000
--- a/client/src/assembler/assembler.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <asmjit/src/asmjit/asmjit.h>
-
-using namespace asmjit;
-
-class assembler {
-  std::vector<uint8_t> m_buf;
-
-  CodeHolder m_code;
-  JitRuntime m_runtime;
-  x86::Assembler m_assembler;
-
-  bool m_x64;
- public:
-  assembler(const bool x64 = false) : m_x64{x64} {
-    Environment env(x64 ? Environment::kArchX64 : Environment::kArchX86);
-
-    m_code.init(env);
-    m_code.attach(&m_assembler);
-  }
-
-  void start();
-  void push(const std::vector<uintptr_t> &args);
-  void call(const uintptr_t addr);
-  void save_ret(const uintptr_t addr);
-  void end();
-
-  auto &operator()() const { return m_buf; }
-  auto &operator->() const { return m_assembler; }
-};
\ No newline at end of file
diff --git a/client/src/assembler/opcodes.h b/client/src/assembler/opcodes.h
deleted file mode 100644
index 5268b45..0000000
--- a/client/src/assembler/opcodes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-namespace assembler {
-	enum opcodes : uint8_t {
-		nop = 0x90,
-		ret = 0xc3
-	};
-};
\ No newline at end of file
diff --git a/client/src/assembler/shellcode.cpp b/client/src/assembler/shellcode.cpp
new file mode 100644
index 0000000..af3160b
--- /dev/null
+++ b/client/src/assembler/shellcode.cpp
@@ -0,0 +1,31 @@
+#include "../include.h"
+#include "shellcode.h"
+
+void sc::start() {}
+
+void sc::push(const std::vector<uintptr_t>& args) {
+  if (!m_x64) {
+    for (auto it = args.rbegin(); it != args.rend(); ++it) {
+      m_assembler.push(*it);
+    }
+    return;
+  }
+  
+  // 64bit impl
+}
+
+void sc::call(const uintptr_t addr) {}
+
+void sc::end() {
+  if (m_x64) {
+  }
+
+  void* func;
+  m_runtime.add(&func, &m_code);
+
+  const size_t size = m_code.codeSize();
+
+  m_buf.resize(size);
+
+  std::memcpy(&m_buf[0], func, size);
+}
\ No newline at end of file
diff --git a/client/src/assembler/shellcode.h b/client/src/assembler/shellcode.h
new file mode 100644
index 0000000..6fb2f61
--- /dev/null
+++ b/client/src/assembler/shellcode.h
@@ -0,0 +1,29 @@
+#pragma once
+
+using namespace asmjit;
+
+class sc {
+  std::vector<uint8_t> m_buf;
+
+  CodeHolder m_code;
+  JitRuntime m_runtime;
+  x86::Assembler m_assembler;
+
+  bool m_x64;
+ public:
+  sc(const bool x64 = false) : m_x64{x64} {
+    Environment env(x64 ? Environment::kArchX64 : Environment::kArchX86);
+
+    m_code.init(env);
+    m_code.attach(&m_assembler);
+  }
+
+  void start();
+  void push(const std::vector<uintptr_t> &args);
+  void call(const uintptr_t addr);
+  void save_ret(const uintptr_t addr);
+  void end();
+
+  auto &operator()() const { return m_buf; }
+  auto &operator->() const { return m_assembler; }
+};
\ No newline at end of file
-- 
cgit v1.2.3