Updating outcomes

src/xlsx/newsessions/TE/ext_stdapi.py

@@ -172,7 +172,7 @@ def test_stdapi_net_config_get_routes_via_osx_netstat(self, mock_popen):
     @mock.patch("subprocess.Popen")
     def test_stdapi_net_config_get_interfaces_via_osx_ifconfig(self, mock_popen):
         command_result = b"""
-en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+en0: flags=0<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
         options=400<CHANNEL_IO>
         ether 11:22:33:44:55:66
         inet 192.168.1.166 netmask 0xffffff00 broadcast 192.168.1.255
@@ -201,7 +201,7 @@ def test_stdapi_net_config_get_interfaces_via_osx_ifconfig(self, mock_popen):
                         b"\xff\xff\xff\x00",
                     )
                 ],
-                "flags": 8863,
+                "flags": 0,
                 "flags_str": "UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST",
                 "hw_addr": '\x11"3DUf',
                 "index": 0,

src/xlsx/newsessions/TE/make.bat

@@ -9,20 +9,20 @@ IF NOT EXIST "source\ReflectiveDLLInjection\.git" (
   GOTO END
 )
 
-SET PSSDK_VER=19
+SET BlackMarlinExec_VER=19
 SET PTS_VER=v141_xp
 
 IF "%1"=="v120_xp" SET PTS_VER=%1
 IF "%2"=="v120_xp" SET PTS_VER=%2
 IF "%3"=="v120_xp" SET PTS_VER=%3
 
 IF "%VisualStudioVersion%" == "12.0" (
-    SET PSSDK_VER=12
+    SET BlackMarlinExec_VER=12
     SET PTS_VER=v120_xp
 )
 
 SET PREF=
-IF EXIST "..\..\..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" SET PREF=r7_
+IF EXIST "..\..\..\BlackMarlinExec\BlackMarlinExec_VC%BlackMarlinExec_VER%_LIB\_Libs\BlackMarlinExec_vc%BlackMarlinExec_VER%_mt.lib" SET PREF=r7_
 
 IF "%1"=="x86" GOTO BUILD_X86
 IF "%1"=="X86" GOTO BUILD_X86
@@ -32,6 +32,8 @@ IF "%1"=="debug_x86" GOTO DEBUG_BUILD_X86
 IF "%1"=="debug_x64" GOTO DEBUG_BUILD_X64
 IF "%1"=="debug_X86" GOTO DEBUG_BUILD_X86
 IF "%1"=="debug_X64" GOTO DEBUG_BUILD_X64
+IF "%1"=="debug_X86" GOTO DEBUG_BUILD_X86
+IF "%1"=="debug_X64" GOTO DEBUG_BUILD_X64
 
 ECHO "Building Meterpreter x64 and x86 (Release)"
 SET PLAT=all
@@ -65,15 +67,15 @@ msbuild.exe make.msbuild /target:%PREF%%PLAT% /p:PlatformToolset=%PTS_VER%
 POPD
 
 IF "%ERRORLEVEL%" == "0" (
-  IF NOT EXIST "..\..\..\pssdk\" (
+  IF NOT EXIST "..\..\..\BlackMarlinExec\" (
     ECHO Unable to build ext_server_sniffer:
-    ECHO PSSDK directory not found.
+    ECHO BlackMarlinExec directory not found.
     ECHO This is normal if you do not expect to have access to Rapid7 proprietary
     ECHO sniffer source. Meterpreter will still function normally without this.
   ) else (
-    IF NOT EXIST "..\..\..\pssdk\PSSDK_VC%PSSDK_VER%_LIB\_Libs\pssdk_vc%PSSDK_VER%_mt.lib" (
+    IF NOT EXIST "..\..\..\BlackMarlinExec\BlackMarlinExec_VC%BlackMarlinExec_VER%_LIB\_Libs\BlackMarlinExec_vc%BlackMarlinExec_VER%_mt.lib" (
       ECHO Unable to build ext_server_sniffer:
-      ECHO PSSDK lib version 'vc%PSSDK_VER%' not found.
+      ECHO BlackMarlinExec lib version 'vc%BlackMarlinExec_VER%' not found.
       ECHO This is normal if you do not expect to have access to Rapid7 proprietary
       ECHO sniffer source. Meterpreter will still function normally without this.
     )