Skip to content

Commit 214256f

Browse files
authored
Merge pull request #21310 from zeroSteiner/fix/remove-eshell-payloads
Remove the encrypted shell payload and libs
2 parents 796ffb6 + 91633fd commit 214256f

18 files changed

Lines changed: 0 additions & 1143 deletions

File tree

data/utilities/encrypted_payload/AdjustStack.asm

Lines changed: 0 additions & 48 deletions
This file was deleted.

data/utilities/encrypted_payload/func_order.ld

Lines changed: 0 additions & 9 deletions
This file was deleted.

data/utilities/encrypted_payload/func_order64.ld

Lines changed: 0 additions & 11 deletions
This file was deleted.

lib/metasploit/framework/compiler/mingw.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module Mingw
77
MINGW_X64 = 'x86_64-w64-mingw32-gcc'
88

99
INCLUDE_DIR = File.join(Msf::Config.data_directory, 'headers', 'windows', 'c_payload_util')
10-
UTILITY_DIR = File.join(Msf::Config.data_directory, 'utilities', 'encrypted_payload')
1110
OPTIMIZATION_FLAGS = [ 'Os', 'O0', 'O1', 'O2', 'O3', 'Og' ]
1211

1312
def compile_c(src)

lib/msf/base/sessions/command_shell.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ def bootstrap(datastore = {}, handler = nil)
132132
# Only populate +session.info+ with a captured banner if the shell is responsive and verified
133133
session.info = session_info if session.info.blank?
134134
session
135-
else
136-
# Encrypted shells need all information read before anything is written, so we read in the banner here. However we
137-
# don't populate session.info with the captured value since without AutoVerify there's no way to be certain this
138-
# actually is a banner and not junk/malicious input
139-
if session.class == ::Msf::Sessions::EncryptedShell
140-
shell_read(-1, 0.1)
141-
end
142135
end
143136
end
144137

lib/msf/base/sessions/encrypted_shell.rb

Lines changed: 0 additions & 113 deletions
This file was deleted.

lib/msf/core/payload/windows/encrypted_payload_opts.rb

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)