Skip to content

Commit

Permalink
Made tls_payload_fragment() handle packet not str
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmgr committed Jul 27, 2015
1 parent 717812d commit e07e249
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions scapy_ssl_tls/ssl_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def do_build(self):
return p

def fragment(self, size=2**14):
return tls_fragment_payload(str(self.payload), self, size)
return tls_fragment_payload(self.payload, self, size)


class TLSServerName(PacketNoPadding):
Expand Down Expand Up @@ -952,9 +952,10 @@ def tls_do_handshake(tls_socket, version, ciphers):
tls_socket.sendall(to_raw(TLSFinished(), tls_socket.tls_ctx))
tls_socket.recvall()

def tls_fragment_payload(payload, record=None, size=2**14):
def tls_fragment_payload(pkt, record=None, size=2**14):
if size <= 0:
raise ValueError("Fragment size must be strictly positive")
payload = str(pkt)
payloads = [payload[i: i+size] for i in range(0, len(payload), size)]
if record is None:
return payloads
Expand Down

0 comments on commit e07e249

Please sign in to comment.