Update: refactor cssp code
This commit is contained in:
@@ -91,7 +91,7 @@ class X224Test(unittest.TestCase):
|
||||
s = type.Stream()
|
||||
s.write_type(data)
|
||||
s.pos = 0
|
||||
t = x224.ClientConnectionRequestPDU()
|
||||
t = x224.ConnectionRequestPDU()
|
||||
s.read_type(t)
|
||||
|
||||
if t.protocolNeg.code != x224.NegociationType.TYPE_RDP_NEG_REQ:
|
||||
@@ -112,7 +112,7 @@ class X224Test(unittest.TestCase):
|
||||
@summary: unit test for X224Client.recvConnectionConfirm and sendConnectionRequest function
|
||||
check negotiation failure
|
||||
"""
|
||||
message = x224.ServerConnectionConfirm()
|
||||
message = x224.ConnectionConfirmPDU()
|
||||
message.protocolNeg.code.value = x224.NegociationType.TYPE_RDP_NEG_FAILURE
|
||||
s = type.Stream()
|
||||
s.write_type(message)
|
||||
@@ -141,7 +141,7 @@ class X224Test(unittest.TestCase):
|
||||
def recvData(data):
|
||||
raise X224Test.X224_PASS()
|
||||
|
||||
message = x224.ServerConnectionConfirm()
|
||||
message = x224.ConnectionConfirmPDU()
|
||||
message.protocolNeg.selectedProtocol.value = x224.Protocols.PROTOCOL_SSL
|
||||
|
||||
s = type.Stream()
|
||||
@@ -165,14 +165,14 @@ class X224Test(unittest.TestCase):
|
||||
|
||||
class Transport(object):
|
||||
def send(self, data):
|
||||
if not isinstance(data, x224.ServerConnectionConfirm):
|
||||
if not isinstance(data, x224.ConnectionConfirmPDU):
|
||||
raise X224Test.X224_FAIL()
|
||||
if data.protocolNeg.code.value != x224.NegociationType.TYPE_RDP_NEG_FAILURE or data.protocolNeg.failureCode.value != x224.NegotiationFailureCode.SSL_REQUIRED_BY_SERVER:
|
||||
raise X224Test.X224_FAIL()
|
||||
def close(self):
|
||||
raise X224Test.X224_PASS()
|
||||
|
||||
message = x224.ClientConnectionRequestPDU()
|
||||
message = x224.ConnectionRequestPDU()
|
||||
message.protocolNeg.selectedProtocol.value = x224.Protocols.PROTOCOL_HYBRID
|
||||
s = type.Stream()
|
||||
s.write_type(message)
|
||||
@@ -204,7 +204,7 @@ class X224Test(unittest.TestCase):
|
||||
tls = True
|
||||
|
||||
def send(self, data):
|
||||
if not isinstance(data, x224.ServerConnectionConfirm):
|
||||
if not isinstance(data, x224.ConnectionConfirmPDU):
|
||||
raise X224Test.X224_FAIL()
|
||||
if data.protocolNeg.code.value != x224.NegociationType.TYPE_RDP_NEG_RSP or data.protocolNeg.selectedProtocol.value != x224.Protocols.PROTOCOL_SSL:
|
||||
raise X224Test.X224_FAIL()
|
||||
@@ -214,7 +214,7 @@ class X224Test(unittest.TestCase):
|
||||
global connect_event
|
||||
connect_event = True
|
||||
|
||||
message = x224.ClientConnectionRequestPDU()
|
||||
message = x224.ConnectionRequestPDU()
|
||||
message.protocolNeg.selectedProtocol.value = x224.Protocols.PROTOCOL_SSL | x224.Protocols.PROTOCOL_RDP
|
||||
s = type.Stream()
|
||||
s.write_type(message)
|
||||
|
||||
Reference in New Issue
Block a user