Skip to content

Commit 3002ad5

Browse files
Revert "Adds network capture decryption support to http scanners"
1 parent e4aec40 commit 3002ad5

File tree

4 files changed

+2
-8
lines changed

4 files changed

+2
-8
lines changed

lib/metasploit/framework/login_scanner/http.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ def create_client(opts)
334334
rport = opts['rport'] || port
335335
cli_ssl = opts['ssl'] || ssl
336336
cli_ssl_version = opts['ssl_version'] || ssl_version
337-
cli_sslkeylogfile = opts['SSLKeyLogFile'] || sslkeylogfile
338337
cli_proxies = opts['proxies'] || proxies
339338
username = opts['credential'] ? opts['credential'].public : http_username
340339
password = opts['credential'] ? opts['credential'].private : http_password
@@ -358,8 +357,7 @@ def create_client(opts)
358357
username,
359358
password,
360359
kerberos_authenticator: kerberos_authenticator,
361-
subscriber: http_logger_subscriber,
362-
sslkeylogfile: cli_sslkeylogfile
360+
subscriber: http_logger_subscriber
363361
)
364362
configure_http_client(cli)
365363

lib/metasploit/framework/login_scanner/rex_socket.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ module RexSocket
2121
# @!attribute ssl_verify_mode
2222
# @return [String] the SSL certification verification mechanism
2323
attr_accessor :ssl_verify_mode
24-
# @!attribute sslkeylogfile
25-
# @return [String, nil] The SSL key log file path
26-
attr_accessor :sslkeylogfile
2724
# @!attribute ssl_cipher
2825
# @return [String] The SSL cipher to use for the context
2926
attr_accessor :ssl_cipher

lib/msf/core/auxiliary/login_scanner.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ def configure_login_scanner(conf)
2020
proxies: datastore['Proxies'],
2121
stop_on_success: datastore['STOP_ON_SUCCESS'],
2222
bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
23-
sslkeylogfile: datastore['SSLKeyLogFile'],
2423
framework: framework,
2524
framework_module: self,
2625
local_port: datastore['CPORT'],

lib/rex/proto/http/client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def connect(t = -1)
184184
'Context' => context,
185185
'SSL' => ssl,
186186
'SSLVersion' => ssl_version,
187-
'SSLKeyLogFile' => config['SSLKeyLogFile'] || sslkeylogfile,
187+
'SSLKeyLogFile' => sslkeylogfile,
188188
'Proxies' => proxies,
189189
'Timeout' => timeout,
190190
'Comm' => comm

0 commit comments

Comments
 (0)