From 68e27f00faefaf88c8a8959b83c1a4e52752da8d Mon Sep 17 00:00:00 2001
From: OJ <oj@buffered.io>
Date: Fri, 3 Jul 2020 08:47:41 +1000
Subject: [PATCH 1/3] Force mimikatz and RDI submodules to point to master
---
c/meterpreter/source/ReflectiveDLLInjection | 2 +-
c/meterpreter/source/extensions/kiwi/mimikatz | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/c/meterpreter/source/ReflectiveDLLInjection b/c/meterpreter/source/ReflectiveDLLInjection
index 49dfcb65..127cda3b 160000
--- a/c/meterpreter/source/ReflectiveDLLInjection
+++ b/c/meterpreter/source/ReflectiveDLLInjection
@@ -1 +1 @@
-Subproject commit 49dfcb65d60bfb859a7dffac2334bf19ceaa085b
+Subproject commit 127cda3b0af5e957bfa39d138960da5cb3e5271a
diff --git a/c/meterpreter/source/extensions/kiwi/mimikatz b/c/meterpreter/source/extensions/kiwi/mimikatz
index 23fba4e7..9339edba 160000
--- a/c/meterpreter/source/extensions/kiwi/mimikatz
+++ b/c/meterpreter/source/extensions/kiwi/mimikatz
@@ -1 +1 @@
-Subproject commit 23fba4e7397b4b03a43f0827b264a64f13f3dcdd
+Subproject commit 9339edbaa10a2762ca149adffbb9c5372882860c
From 9d920fcd82f90e81cda287a30c3c927fadfbff3a Mon Sep 17 00:00:00 2001
From: Metasploit <metasploit@rapid7.com>
Date: Thu, 2 Jul 2020 22:51:41 -0500
Subject: [PATCH 2/3] Bump metasploit-payloads to 2.0.9
---
gem/lib/metasploit-payloads/version.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gem/lib/metasploit-payloads/version.rb b/gem/lib/metasploit-payloads/version.rb
index bc03f2a4..eb7dbd06 100644
--- a/gem/lib/metasploit-payloads/version.rb
+++ b/gem/lib/metasploit-payloads/version.rb
@@ -1,6 +1,6 @@
# -*- coding:binary -*-
module MetasploitPayloads
- VERSION = '2.0.8'
+ VERSION = '2.0.9'
def self.version
VERSION
From da7fb0e27f0b00e5d71ac0828d999903773abec8 Mon Sep 17 00:00:00 2001
From: OJ <oj@buffered.io>
Date: Mon, 6 Jul 2020 20:03:18 +1000
Subject: [PATCH 3/3] Makefile tweak, RDI changeset update
---
c/meterpreter/Makefile | 4 ++--
c/meterpreter/source/ReflectiveDLLInjection | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/c/meterpreter/Makefile b/c/meterpreter/Makefile
index 21eb89b8..02eaad58 100644
--- a/c/meterpreter/Makefile
+++ b/c/meterpreter/Makefile
@@ -1,5 +1,5 @@
ID := $(shell id -u)
-DOCKER_CONTAINER=win-meterpreter-build
+DOCKER_CONTAINER=rapid7/msf-ubuntu-x64-meterpreter:latest
COMMON_GEN=-Wno-dev -DUSE_STATIC_MSVC_RUNTIMES=ON
COMMON_GEN_X86=-DCMAKE_TOOLCHAIN_FILE=../toolsets/i686-w64-mingw32.cmake -DBUILD_ARCH=Win32 ${COMMON_GEN}
COMMON_GEN_X64=-DCMAKE_TOOLCHAIN_FILE=../toolsets/x86_64-w64-mingw32.cmake -DBUILD_ARCH=x64 ${COMMON_GEN}
@@ -10,7 +10,7 @@ all: meterpreter
clean: meterpreter-x64-clean meterpreter-x86-clean
install:
- @cp output/*.dll ../../../metasploit-framework/data/meterpreter
+ @cp -f output/*.dll ../../../metasploit-framework/data/meterpreter
##########################################################################################
### Build all
diff --git a/c/meterpreter/source/ReflectiveDLLInjection b/c/meterpreter/source/ReflectiveDLLInjection
index 127cda3b..6bad4c49 160000
--- a/c/meterpreter/source/ReflectiveDLLInjection
+++ b/c/meterpreter/source/ReflectiveDLLInjection
@@ -1 +1 @@
-Subproject commit 127cda3b0af5e957bfa39d138960da5cb3e5271a
+Subproject commit 6bad4c49327ad3b7d9cce6e280d034b76dbec928