diff options
| author | Pierre Lalet <pierre@droids-corp.org> | 2018-01-22 17:47:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 17:47:49 +0100 |
| commit | 88614cc157b90cd4bafb20b537e241f29ec85a1d (patch) | |
| tree | 14cd9e918c8d6efe583d78a6f53a464d9370918d | |
| parent | db22426d4934bad5a67ca68a7499c3d0a202ce0f (diff) | |
| parent | 2afa800c2bc10caa7b11c64973817e7007001a1a (diff) | |
| download | scapy-88614cc157b90cd4bafb20b537e241f29ec85a1d.tar.gz | |
Merge pull request #1066 from gpotter2/str-calls
Forgotten str() instead of raw() fixed
| -rw-r--r-- | scapy/modules/nmap.py | 2 | ||||
| -rw-r--r-- | scapy/utils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scapy/modules/nmap.py b/scapy/modules/nmap.py index bf004d61..43c51810 100644 --- a/scapy/modules/nmap.py +++ b/scapy/modules/nmap.py @@ -123,7 +123,7 @@ def nmap_udppacket_sig(snd, rcv): res["ULEN"] = "%X" % rcv[UDPerror].len res["DAT"] = "E" if ( isinstance(rcv[UDPerror].payload, NoPayload) or - str(rcv[UDPerror].payload) == str(snd[UDP].payload) + raw(rcv[UDPerror].payload) == raw(snd[UDP].payload) ) else "F" return res diff --git a/scapy/utils.py b/scapy/utils.py index 8822e012..76ccb7ab 100644 --- a/scapy/utils.py +++ b/scapy/utils.py @@ -178,8 +178,8 @@ def repr_hex(s): @conf.commands.register def hexdiff(x,y): """Show differences between 2 binary strings""" - x=str(x)[::-1] - y=str(y)[::-1] + x=raw(x)[::-1] + y=raw(y)[::-1] SUBST=1 INSERT=1 d = {(-1, -1): (0, (-1, -1))} |