metasploit-payloads 2.0.87 → 2.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49948901cfa763b0f4c7d0ae6d62182efcda73f3ce3b982f0f4fa09d06236edd
-  data.tar.gz: 15778b5e44175b8c7bcd221de425922fe54f3d55ccbf267cdc7e57b8fb7d1ab2
+  metadata.gz: 766495b03203862eb61c50b87d11961b5ff063264013b0d783cfe9cd7a0a94a6
+  data.tar.gz: 5bef6296e5cefba948bdbc20e3982afa25524e6f4cb80f72ac2a679be7b1d7cc
 SHA512:
-  metadata.gz: 3b941a8549701f8e199a1ea8a0b9a2e58dcba63babb53755e0ecd6aa50a9b7ae0daff80d8b1c86a07fb3f73d97a9450aaade1d5c1a3a0147e67682031562c6e6
-  data.tar.gz: e85514e66ce9a2f8347aba4df2091a114b2d26b390fc79bd340752427eff3e3bd4756591257c0c6879c5346fff878cfc6e1d7439ee73257e372f0deb766a36f2
+  metadata.gz: 17ef58336baa0f0b75618df31d5604e2e405b0e17e61df84767ae85e021024ebca491d3c17a4f12e0ffa3069d9845c3a909a70d4ff02b648824c6524a111e504
+  data.tar.gz: c5b6c5f55fc642283796ddb6a3f61f8119b4d1ef35c60bde2fe2fa6ef38138d4b8ddb2b8d75e16eef40430dd1a20e37e8dcf4fc23f028f9298e81b2a037fd432

data/data/meterpreter/ext_server_stdapi.php

@@ -302,11 +302,6 @@ define("ERROR_CONNECTION_ERROR", 10000);
 # eval'd twice
 my_print("Evaling stdapi");
 
-##
-# Windows Constants
-##
-define("WIN_AF_INET", 2);
-define("WIN_AF_INET6", 23);
 
 ##
 # Search Helpers
@@ -456,9 +451,9 @@ function add_stat_buf($path) {
 if (!function_exists('resolve_host')) {
 function resolve_host($hostname, $family) {
     /* requires PHP >= 5 */
-    if ($family == AF_INET) {
+    if ($family == WIN_AF_INET) {
         $dns_family = DNS_A;
-    } elseif ($family == AF_INET6) {
+    } elseif ($family == WIN_AF_INET6) {
         $dns_family = DNS_AAAA;
     } else {
         my_print('invalid family, must be AF_INET or AF_INET6');
@@ -1265,11 +1260,7 @@ function stdapi_net_resolve_host($req, &$pkt) {
     $family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
     $family = $family['value'];
 
-    if ($family == WIN_AF_INET) {
-        $family = AF_INET;
-    } elseif ($family == WIN_AF_INET6) {
-        $family = AF_INET6;
-    } else {
+    if ($family != WIN_AF_INET && $family != WIN_AF_INET6) {
         my_print('invalid family, must be AF_INET or AF_INET6');
         return ERROR_FAILURE;
     }
@@ -1292,11 +1283,7 @@ function stdapi_net_resolve_hosts($req, &$pkt) {
     $family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
     $family = $family_tlv['value'];
 
-    if ($family == WIN_AF_INET) {
-        $family = AF_INET;
-    } elseif ($family == WIN_AF_INET6) {
-        $family = AF_INET6;
-    } else {
+    if ($family != WIN_AF_INET && $family != WIN_AF_INET6) {
         my_print('invalid family, must be AF_INET or AF_INET6');
         return ERROR_FAILURE;
     }

data/data/meterpreter/meterpreter.php

@@ -148,6 +148,13 @@ define("CHANNEL_CLASS_STREAM",   1);
 define("CHANNEL_CLASS_DATAGRAM", 2);
 define("CHANNEL_CLASS_POOL",     3);
 
+
+##
+# Windows Constants
+##
+define("WIN_AF_INET", 2);
+define("WIN_AF_INET6", 23);
+
 #
 # TLV Meta Types
 #
@@ -1095,10 +1102,10 @@ function connect($ipaddr, $port, $proto='tcp') {
   # IPv6 requires brackets around the address in some cases, but not all.
   # Keep track of the un-bracketed address for the functions that don't like
   # brackets, specifically socket_connect and socket_sendto.
-  $ipf = AF_INET;
+  $ipf = WIN_AF_INET;
   $raw_ip = $ipaddr;
   if (FALSE !== strpos($ipaddr, ":")) {
-    $ipf = AF_INET6;
+    $ipf = WIN_AF_INET6;
     $ipaddr = "[". $raw_ip ."]";
   }
 

data/lib/metasploit-payloads/version.rb

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

metadata

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