diff --git a/settings.py b/settings.py index 1314f11..5ec5f46 100644 --- a/settings.py +++ b/settings.py @@ -206,7 +206,7 @@ class Settings: if self.NumChal.lower() == 'random': self.NumChal = "random" - if len(self.NumChal) is not 16 and not "random": + if len(self.NumChal) != 16 and self.NumChal != "random": print(utils.color("[!] The challenge must be exactly 16 chars long.\nExample: 1122334455667788", 1)) sys.exit(-1) diff --git a/tools/MultiRelay.py b/tools/MultiRelay.py index ac34d3d..db4416d 100755 --- a/tools/MultiRelay.py +++ b/tools/MultiRelay.py @@ -412,12 +412,12 @@ class SMBRelay(BaseRequestHandler): data = self.request.recv(4096) ## Make sure it's not a Kerberos auth. - if data.find("NTLM") is not -1: + if data.find("NTLM") != -1: ## Start with nego protocol + session setup negotiate to our target. data, smbdata, s, challenge = GrabNegotiateFromTarget(data, s, Pivoting) ## Make sure it's not a Kerberos auth. - if data.find("NTLM") is not -1: + if data.find("NTLM") != -1: ##Relay all that to our client. if data[8:10] == "\x73\x00": head = SMBHeader(cmd="\x73",flag1="\x98", flag2="\x43\xc8", errorcode="\x16\x00\x00\xc0", pid=pidcalc(data),mid=midcalc(data)) diff --git a/tools/RunFingerPackets.py b/tools/RunFingerPackets.py index e5ce645..d6ab48b 100644 --- a/tools/RunFingerPackets.py +++ b/tools/RunFingerPackets.py @@ -11,7 +11,7 @@ else: def StructWithLenPython2or3(endian,data): #Python2... - if PY2OR3 is "PY2": + if PY2OR3 == "PY2": return struct.pack(endian, data) #Python3... else: