metasploit-payloads 2.0.86 → 2.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2413c2e2c381b82dc78a7c2c08e42dd044bc189bdcabf9816e9ded3db027be
-  data.tar.gz: 4eb2228dc9af57275e200ae71290fae570130ed7311a39eef38affe6ae3ec94a
+  metadata.gz: c1512f25f0931730fdd7b8d0fc1cefec0ab49569a47bd67833bd3c63a0703997
+  data.tar.gz: 3b4692895726086b8dd3440fb208c7864115bd8a06018b080b02acb05597e0b9
 SHA512:
-  metadata.gz: 3334c68ca3e12f835890128b887c1ff84af12da5b011e84cacb8e03586379108f35acd8a7b68adb526d139ebd77ee5d3d17e61225b30da0035d12fe777ca9dec
-  data.tar.gz: e25a0a3aba16d8b45555358e84d2724ab2b0683a2c04b3946fc9b0b675ab4ff8a4289a18b67d5e6ee2283a3dbe61ede5bd0e2e42d0cf3861c8c576192ec6ddcf
+  metadata.gz: cbbc6b1258078e02123020dd12d982997bdb6a0d1f1fc1ab6de95bed70a3cc874907cde6ba8fccfc53c4bdc2f4e00cef22b4324ed86ff0068a75593af10713fa
+  data.tar.gz: 07b26d970f8f31803660e33bd4d4d688ddd4c897dae6c6267a89e0e429e06917c16f372bfcef47a9655627243795dca9860022bd629dbeb2a4dfa88a085c4242

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');
@@ -1054,7 +1049,7 @@ function stdapi_sys_process_get_processes($req, &$pkt) {
         # full command line
         array_shift($proc);
         array_shift($proc);
-        $grp .= tlv_pack(create_tlv(TLV_TYPE_PROCESS_PATH, join($proc, " ")));
+        $grp .= tlv_pack(create_tlv(TLV_TYPE_PROCESS_PATH, join(" ", $proc)));
         packet_add_tlv($pkt, create_tlv(TLV_TYPE_PROCESS_GROUP, $grp));
     }
     return ERROR_SUCCESS;
@@ -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.86'
+  VERSION = '2.0.89'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.86
+  version: 2.0.89
 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-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1 +1,2 @@
-�׭���΍͏�˟�$p�{t=�����j�J���So
+�/�f�ٜ"�n�oڳ"�
+*\/GV_���D�u�w�x�ZC��Le��	�b�Խ"w� ���<Dj��+#޳�ݳ������zV앞��ޣWJ�y�.�(�M��/�AQ�n@m�cY6���ë�~��c�#��ުs