metasploit-payloads 2.0.76 → 2.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6ea335006907066f4bffdddc7b300abeda44390b76c6229b963280e2b6b40e
-  data.tar.gz: dc944a58cc08b728961bf4036cf74859750ba442e89fc86edf6b5cd6247d4449
+  metadata.gz: f71e71b83e0b9d49a187a76a4da1338c59bb2fba9f9c5ea05d3673371251fbc1
+  data.tar.gz: 104f117fcc374d74598f8366b88719fc122b1040fbfbd539216bd648983fc84c
 SHA512:
-  metadata.gz: cade4c7f2f79d7d41bbbbcf7004d6cb38232e4d7f35eda067751c2e59d247edd42459ccb91dab04e71a7eae4915571dea4e5633cee74502f43e3748c6bf52ac9
-  data.tar.gz: 2274c694533f7c0eb7fa2575fe1121ae5ef3267bb589832c5b81f00acf12ed3323a4bfee50e09a106a26e1318c9bfef56f0ff926555553649cf18801407a06e5
+  metadata.gz: b785f915661023db1769c1e262c34c1371a6c992f704b0d8fcd8bcd788dcc61e59d5ab38f7fe5e491a37291dbd55b231cd881d9a5d11bb65bcc148eb878fa254
+  data.tar.gz: 11f09b770e85a17b11305782cf524b60c3444e6e32f917f89fa10a7a8808ebbaa4958a60ae3940eb754315879cd53e94e1d0a657f41cc11573a508c43545b0c2

data/Rakefile

@@ -1,5 +1,4 @@
 require "bundler/gem_tasks"
-require "shell"
 
 c_source = "../c/meterpreter/"
 java_source = "../java"

data/data/meterpreter/meterpreter.py

@@ -483,7 +483,7 @@ def get_system_arch():
         ctypes.windll.kernel32.GetNativeSystemInfo(ctypes.byref(sysinfo))
         values = {0:'x86', 5:'armle', 6:'IA64', 9:'x64'}
         arch = values.get(sysinfo.wProcessorArchitecture, uname_info[4])
-    if arch == 'x86_64':
+    if arch == 'x86_64' or arch.lower() == 'amd64':
         arch = 'x64'
     return arch
 

data/lib/metasploit-payloads/version.rb

@@ -1,6 +1,6 @@
 # -*- coding:binary -*-
 module MetasploitPayloads
-  VERSION = '2.0.76'
+  VERSION = '2.0.79'
 
   def self.version
     VERSION

data/lib/metasploit-payloads.rb

@@ -1,8 +1,6 @@
 # -*- coding:binary -*-
 
-unless defined? MetasploitPayloads::VERSION
-  require 'metasploit-payloads/version'
-end
+require 'metasploit-payloads/version' unless defined? MetasploitPayloads::VERSION
 
 #
 # This module dispenses Metasploit payload binary files
@@ -39,7 +37,8 @@ module MetasploitPayloads
   #
   # Get the path to a meterpreter binary by full name.
   #
-  def self.meterpreter_path(name, binary_suffix)
+  def self.meterpreter_path(name, binary_suffix, debug: false)
+    binary_suffix = binary_suffix&.gsub(/dll$/, 'debug.dll') if debug
     path(METERPRETER_SUBFOLDER, "#{name}.#{binary_suffix}".downcase)
   end
 
@@ -176,9 +175,7 @@ module MetasploitPayloads
   def self.warn_local_path(path)
     unless @local_paths.include?(path)
       STDERR.puts("WARNING: Local file #{path} is being used")
-      if @local_paths.empty?
-        STDERR.puts('WARNING: Local files may be incompatible with the Metasploit Framework')
-      end
+      STDERR.puts('WARNING: Local files may be incompatible with the Metasploit Framework') if @local_paths.empty?
       @local_paths << path
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.76
+  version: 2.0.79
 platform: ruby
 authors:
 - OJ Reeves
@@ -96,7 +96,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake